From f502b7e2434f7161a1a465b75571c78d1c52906f Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Sun, 2 Oct 2016 17:38:41 +0200 Subject: [PATCH 001/144] Fixing bulk update API call with empty arrays --- taiga/base/utils/db.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/taiga/base/utils/db.py b/taiga/base/utils/db.py index eb610fff..9468077a 100644 --- a/taiga/base/utils/db.py +++ b/taiga/base/utils/db.py @@ -130,6 +130,9 @@ def update_attr_in_bulk_for_ids(values, attr, model): :params attr: attr to update :params model: Model of the ids. """ + if not values: + return + values = [str((id, order)) for id, order in values.items()] sql = """ UPDATE "{tbl}" From 387becc46a58d6a2cf9975eb88e94b9183e36f0d Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 3 Oct 2016 12:01:20 +0200 Subject: [PATCH 002/144] Issue 4593: Issue blocking. Not working --- taiga/projects/issues/serializers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/taiga/projects/issues/serializers.py b/taiga/projects/issues/serializers.py index a76fbf7d..c8d3b5dc 100644 --- a/taiga/projects/issues/serializers.py +++ b/taiga/projects/issues/serializers.py @@ -47,6 +47,8 @@ class IssueListSerializer(VoteResourceSerializerMixin, WatchedResourceSerializer external_reference = Field() version = Field() watchers = Field() + is_blocked = Field() + blocked_note = Field() is_closed = Field() From dedaa977bf1886ca9dd9a4be0370d56f4b806358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 3 Oct 2016 17:11:27 +0200 Subject: [PATCH 003/144] Add description to UserStrory serializer for webhook request --- taiga/webhooks/serializers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/taiga/webhooks/serializers.py b/taiga/webhooks/serializers.py index 7f6736f4..a6e89589 100644 --- a/taiga/webhooks/serializers.py +++ b/taiga/webhooks/serializers.py @@ -354,6 +354,7 @@ class UserStorySerializer(CustomAttributesValuesWebhookSerializerMixin, serializ watchers = MethodField() is_blocked = Field() blocked_note = Field() + description = Field() tags = Field() permalink = serializers.SerializerMethodField("get_permalink") owner = UserSerializer() From 318d887d6e1538532f3fcacf4c9118a95b59dc61 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 4 Oct 2016 08:21:02 +0200 Subject: [PATCH 004/144] Fixing deadlocks on update_attr_in_bulk_for_ids --- taiga/base/utils/db.py | 24 ++++++++++++++++++------ tests/integration/test_projects.py | 2 +- tests/integration/test_userstories.py | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/taiga/base/utils/db.py b/taiga/base/utils/db.py index 9468077a..ec7b1eb2 100644 --- a/taiga/base/utils/db.py +++ b/taiga/base/utils/db.py @@ -18,11 +18,10 @@ from django.contrib.contenttypes.models import ContentType from django.db import connection +from django.db import DatabaseError from django.db import transaction from django.shortcuts import _get_queryset -from django_pglocks import advisory_lock - from . import functions import re @@ -45,7 +44,7 @@ def get_object_or_none(klass, *args, **kwargs): return None -def get_typename_for_model_class(model:object, for_concrete_model=True) -> str: +def get_typename_for_model_class(model: object, for_concrete_model=True) -> str: """ Get typename for model instance. """ @@ -101,6 +100,7 @@ def save_in_bulk(instances, callback=None, precall=None, **save_options): return ret + @transaction.atomic def update_in_bulk(instances, list_of_new_values, callback=None, precall=None): """Update a list of model instances. @@ -123,6 +123,7 @@ def update_in_bulk(instances, list_of_new_values, callback=None, precall=None): callback(instance) +@transaction.atomic def update_attr_in_bulk_for_ids(values, attr, model): """Update a table using a list of ids. @@ -147,7 +148,18 @@ def update_attr_in_bulk_for_ids(values, attr, model): attr=attr) cursor = connection.cursor() - cursor.execute(sql) + + # We can have deadlocks with multiple updates over the same object + # In that situation we just retry + def _run_sql(retries=0, max_retries=3): + try: + cursor.execute(sql) + except DatabaseError: + print("retries", 0) + if retries < max_retries: + _run_sql(retries + 1) + + transaction.on_commit(_run_sql) def to_tsquery(term): @@ -230,10 +242,10 @@ def to_tsquery(term): if not bit: continue - if bit.startswith('"') and bit.endswith('"') and len(bit)>2: + if bit.startswith('"') and bit.endswith('"') and len(bit) > 2: res.append(bit.replace('"', "'")) else: - res.append("'%s':*" %(bit.replace("'", ""), )) + res.append("'%s':*" % (bit.replace("'", ""), )) res.append("&") diff --git a/tests/integration/test_projects.py b/tests/integration/test_projects.py index a002aa0f..7d90d7b0 100644 --- a/tests/integration/test_projects.py +++ b/tests/integration/test_projects.py @@ -45,7 +45,7 @@ import pytest from unittest import mock -pytestmark = pytest.mark.django_db +pytestmark = pytest.mark.django_db(transaction=True) class ExpiredSigner(signing.TimestampSigner): def __init__(self, *args, **kwargs): diff --git a/tests/integration/test_userstories.py b/tests/integration/test_userstories.py index 5d7bec2a..bf6f1b26 100644 --- a/tests/integration/test_userstories.py +++ b/tests/integration/test_userstories.py @@ -33,7 +33,7 @@ from taiga.projects.userstories import services, models from .. import factories as f import pytest -pytestmark = pytest.mark.django_db +pytestmark = pytest.mark.django_db(transaction=True) def test_get_userstories_from_bulk(): From ea642a800fe6ee61e76aa6b682d33185922f182f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 5 Oct 2016 12:49:57 +0200 Subject: [PATCH 005/144] Remove BrowsableAPIRenderer and XMLRenderer --- taiga/base/api/pagination.py | 16 +- taiga/base/api/renderers.py | 343 ------- taiga/base/api/settings.py | 1 - .../api/static/api/css/bootstrap-tweaks.css | 229 ----- .../base/api/static/api/css/bootstrap.min.css | 841 ------------------ taiga/base/api/static/api/css/default.css | 114 --- taiga/base/api/static/api/css/prettify.css | 73 -- .../api/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../static/api/img/glyphicons-halflings.png | Bin 12762 -> 0 bytes taiga/base/api/static/api/img/grid.png | Bin 1458 -> 0 bytes taiga/base/api/static/api/js/bootstrap.min.js | 7 - taiga/base/api/static/api/js/default.js | 101 --- .../api/static/api/js/jquery-1.8.1-min.js | 2 - taiga/base/api/static/api/js/prettify-min.js | 69 -- taiga/base/api/templates/api/api.html | 3 - taiga/base/api/templates/api/base.html | 236 ----- taiga/base/api/templates/api/form.html | 15 - taiga/base/api/templates/api/login.html | 3 - taiga/base/api/templates/api/login_base.html | 52 -- .../base/api/templates/api/raw_data_form.html | 12 - taiga/base/api/templatetags/__init__.py | 0 taiga/base/api/templatetags/api.py | 258 ------ taiga/base/api/urls.py | 68 -- taiga/base/api/utils/breadcrumbs.py | 99 --- taiga/projects/tagging/services.py | 1 - taiga/urls.py | 1 - 26 files changed, 15 insertions(+), 2529 deletions(-) delete mode 100644 taiga/base/api/static/api/css/bootstrap-tweaks.css delete mode 100644 taiga/base/api/static/api/css/bootstrap.min.css delete mode 100644 taiga/base/api/static/api/css/default.css delete mode 100644 taiga/base/api/static/api/css/prettify.css delete mode 100644 taiga/base/api/static/api/img/glyphicons-halflings-white.png delete mode 100644 taiga/base/api/static/api/img/glyphicons-halflings.png delete mode 100644 taiga/base/api/static/api/img/grid.png delete mode 100644 taiga/base/api/static/api/js/bootstrap.min.js delete mode 100644 taiga/base/api/static/api/js/default.js delete mode 100644 taiga/base/api/static/api/js/jquery-1.8.1-min.js delete mode 100644 taiga/base/api/static/api/js/prettify-min.js delete mode 100644 taiga/base/api/templates/api/api.html delete mode 100644 taiga/base/api/templates/api/base.html delete mode 100644 taiga/base/api/templates/api/form.html delete mode 100644 taiga/base/api/templates/api/login.html delete mode 100644 taiga/base/api/templates/api/login_base.html delete mode 100644 taiga/base/api/templates/api/raw_data_form.html delete mode 100644 taiga/base/api/templatetags/__init__.py delete mode 100644 taiga/base/api/templatetags/api.py delete mode 100644 taiga/base/api/urls.py delete mode 100644 taiga/base/api/utils/breadcrumbs.py diff --git a/taiga/base/api/pagination.py b/taiga/base/api/pagination.py index 46c1540d..636d6b80 100644 --- a/taiga/base/api/pagination.py +++ b/taiga/base/api/pagination.py @@ -24,14 +24,28 @@ from django.core.paginator import ( InvalidPage, ) from django.http import Http404 +from django.http import QueryDict from django.utils.translation import ugettext as _ from .settings import api_settings -from .templatetags.api import replace_query_param + +from urllib import parse as urlparse import warnings +def replace_query_param(url, key, val): + """ + Given a URL and a key/val pair, set or replace an item in the query + parameters of the URL, and return the new URL. + """ + (scheme, netloc, path, query, fragment) = urlparse.urlsplit(url) + query_dict = QueryDict(query).copy() + query_dict[key] = val + query = query_dict.urlencode() + return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) + + def strict_positive_int(integer_string, cutoff=None): """ Cast a string to a strictly positive integer. diff --git a/taiga/base/api/renderers.py b/taiga/base/api/renderers.py index bc26e95b..a4ebaa3c 100644 --- a/taiga/base/api/renderers.py +++ b/taiga/base/api/renderers.py @@ -51,28 +51,15 @@ on the response, such as JSON encoded data or HTML output. REST framework also provides an HTML renderer the renders the browsable API. """ -import django -from django import forms from django.core.exceptions import ImproperlyConfigured from django.http.multipartparser import parse_header from django.template import RequestContext, loader, Template from django.test.client import encode_multipart from django.utils import six -from django.utils.encoding import smart_text -from django.utils.six import StringIO -from django.utils.xmlutils import SimplerXMLGenerator -from taiga.base import exceptions, status -from taiga.base.exceptions import ParseError - -from . import VERSION -from .request import is_form_media_type, override_method -from .settings import api_settings from .utils import encoders -from .utils.breadcrumbs import get_breadcrumbs import json -import copy class BaseRenderer(object): @@ -198,55 +185,6 @@ class JSONPRenderer(JSONRenderer): return callback.encode(self.charset) + b"(" + json + b");" -class XMLRenderer(BaseRenderer): - """ - Renderer which serializes to XML. - """ - - media_type = "application/xml" - format = "xml" - charset = "utf-8" - - def render(self, data, accepted_media_type=None, renderer_context=None): - """ - Renders `data` into serialized XML. - """ - if data is None: - return "" - - stream = StringIO() - - xml = SimplerXMLGenerator(stream, self.charset) - xml.startDocument() - xml.startElement("root", {}) - - self._to_xml(xml, data) - - xml.endElement("root") - xml.endDocument() - return stream.getvalue() - - def _to_xml(self, xml, data): - if isinstance(data, (list, tuple)): - for item in data: - xml.startElement("list-item", {}) - self._to_xml(xml, item) - xml.endElement("list-item") - - elif isinstance(data, dict): - for key, value in six.iteritems(data): - xml.startElement(key, {}) - self._to_xml(xml, value) - xml.endElement(key) - - elif data is None: - # Don't output any value - pass - - else: - xml.characters(smart_text(data)) - - class TemplateHTMLRenderer(BaseRenderer): """ An HTML renderer for use with templates. @@ -363,287 +301,6 @@ class StaticHTMLRenderer(TemplateHTMLRenderer): return data -class HTMLFormRenderer(BaseRenderer): - """ - Renderers serializer data into an HTML form. - - If the serializer was instantiated without an object then this will - return an HTML form not bound to any object, - otherwise it will return an HTML form with the appropriate initial data - populated from the object. - - Note that rendering of field and form errors is not currently supported. - """ - media_type = "text/html" - format = "form" - template = "api/form.html" - charset = "utf-8" - - def render(self, data, accepted_media_type=None, renderer_context=None): - """ - Render serializer data and return an HTML form, as a string. - """ - renderer_context = renderer_context or {} - request = renderer_context["request"] - - template = loader.get_template(self.template) - context = RequestContext(request, {"form": data}) - return template.render(context) - - -class BrowsableAPIRenderer(BaseRenderer): - """ - HTML renderer used to self-document the API. - """ - media_type = "text/html" - format = "api" - template = "api/api.html" - charset = "utf-8" - form_renderer_class = HTMLFormRenderer - - def get_default_renderer(self, view): - """ - Return an instance of the first valid renderer. - (Don't use another documenting renderer.) - """ - renderers = [renderer for renderer in view.renderer_classes - if not issubclass(renderer, BrowsableAPIRenderer)] - non_template_renderers = [renderer for renderer in renderers - if not hasattr(renderer, "get_template_names")] - - if not renderers: - return None - elif non_template_renderers: - return non_template_renderers[0]() - return renderers[0]() - - def get_content(self, renderer, data, - accepted_media_type, renderer_context): - """ - Get the content as if it had been rendered by the default - non-documenting renderer. - """ - if not renderer: - return "[No renderers were found]" - - renderer_context["indent"] = 4 - content = renderer.render(data, accepted_media_type, renderer_context) - - render_style = getattr(renderer, "render_style", "text") - assert render_style in ["text", "binary"], 'Expected .render_style "text" or "binary", ' \ - 'but got "%s"' % render_style - if render_style == "binary": - return "[%d bytes of binary content]" % len(content) - - return content - - def show_form_for_method(self, view, method, request, obj): - """ - Returns True if a form should be shown for this method. - """ - if not method in view.allowed_methods: - return # Not a valid method - - if not api_settings.FORM_METHOD_OVERRIDE: - return # Cannot use form overloading - - try: - view.check_permissions(request) - if obj is not None: - view.check_object_permissions(request, obj) - except exceptions.APIException: - return False # Doesn't have permissions - return True - - def get_rendered_html_form(self, view, method, request): - """ - Return a string representing a rendered HTML form, possibly bound to - either the input or output data. - - In the absence of the View having an associated form then return None. - """ - if request.method == method: - try: - data = request.DATA - files = request.FILES - except ParseError: - data = None - files = None - else: - data = None - files = None - - with override_method(view, request, method) as request: - obj = getattr(view, "object", None) - if not self.show_form_for_method(view, method, request, obj): - return - - if method in ("DELETE", "OPTIONS"): - return True # Don't actually need to return a form - - if (not getattr(view, "get_serializer", None) - or not any(is_form_media_type(parser.media_type) for parser in view.parser_classes)): - return - - serializer = view.get_serializer(instance=obj, data=data, files=files) - serializer.is_valid() - data = serializer.data - - form_renderer = self.form_renderer_class() - return form_renderer.render(data, self.accepted_media_type, self.renderer_context) - - def get_raw_data_form(self, view, method, request): - """ - Returns a form that allows for arbitrary content types to be tunneled - via standard HTML forms. - (Which are typically application/x-www-form-urlencoded) - """ - with override_method(view, request, method) as request: - # If we"re not using content overloading there's no point in - # supplying a generic form, as the view won't treat the form"s - # value as the content of the request. - if not (api_settings.FORM_CONTENT_OVERRIDE - and api_settings.FORM_CONTENTTYPE_OVERRIDE): - return None - - # Check permissions - obj = getattr(view, "object", None) - if not self.show_form_for_method(view, method, request, obj): - return - - # If possible, serialize the initial content for the generic form - default_parser = view.parser_classes[0] - renderer_class = getattr(default_parser, "renderer_class", None) - if (hasattr(view, "get_serializer") and renderer_class): - # View has a serializer defined and parser class has a - # corresponding renderer that can be used to render the data. - - # Get a read-only version of the serializer - serializer = view.get_serializer(instance=obj) - if obj is None: - for name, field in serializer.fields.items(): - if getattr(field, "read_only", None): - del serializer.fields[name] - - # Render the raw data content - renderer = renderer_class() - accepted = self.accepted_media_type - context = self.renderer_context.copy() - context["indent"] = 4 - content = renderer.render(serializer.data, accepted, context) - else: - content = None - - # Generate a generic form that includes a content type field, - # and a content field. - content_type_field = api_settings.FORM_CONTENTTYPE_OVERRIDE - content_field = api_settings.FORM_CONTENT_OVERRIDE - - media_types = [parser.media_type for parser in view.parser_classes] - choices = [(media_type, media_type) for media_type in media_types] - initial = media_types[0] - - # NB. http://jacobian.org/writing/dynamic-form-generation/ - class GenericContentForm(forms.Form): - def __init__(self): - super(GenericContentForm, self).__init__() - - self.fields[content_type_field] = forms.ChoiceField( - label="Media type", - choices=choices, - initial=initial - ) - self.fields[content_field] = forms.CharField( - label="Content", - widget=forms.Textarea, - initial=content - ) - - return GenericContentForm() - - def get_name(self, view): - return view.get_view_name() - - def get_description(self, view): - return view.get_view_description(html=True) - - def get_breadcrumbs(self, request): - return get_breadcrumbs(request.path) - - def get_context(self, data, accepted_media_type, renderer_context): - """ - Returns the context used to render. - """ - view = renderer_context["view"] - request = renderer_context["request"] - response = renderer_context["response"] - - renderer = self.get_default_renderer(view) - - raw_data_post_form = self.get_raw_data_form(view, "POST", request) - raw_data_put_form = self.get_raw_data_form(view, "PUT", request) - raw_data_patch_form = self.get_raw_data_form(view, "PATCH", request) - raw_data_put_or_patch_form = raw_data_put_form or raw_data_patch_form - - response_headers = dict(response.items()) - renderer_content_type = "" - if renderer: - renderer_content_type = "%s" % renderer.media_type - if renderer.charset: - renderer_content_type += " ;%s" % renderer.charset - response_headers["Content-Type"] = renderer_content_type - - context = { - "content": self.get_content(renderer, data, accepted_media_type, renderer_context), - "view": view, - "request": request, - "response": response, - "description": self.get_description(view), - "name": self.get_name(view), - "version": VERSION, - "breadcrumblist": self.get_breadcrumbs(request), - "allowed_methods": view.allowed_methods, - "available_formats": [renderer.format for renderer in view.renderer_classes], - "response_headers": response_headers, - - "put_form": self.get_rendered_html_form(view, "PUT", request), - "post_form": self.get_rendered_html_form(view, "POST", request), - "delete_form": self.get_rendered_html_form(view, "DELETE", request), - "options_form": self.get_rendered_html_form(view, "OPTIONS", request), - - "raw_data_put_form": raw_data_put_form, - "raw_data_post_form": raw_data_post_form, - "raw_data_patch_form": raw_data_patch_form, - "raw_data_put_or_patch_form": raw_data_put_or_patch_form, - - "display_edit_forms": bool(response.status_code != 403), - - "api_settings": api_settings - } - return context - - def render(self, data, accepted_media_type=None, renderer_context=None): - """ - Render the HTML for the browsable API representation. - """ - self.accepted_media_type = accepted_media_type or "" - self.renderer_context = renderer_context or {} - - template = loader.get_template(self.template) - context = self.get_context(data, accepted_media_type, renderer_context) - context = RequestContext(renderer_context["request"], context) - ret = template.render(context) - - # Munge DELETE Response code to allow us to return content - # (Do this *after* we"ve rendered the template so that we include - # the normal deletion response code in the output) - response = renderer_context["response"] - if response.status_code == status.HTTP_204_NO_CONTENT: - response.status_code = status.HTTP_200_OK - - return ret - - class MultiPartRenderer(BaseRenderer): media_type = "multipart/form-data; boundary=BoUnDaRyStRiNg" format = "multipart" diff --git a/taiga/base/api/settings.py b/taiga/base/api/settings.py index 75d204c9..f5856146 100644 --- a/taiga/base/api/settings.py +++ b/taiga/base/api/settings.py @@ -76,7 +76,6 @@ DEFAULTS = { # Base API policies "DEFAULT_RENDERER_CLASSES": ( "taiga.base.api.renderers.JSONRenderer", - "taiga.base.api.renderers.BrowsableAPIRenderer", ), "DEFAULT_PARSER_CLASSES": ( "taiga.base.api.parsers.JSONParser", diff --git a/taiga/base/api/static/api/css/bootstrap-tweaks.css b/taiga/base/api/static/api/css/bootstrap-tweaks.css deleted file mode 100644 index 035d6952..00000000 --- a/taiga/base/api/static/api/css/bootstrap-tweaks.css +++ /dev/null @@ -1,229 +0,0 @@ -/* - * Copyright (C) 2014-2016 Andrey Antukh - * Copyright (C) 2014-2016 Jesús Espino - * Copyright (C) 2014-2016 David Barragán - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - * The code is partially taken (and modified) from django rest framework - * that is licensed under the following terms: - * - * Copyright (c) 2011-2014, Tom Christie - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 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 HOLDER 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. - */ - -/* - -This CSS file contains some tweaks specific to the included Bootstrap theme. -It's separate from `style.css` so that it can be easily overridden by replacing -a single block in the template. - -*/ - - -.form-actions { - background: transparent; - border-top-color: transparent; - padding-top: 0; -} - -.navbar-inverse .brand a { - color: #999; -} -.navbar-inverse .brand:hover a { - color: white; - text-decoration: none; -} - -/* custom navigation styles */ -.wrapper .navbar{ - width: 100%; - position: absolute; - left: 0; - top: 0; -} - -.navbar .navbar-inner{ - background: #2C2C2C; - color: white; - border: none; - border-top: 5px solid #A30000; - border-radius: 0px; -} - -.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand:hover{ - color: white; -} - -.nav-list > .active > a, .nav-list > .active > a:hover { - background: #2c2c2c; -} - -.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li{ - color: #A30000; -} -.navbar .navbar-inner .dropdown-menu li a:hover{ - background: #eeeeee; - color: #c20000; -} - -/*=== dabapps bootstrap styles ====*/ - -html{ - width:100%; - background: none; -} - -body, .navbar .navbar-inner .container-fluid { - max-width: 1150px; - margin: 0 auto; -} - -body{ - background: url("../img/grid.png") repeat-x; - background-attachment: fixed; -} - -#content{ - margin: 0; -} - -/* sticky footer and footer */ -html, body { - height: 100%; -} -.wrapper { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -60px; -} - -.form-switcher { - margin-bottom: 0; -} - -.well { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.well .form-actions { - padding-bottom: 0; - margin-bottom: 0; -} - -.well form { - margin-bottom: 0; -} - -.well form .help-block { - color: #999; -} - -.nav-tabs { - border: 0; -} - -.nav-tabs > li { - float: right; -} - -.nav-tabs li a { - margin-right: 0; -} - -.nav-tabs > .active > a { - background: #f5f5f5; -} - -.nav-tabs > .active > a:hover { - background: #f5f5f5; -} - -.tabbable.first-tab-active .tab-content -{ - border-top-right-radius: 0; -} - -#footer, #push { - height: 60px; /* .push must be the same height as .footer */ -} - -#footer{ - text-align: right; -} - -#footer p { - text-align: center; - color: gray; - border-top: 1px solid #DDD; - padding-top: 10px; -} - -#footer a { - color: gray; - font-weight: bold; -} - -#footer a:hover { - color: gray; -} - -.page-header { - border-bottom: none; - padding-bottom: 0px; - margin-bottom: 20px; -} - -/* custom general page styles */ -.hero-unit h2, .hero-unit h1{ - color: #A30000; -} - -body a, body a{ - color: #A30000; -} - -body a:hover{ - color: #c20000; -} - -#content a span{ - text-decoration: underline; - } - -.request-info { - clear:both; -} diff --git a/taiga/base/api/static/api/css/bootstrap.min.css b/taiga/base/api/static/api/css/bootstrap.min.css deleted file mode 100644 index 373f4b43..00000000 --- a/taiga/base/api/static/api/css/bootstrap.min.css +++ /dev/null @@ -1,841 +0,0 @@ -/*! - * Bootstrap v2.1.1 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ -.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0;} -.clearfix:after{clear:both;} -.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;} -.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} -article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} -audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} -audio:not([controls]){display:none;} -html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} -a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -a:hover,a:active{outline:0;} -sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} -sup{top:-0.5em;} -sub{bottom:-0.25em;} -img{max-width:100%;width:auto\9;height:auto;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic;} -#map_canvas img{max-width:none;} -button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} -button,input{*overflow:visible;line-height:normal;} -button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} -button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} -input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield;} -input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} -textarea{overflow:auto;vertical-align:top;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333333;background-color:#ffffff;} -a{color:#0088cc;text-decoration:none;} -a:hover{color:#005580;text-decoration:underline;} -.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);} -.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px;} -.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";line-height:0;} -.row:after{clear:both;} -[class*="span"]{float:left;min-height:1px;margin-left:20px;} -.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} -.span12{width:940px;} -.span11{width:860px;} -.span10{width:780px;} -.span9{width:700px;} -.span8{width:620px;} -.span7{width:540px;} -.span6{width:460px;} -.span5{width:380px;} -.span4{width:300px;} -.span3{width:220px;} -.span2{width:140px;} -.span1{width:60px;} -.offset12{margin-left:980px;} -.offset11{margin-left:900px;} -.offset10{margin-left:820px;} -.offset9{margin-left:740px;} -.offset8{margin-left:660px;} -.offset7{margin-left:580px;} -.offset6{margin-left:500px;} -.offset5{margin-left:420px;} -.offset4{margin-left:340px;} -.offset3{margin-left:260px;} -.offset2{margin-left:180px;} -.offset1{margin-left:100px;} -.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;} -.row-fluid:after{clear:both;} -.row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;} -.row-fluid [class*="span"]:first-child{margin-left:0;} -.row-fluid .span12{width:100%;*width:99.94680851063829%;} -.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%;} -.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%;} -.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%;} -.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%;} -.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%;} -.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%;} -.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%;} -.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%;} -.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%;} -.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%;} -.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%;} -.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%;} -.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%;} -.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%;} -.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%;} -.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%;} -.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%;} -.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%;} -.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%;} -.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%;} -.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%;} -.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%;} -.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%;} -.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%;} -.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%;} -.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%;} -.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%;} -.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%;} -.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%;} -.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%;} -.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%;} -.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%;} -.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%;} -.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%;} -.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%;} -[class*="span"].hide,.row-fluid [class*="span"].hide{display:none;} -[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right;} -.container{margin-right:auto;margin-left:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";line-height:0;} -.container:after{clear:both;} -.container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";line-height:0;} -.container-fluid:after{clear:both;} -p{margin:0 0 10px;} -.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px;} -small{font-size:85%;} -strong{font-weight:bold;} -em{font-style:italic;} -cite{font-style:normal;} -.muted{color:#999999;} -.text-warning{color:#c09853;} -.text-error{color:#b94a48;} -.text-info{color:#3a87ad;} -.text-success{color:#468847;} -h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:1;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999999;} -h1{font-size:36px;line-height:40px;} -h2{font-size:30px;line-height:40px;} -h3{font-size:24px;line-height:40px;} -h4{font-size:18px;line-height:20px;} -h5{font-size:14px;line-height:20px;} -h6{font-size:12px;line-height:20px;} -h1 small{font-size:24px;} -h2 small{font-size:18px;} -h3 small{font-size:14px;} -h4 small{font-size:14px;} -.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eeeeee;} -ul,ol{padding:0;margin:0 0 10px 25px;} -ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} -li{line-height:20px;} -ul.unstyled,ol.unstyled{margin-left:0;list-style:none;} -dl{margin-bottom:20px;} -dt,dd{line-height:20px;} -dt{font-weight:bold;} -dd{margin-left:10px;} -.dl-horizontal{*zoom:1;}.dl-horizontal:before,.dl-horizontal:after{display:table;content:"";line-height:0;} -.dl-horizontal:after{clear:both;} -.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} -.dl-horizontal dd{margin-left:180px;} -hr{margin:20px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} -abbr[title]{cursor:help;border-bottom:1px dotted #999999;} -abbr.initialism{font-size:90%;text-transform:uppercase;} -blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:25px;} -blockquote small{display:block;line-height:20px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} -blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} -blockquote.pull-right small:before{content:'';} -blockquote.pull-right small:after{content:'\00A0 \2014';} -q:before,q:after,blockquote:before,blockquote:after{content:"";} -address{display:block;margin-bottom:20px;font-style:normal;line-height:20px;} -code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} -pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{margin-bottom:20px;} -pre code{padding:0;color:inherit;background-color:transparent;border:0;} -.pre-scrollable{max-height:340px;overflow-y:scroll;} -.label,.badge{font-size:11.844px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;} -.label{padding:1px 4px 2px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.badge{padding:1px 9px 2px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;} -a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} -.label-important,.badge-important{background-color:#b94a48;} -.label-important[href],.badge-important[href]{background-color:#953b39;} -.label-warning,.badge-warning{background-color:#f89406;} -.label-warning[href],.badge-warning[href]{background-color:#c67605;} -.label-success,.badge-success{background-color:#468847;} -.label-success[href],.badge-success[href]{background-color:#356635;} -.label-info,.badge-info{background-color:#3a87ad;} -.label-info[href],.badge-info[href]{background-color:#2d6987;} -.label-inverse,.badge-inverse{background-color:#333333;} -.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a;} -.btn .label,.btn .badge{position:relative;top:-1px;} -.btn-mini .label,.btn-mini .badge{top:0;} -table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;} -.table{width:100%;margin-bottom:20px;}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} -.table th{font-weight:bold;} -.table thead th{vertical-align:bottom;} -.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;} -.table tbody+tbody{border-top:2px solid #dddddd;} -.table-condensed th,.table-condensed td{padding:4px 5px;} -.table-bordered{border:1px solid #dddddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;} -.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} -.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px;} -.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px;} -.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child,.table-bordered tfoot:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;} -.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child,.table-bordered tfoot:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;} -.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px;} -.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topleft:4px;} -.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} -.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#f5f5f5;} -table [class*=span],.row-fluid table [class*=span]{display:table-cell;float:none;margin-left:0;} -.table .span1{float:none;width:44px;margin-left:0;} -.table .span2{float:none;width:124px;margin-left:0;} -.table .span3{float:none;width:204px;margin-left:0;} -.table .span4{float:none;width:284px;margin-left:0;} -.table .span5{float:none;width:364px;margin-left:0;} -.table .span6{float:none;width:444px;margin-left:0;} -.table .span7{float:none;width:524px;margin-left:0;} -.table .span8{float:none;width:604px;margin-left:0;} -.table .span9{float:none;width:684px;margin-left:0;} -.table .span10{float:none;width:764px;margin-left:0;} -.table .span11{float:none;width:844px;margin-left:0;} -.table .span12{float:none;width:924px;margin-left:0;} -.table .span13{float:none;width:1004px;margin-left:0;} -.table .span14{float:none;width:1084px;margin-left:0;} -.table .span15{float:none;width:1164px;margin-left:0;} -.table .span16{float:none;width:1244px;margin-left:0;} -.table .span17{float:none;width:1324px;margin-left:0;} -.table .span18{float:none;width:1404px;margin-left:0;} -.table .span19{float:none;width:1484px;margin-left:0;} -.table .span20{float:none;width:1564px;margin-left:0;} -.table .span21{float:none;width:1644px;margin-left:0;} -.table .span22{float:none;width:1724px;margin-left:0;} -.table .span23{float:none;width:1804px;margin-left:0;} -.table .span24{float:none;width:1884px;margin-left:0;} -.table tbody tr.success td{background-color:#dff0d8;} -.table tbody tr.error td{background-color:#f2dede;} -.table tbody tr.warning td{background-color:#fcf8e3;} -.table tbody tr.info td{background-color:#d9edf7;} -.table-hover tbody tr.success:hover td{background-color:#d0e9c6;} -.table-hover tbody tr.error:hover td{background-color:#ebcccc;} -.table-hover tbody tr.warning:hover td{background-color:#faf2cc;} -.table-hover tbody tr.info:hover td{background-color:#c4e3f3;} -form{margin:0 0 20px;} -fieldset{padding:0;margin:0;border:0;} -legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15px;color:#999999;} -label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px;} -input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} -label{display:block;margin-bottom:5px;} -select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:9px;font-size:14px;line-height:20px;color:#555555;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -input,textarea,.uneditable-input{width:206px;} -textarea{height:auto;} -textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear .2s, box-shadow linear .2s;-moz-transition:border linear .2s, box-shadow linear .2s;-o-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);} -input[type="radio"],input[type="checkbox"]{margin:4px 0 0;*margin-top:0;margin-top:1px \9;line-height:normal;cursor:pointer;} -input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto;} -select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px;} -select{width:220px;border:1px solid #cccccc;background-color:#ffffff;} -select[multiple],select[size]{height:auto;} -select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.uneditable-input,.uneditable-textarea{color:#999999;background-color:#fcfcfc;border-color:#cccccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} -.uneditable-input{overflow:hidden;white-space:nowrap;} -.uneditable-textarea{width:auto;height:auto;} -input:-moz-placeholder,textarea:-moz-placeholder{color:#999999;} -input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999999;} -input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999999;} -.radio,.checkbox{min-height:18px;padding-left:18px;} -.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} -.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} -.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;} -.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} -.input-mini{width:60px;} -.input-small{width:90px;} -.input-medium{width:150px;} -.input-large{width:210px;} -.input-xlarge{width:270px;} -.input-xxlarge{width:530px;} -input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0;} -.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block;} -input,textarea,.uneditable-input{margin-left:0;} -.controls-row [class*="span"]+[class*="span"]{margin-left:20px;} -input.span12, textarea.span12, .uneditable-input.span12{width:926px;} -input.span11, textarea.span11, .uneditable-input.span11{width:846px;} -input.span10, textarea.span10, .uneditable-input.span10{width:766px;} -input.span9, textarea.span9, .uneditable-input.span9{width:686px;} -input.span8, textarea.span8, .uneditable-input.span8{width:606px;} -input.span7, textarea.span7, .uneditable-input.span7{width:526px;} -input.span6, textarea.span6, .uneditable-input.span6{width:446px;} -input.span5, textarea.span5, .uneditable-input.span5{width:366px;} -input.span4, textarea.span4, .uneditable-input.span4{width:286px;} -input.span3, textarea.span3, .uneditable-input.span3{width:206px;} -input.span2, textarea.span2, .uneditable-input.span2{width:126px;} -input.span1, textarea.span1, .uneditable-input.span1{width:46px;} -.controls-row{*zoom:1;}.controls-row:before,.controls-row:after{display:table;content:"";line-height:0;} -.controls-row:after{clear:both;} -.controls-row [class*="span"]{float:left;} -input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eeeeee;} -input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent;} -.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} -.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;} -.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;} -.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} -.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} -.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;} -.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;} -.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;} -.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} -.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;} -.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;} -.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} -.control-group.info>label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad;} -.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad;} -.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;} -.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad;} -input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";line-height:0;} -.form-actions:after{clear:both;} -.help-block,.help-inline{color:#595959;} -.help-block{display:block;margin-bottom:10px;} -.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} -.input-append,.input-prepend{margin-bottom:5px;font-size:0;white-space:nowrap;}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;font-size:14px;vertical-align:top;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2;} -.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#eeeeee;border:1px solid #ccc;} -.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546;} -.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} -.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-append .add-on,.input-append .btn{margin-left:-1px;} -.input-append .add-on:last-child,.input-append .btn:last-child{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} -.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px;} -.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0;} -.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0;} -.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px;} -.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;*zoom:1;margin-bottom:0;vertical-align:middle;} -.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;} -.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block;} -.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;} -.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;} -.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0;} -.control-group{margin-bottom:10px;} -legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate;} -.form-horizontal .control-group{margin-bottom:20px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";line-height:0;} -.form-horizontal .control-group:after{clear:both;} -.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right;} -.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0;}.form-horizontal .controls:first-child{*padding-left:180px;} -.form-horizontal .help-block{margin-bottom:0;} -.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block{margin-top:10px;} -.form-horizontal .form-actions{padding-left:180px;} -.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 14px;margin-bottom:0;font-size:14px;line-height:20px;*line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #bbbbbb;*border:0;border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;} -.btn:active,.btn.active{background-color:#cccccc \9;} -.btn:first-child{*margin-left:0;} -.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} -.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);} -.btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-large{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.btn-large [class^="icon-"]{margin-top:2px;} -.btn-small{padding:3px 9px;font-size:12px;line-height:18px;} -.btn-small [class^="icon-"]{margin-top:0;} -.btn-mini{padding:2px 6px;font-size:11px;line-height:17px;} -.btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} -.btn-block+.btn-block{margin-top:5px;} -input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%;} -.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);} -.btn{border-color:#c5c5c5;border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);} -.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(to bottom, #0088cc, #0044cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#0044cc;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#0044cc;*background-color:#003bb3;} -.btn-primary:active,.btn-primary.active{background-color:#003399 \9;} -.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(to bottom, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#f89406;*background-color:#df8505;} -.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} -.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(to bottom, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#bd362f;*background-color:#a9302a;} -.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} -.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(to bottom, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;} -.btn-success:active,.btn-success.active{background-color:#408140 \9;} -.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(to bottom, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;} -.btn-info:active,.btn-info.active{background-color:#24748c \9;} -.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#363636;background-image:-moz-linear-gradient(top, #444444, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));background-image:-webkit-linear-gradient(top, #444444, #222222);background-image:-o-linear-gradient(top, #444444, #222222);background-image:linear-gradient(to bottom, #444444, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#222222;*background-color:#151515;} -.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;} -button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} -button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;} -button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;} -button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;} -.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-link{border-color:transparent;cursor:pointer;color:#0088cc;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-link:hover{color:#005580;text-decoration:underline;background-color:transparent;} -.btn-link[disabled]:hover{color:#333333;text-decoration:none;} -[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;} -.icon-white,.nav-tabs>.active>a>[class^="icon-"],.nav-tabs>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png");} -.icon-glass{background-position:0 0;} -.icon-music{background-position:-24px 0;} -.icon-search{background-position:-48px 0;} -.icon-envelope{background-position:-72px 0;} -.icon-heart{background-position:-96px 0;} -.icon-star{background-position:-120px 0;} -.icon-star-empty{background-position:-144px 0;} -.icon-user{background-position:-168px 0;} -.icon-film{background-position:-192px 0;} -.icon-th-large{background-position:-216px 0;} -.icon-th{background-position:-240px 0;} -.icon-th-list{background-position:-264px 0;} -.icon-ok{background-position:-288px 0;} -.icon-remove{background-position:-312px 0;} -.icon-zoom-in{background-position:-336px 0;} -.icon-zoom-out{background-position:-360px 0;} -.icon-off{background-position:-384px 0;} -.icon-signal{background-position:-408px 0;} -.icon-cog{background-position:-432px 0;} -.icon-trash{background-position:-456px 0;} -.icon-home{background-position:0 -24px;} -.icon-file{background-position:-24px -24px;} -.icon-time{background-position:-48px -24px;} -.icon-road{background-position:-72px -24px;} -.icon-download-alt{background-position:-96px -24px;} -.icon-download{background-position:-120px -24px;} -.icon-upload{background-position:-144px -24px;} -.icon-inbox{background-position:-168px -24px;} -.icon-play-circle{background-position:-192px -24px;} -.icon-repeat{background-position:-216px -24px;} -.icon-refresh{background-position:-240px -24px;} -.icon-list-alt{background-position:-264px -24px;} -.icon-lock{background-position:-287px -24px;} -.icon-flag{background-position:-312px -24px;} -.icon-headphones{background-position:-336px -24px;} -.icon-volume-off{background-position:-360px -24px;} -.icon-volume-down{background-position:-384px -24px;} -.icon-volume-up{background-position:-408px -24px;} -.icon-qrcode{background-position:-432px -24px;} -.icon-barcode{background-position:-456px -24px;} -.icon-tag{background-position:0 -48px;} -.icon-tags{background-position:-25px -48px;} -.icon-book{background-position:-48px -48px;} -.icon-bookmark{background-position:-72px -48px;} -.icon-print{background-position:-96px -48px;} -.icon-camera{background-position:-120px -48px;} -.icon-font{background-position:-144px -48px;} -.icon-bold{background-position:-167px -48px;} -.icon-italic{background-position:-192px -48px;} -.icon-text-height{background-position:-216px -48px;} -.icon-text-width{background-position:-240px -48px;} -.icon-align-left{background-position:-264px -48px;} -.icon-align-center{background-position:-288px -48px;} -.icon-align-right{background-position:-312px -48px;} -.icon-align-justify{background-position:-336px -48px;} -.icon-list{background-position:-360px -48px;} -.icon-indent-left{background-position:-384px -48px;} -.icon-indent-right{background-position:-408px -48px;} -.icon-facetime-video{background-position:-432px -48px;} -.icon-picture{background-position:-456px -48px;} -.icon-pencil{background-position:0 -72px;} -.icon-map-marker{background-position:-24px -72px;} -.icon-adjust{background-position:-48px -72px;} -.icon-tint{background-position:-72px -72px;} -.icon-edit{background-position:-96px -72px;} -.icon-share{background-position:-120px -72px;} -.icon-check{background-position:-144px -72px;} -.icon-move{background-position:-168px -72px;} -.icon-step-backward{background-position:-192px -72px;} -.icon-fast-backward{background-position:-216px -72px;} -.icon-backward{background-position:-240px -72px;} -.icon-play{background-position:-264px -72px;} -.icon-pause{background-position:-288px -72px;} -.icon-stop{background-position:-312px -72px;} -.icon-forward{background-position:-336px -72px;} -.icon-fast-forward{background-position:-360px -72px;} -.icon-step-forward{background-position:-384px -72px;} -.icon-eject{background-position:-408px -72px;} -.icon-chevron-left{background-position:-432px -72px;} -.icon-chevron-right{background-position:-456px -72px;} -.icon-plus-sign{background-position:0 -96px;} -.icon-minus-sign{background-position:-24px -96px;} -.icon-remove-sign{background-position:-48px -96px;} -.icon-ok-sign{background-position:-72px -96px;} -.icon-question-sign{background-position:-96px -96px;} -.icon-info-sign{background-position:-120px -96px;} -.icon-screenshot{background-position:-144px -96px;} -.icon-remove-circle{background-position:-168px -96px;} -.icon-ok-circle{background-position:-192px -96px;} -.icon-ban-circle{background-position:-216px -96px;} -.icon-arrow-left{background-position:-240px -96px;} -.icon-arrow-right{background-position:-264px -96px;} -.icon-arrow-up{background-position:-289px -96px;} -.icon-arrow-down{background-position:-312px -96px;} -.icon-share-alt{background-position:-336px -96px;} -.icon-resize-full{background-position:-360px -96px;} -.icon-resize-small{background-position:-384px -96px;} -.icon-plus{background-position:-408px -96px;} -.icon-minus{background-position:-433px -96px;} -.icon-asterisk{background-position:-456px -96px;} -.icon-exclamation-sign{background-position:0 -120px;} -.icon-gift{background-position:-24px -120px;} -.icon-leaf{background-position:-48px -120px;} -.icon-fire{background-position:-72px -120px;} -.icon-eye-open{background-position:-96px -120px;} -.icon-eye-close{background-position:-120px -120px;} -.icon-warning-sign{background-position:-144px -120px;} -.icon-plane{background-position:-168px -120px;} -.icon-calendar{background-position:-192px -120px;} -.icon-random{background-position:-216px -120px;width:16px;} -.icon-comment{background-position:-240px -120px;} -.icon-magnet{background-position:-264px -120px;} -.icon-chevron-up{background-position:-288px -120px;} -.icon-chevron-down{background-position:-313px -119px;} -.icon-retweet{background-position:-336px -120px;} -.icon-shopping-cart{background-position:-360px -120px;} -.icon-folder-close{background-position:-384px -120px;} -.icon-folder-open{background-position:-408px -120px;width:16px;} -.icon-resize-vertical{background-position:-432px -119px;} -.icon-resize-horizontal{background-position:-456px -118px;} -.icon-hdd{background-position:0 -144px;} -.icon-bullhorn{background-position:-24px -144px;} -.icon-bell{background-position:-48px -144px;} -.icon-certificate{background-position:-72px -144px;} -.icon-thumbs-up{background-position:-96px -144px;} -.icon-thumbs-down{background-position:-120px -144px;} -.icon-hand-right{background-position:-144px -144px;} -.icon-hand-left{background-position:-168px -144px;} -.icon-hand-up{background-position:-192px -144px;} -.icon-hand-down{background-position:-216px -144px;} -.icon-circle-arrow-right{background-position:-240px -144px;} -.icon-circle-arrow-left{background-position:-264px -144px;} -.icon-circle-arrow-up{background-position:-288px -144px;} -.icon-circle-arrow-down{background-position:-312px -144px;} -.icon-globe{background-position:-336px -144px;} -.icon-wrench{background-position:-360px -144px;} -.icon-tasks{background-position:-384px -144px;} -.icon-filter{background-position:-408px -144px;} -.icon-briefcase{background-position:-432px -144px;} -.icon-fullscreen{background-position:-456px -144px;} -.btn-group{position:relative;font-size:0;vertical-align:middle;white-space:nowrap;*margin-left:.3em;}.btn-group:first-child{*margin-left:0;} -.btn-group+.btn-group{margin-left:5px;} -.btn-toolbar{font-size:0;margin-top:10px;margin-bottom:10px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} -.btn-toolbar .btn+.btn,.btn-toolbar .btn-group+.btn,.btn-toolbar .btn+.btn-group{margin-left:5px;} -.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-group>.btn+.btn{margin-left:-1px;} -.btn-group>.btn,.btn-group>.dropdown-menu{font-size:14px;} -.btn-group>.btn-mini{font-size:11px;} -.btn-group>.btn-small{font-size:12px;} -.btn-group>.btn-large{font-size:16px;} -.btn-group>.btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} -.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} -.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} -.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} -.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2;} -.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;} -.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:5px;*padding-bottom:5px;} -.btn-group>.btn-mini+.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:2px;*padding-bottom:2px;} -.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px;} -.btn-group>.btn-large+.dropdown-toggle{padding-left:12px;padding-right:12px;*padding-top:7px;*padding-bottom:7px;} -.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);} -.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6;} -.btn-group.open .btn-primary.dropdown-toggle{background-color:#0044cc;} -.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406;} -.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f;} -.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351;} -.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4;} -.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222222;} -.btn .caret{margin-top:8px;margin-left:0;} -.btn-mini .caret,.btn-small .caret,.btn-large .caret{margin-top:6px;} -.btn-large .caret{border-left-width:5px;border-right-width:5px;border-top-width:5px;} -.dropup .btn-large .caret{border-bottom:5px solid #000000;border-top:0;} -.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} -.btn-group-vertical{display:inline-block;*display:inline;*zoom:1;} -.btn-group-vertical .btn{display:block;float:none;width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-group-vertical .btn+.btn{margin-left:0;margin-top:-1px;} -.btn-group-vertical .btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} -.btn-group-vertical .btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} -.btn-group-vertical .btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0;} -.btn-group-vertical .btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;} -.nav{margin-left:0;margin-bottom:20px;list-style:none;} -.nav>li>a{display:block;} -.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} -.nav>.pull-right{float:right;} -.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} -.nav li+.nav-header{margin-top:9px;} -.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} -.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} -.nav-list>li>a{padding:3px 15px;} -.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;} -.nav-list [class^="icon-"]{margin-right:2px;} -.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} -.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";line-height:0;} -.nav-tabs:after,.nav-pills:after{clear:both;} -.nav-tabs>li,.nav-pills>li{float:left;} -.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} -.nav-tabs{border-bottom:1px solid #ddd;} -.nav-tabs>li{margin-bottom:-1px;} -.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} -.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} -.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#0088cc;} -.nav-stacked>li{float:none;} -.nav-stacked>li>a{margin-right:0;} -.nav-tabs.nav-stacked{border-bottom:0;} -.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;} -.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} -.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;} -.nav-pills.nav-stacked>li>a{margin-bottom:3px;} -.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} -.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;} -.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.nav .dropdown-toggle .caret{border-top-color:#0088cc;border-bottom-color:#0088cc;margin-top:6px;} -.nav .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580;} -.nav-tabs .dropdown-toggle .caret{margin-top:8px;} -.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff;} -.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;} -.nav>.dropdown.active>a:hover{cursor:pointer;} -.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;} -.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);} -.tabs-stacked .open>a:hover{border-color:#999999;} -.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";line-height:0;} -.tabbable:after{clear:both;} -.tab-content{overflow:auto;} -.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0;} -.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} -.tab-content>.active,.pill-content>.active{display:block;} -.tabs-below>.nav-tabs{border-top:1px solid #ddd;} -.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0;} -.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below>.nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} -.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd;} -.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none;} -.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} -.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} -.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} -.tabs-left>.nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} -.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} -.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} -.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} -.tabs-right>.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} -.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} -.nav>.disabled>a{color:#999999;} -.nav>.disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;} -.navbar{overflow:visible;margin-bottom:20px;color:#777777;*position:relative;*z-index:2;} -.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top, #ffffff, #f2f2f2);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));background-image:-webkit-linear-gradient(top, #ffffff, #f2f2f2);background-image:-o-linear-gradient(top, #ffffff, #f2f2f2);background-image:linear-gradient(to bottom, #ffffff, #f2f2f2);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);-moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);*zoom:1;}.navbar-inner:before,.navbar-inner:after{display:table;content:"";line-height:0;} -.navbar-inner:after{clear:both;} -.navbar .container{width:auto;} -.nav-collapse.collapse{height:auto;} -.navbar .brand{float:left;display:block;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777777;text-shadow:0 1px 0 #ffffff;}.navbar .brand:hover{text-decoration:none;} -.navbar-text{margin-bottom:0;line-height:40px;} -.navbar-link{color:#777777;}.navbar-link:hover{color:#333333;} -.navbar .divider-vertical{height:40px;margin:0 9px;border-left:1px solid #f2f2f2;border-right:1px solid #ffffff;} -.navbar .btn,.navbar .btn-group{margin-top:5px;} -.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn{margin-top:0;} -.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";line-height:0;} -.navbar-form:after{clear:both;} -.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;} -.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0;} -.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} -.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;} -.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0;}.navbar-search .search-query{margin-bottom:0;padding:4px 14px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} -.navbar-static-top{position:static;width:100%;margin-bottom:0;}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;} -.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px;} -.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0;} -.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} -.navbar-fixed-top{top:0;} -.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);} -.navbar-fixed-bottom{bottom:0;}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);} -.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} -.navbar .nav.pull-right{float:right;margin-right:0;} -.navbar .nav>li{float:left;} -.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777777;text-decoration:none;text-shadow:0 1px 0 #ffffff;} -.navbar .nav .dropdown-toggle .caret{margin-top:8px;} -.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:transparent;color:#333333;text-decoration:none;} -.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);-moz-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);} -.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ededed;background-image:-moz-linear-gradient(top, #f2f2f2, #e5e5e5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));background-image:-webkit-linear-gradient(top, #f2f2f2, #e5e5e5);background-image:-o-linear-gradient(top, #f2f2f2, #e5e5e5);background-image:linear-gradient(to bottom, #f2f2f2, #e5e5e5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e5e5e5;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#ffffff;background-color:#e5e5e5;*background-color:#d9d9d9;} -.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#cccccc \9;} -.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} -.btn-navbar .icon-bar+.icon-bar{margin-top:3px;} -.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} -.navbar .nav>li>.dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} -.navbar-fixed-bottom .nav>li>.dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;} -.navbar-fixed-bottom .nav>li>.dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;} -.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:#e5e5e5;color:#555555;} -.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777777;border-bottom-color:#777777;} -.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;} -.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{left:auto;right:0;}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{left:auto;right:12px;} -.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{left:auto;right:13px;} -.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{left:auto;right:100%;margin-left:0;margin-right:-1px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;} -.navbar-inverse{color:#999999;}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top, #222222, #111111);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));background-image:-webkit-linear-gradient(top, #222222, #111111);background-image:-o-linear-gradient(top, #222222, #111111);background-image:linear-gradient(to bottom, #222222, #111111);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);border-color:#252525;} -.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999999;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#ffffff;} -.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{background-color:transparent;color:#ffffff;} -.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#ffffff;background-color:#111111;} -.navbar-inverse .navbar-link{color:#999999;}.navbar-inverse .navbar-link:hover{color:#ffffff;} -.navbar-inverse .divider-vertical{border-left-color:#111111;border-right-color:#222222;} -.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#111111;color:#ffffff;} -.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999999;border-bottom-color:#999999;} -.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} -.navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#515151;border-color:#111111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none;}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#cccccc;} -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#cccccc;} -.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;} -.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} -.navbar-inverse .btn-navbar{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e0e0e;background-image:-moz-linear-gradient(top, #151515, #040404);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));background-image:-webkit-linear-gradient(top, #151515, #040404);background-image:-o-linear-gradient(top, #151515, #040404);background-image:linear-gradient(to bottom, #151515, #040404);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);border-color:#040404 #040404 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#040404;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#ffffff;background-color:#040404;*background-color:#000000;} -.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000000 \9;} -.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;} -.breadcrumb .divider{padding:0 5px;color:#ccc;} -.breadcrumb .active{color:#999999;} -.pagination{height:40px;margin:20px 0;} -.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} -.pagination ul>li{display:inline;} -.pagination ul>li>a,.pagination ul>li>span{float:left;padding:0 14px;line-height:38px;text-decoration:none;background-color:#ffffff;border:1px solid #dddddd;border-left-width:0;} -.pagination ul>li>a:hover,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5;} -.pagination ul>.active>a,.pagination ul>.active>span{color:#999999;cursor:default;} -.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover{color:#999999;background-color:transparent;cursor:default;} -.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.pagination-centered{text-align:center;} -.pagination-right{text-align:right;} -.pager{margin:20px 0;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";line-height:0;} -.pager:after{clear:both;} -.pager li{display:inline;} -.pager a,.pager span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} -.pager a:hover{text-decoration:none;background-color:#f5f5f5;} -.pager .next a,.pager .next span{float:right;} -.pager .previous a{float:left;} -.pager .disabled a,.pager .disabled a:hover,.pager .disabled span{color:#999999;background-color:#fff;cursor:default;} -.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";line-height:0;} -.thumbnails:after{clear:both;} -.row-fluid .thumbnails{margin-left:0;} -.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px;} -.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;} -a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} -.thumbnail .caption{padding:9px;color:#555555;} -.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;} -.alert h4{margin:0;} -.alert .close{position:relative;top:-2px;right:-21px;line-height:20px;} -.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;} -.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;} -.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;} -.alert-block{padding-top:14px;padding-bottom:14px;} -.alert-block>p,.alert-block>ul{margin-bottom:0;} -.alert-block p+p{margin-top:5px;} -@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-o-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}.progress{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(to bottom, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.progress .bar{width:0%;height:100%;color:#ffffff;float:left;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(to bottom, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} -.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);} -.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} -.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;} -.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(to bottom, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);} -.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(to bottom, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);} -.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(to bottom, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);} -.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(to bottom, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);} -.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} -.hero-unit p{font-size:18px;font-weight:200;line-height:30px;color:inherit;} -.tooltip{position:absolute;z-index:1030;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);} -.tooltip.top{margin-top:-3px;} -.tooltip.right{margin-left:3px;} -.tooltip.bottom{margin-top:3px;} -.tooltip.left{margin-left:-3px;} -.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid;} -.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000000;} -.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000000;} -.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000000;} -.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000000;} -.popover{position:absolute;top:0;left:0;z-index:1010;display:none;width:236px;padding:1px;background-color:#ffffff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);}.popover.top{margin-bottom:10px;} -.popover.right{margin-left:10px;} -.popover.bottom{margin-top:10px;} -.popover.left{margin-right:10px;} -.popover-title{margin:0;padding:8px 14px;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} -.popover-content{padding:9px 14px;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;} -.popover .arrow,.popover .arrow:after{position:absolute;display:inline-block;width:0;height:0;border-color:transparent;border-style:solid;} -.popover .arrow:after{content:"";z-index:-1;} -.popover.top .arrow{bottom:-10px;left:50%;margin-left:-10px;border-width:10px 10px 0;border-top-color:#ffffff;}.popover.top .arrow:after{border-width:11px 11px 0;border-top-color:rgba(0, 0, 0, 0.25);bottom:-1px;left:-11px;} -.popover.right .arrow{top:50%;left:-10px;margin-top:-10px;border-width:10px 10px 10px 0;border-right-color:#ffffff;}.popover.right .arrow:after{border-width:11px 11px 11px 0;border-right-color:rgba(0, 0, 0, 0.25);bottom:-11px;left:-1px;} -.popover.bottom .arrow{top:-10px;left:50%;margin-left:-10px;border-width:0 10px 10px;border-bottom-color:#ffffff;}.popover.bottom .arrow:after{border-width:0 11px 11px;border-bottom-color:rgba(0, 0, 0, 0.25);top:-1px;left:-11px;} -.popover.left .arrow{top:50%;right:-10px;margin-top:-10px;border-width:10px 0 10px 10px;border-left-color:#ffffff;}.popover.left .arrow:after{border-width:11px 0 11px 11px;border-left-color:rgba(0, 0, 0, 0.25);bottom:-11px;right:-1px;} -.modal-open .modal .dropdown-menu{z-index:2050;} -.modal-open .modal .dropdown.open{*z-index:2050;} -.modal-open .modal .popover{z-index:2060;} -.modal-open .modal .tooltip{z-index:2080;} -.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;} -.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);} -.modal{position:fixed;top:50%;left:50%;z-index:1050;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} -.modal.fade.in{top:50%;} -.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;} -.modal-header h3{margin:0;line-height:30px;} -.modal-body{overflow-y:auto;max-height:400px;padding:15px;} -.modal-form{margin-bottom:0;} -.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";line-height:0;} -.modal-footer:after{clear:both;} -.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;} -.modal-footer .btn-group .btn+.btn{margin-left:-1px;} -.dropup,.dropdown{position:relative;} -.dropdown-toggle{*margin-bottom:-3px;} -.dropdown-toggle:active,.open .dropdown-toggle{outline:0;} -.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";} -.dropdown .caret{margin-top:8px;margin-left:2px;} -.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;} -.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} -.dropdown-menu a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333333;white-space:nowrap;} -.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#0088cc;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);} -.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;outline:0;background-color:#0088cc;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);} -.dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#999999;} -.dropdown-menu .disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;} -.open{*z-index:1000;}.open >.dropdown-menu{display:block;} -.pull-right>.dropdown-menu{right:0;left:auto;} -.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"";} -.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;} -.dropdown-submenu{position:relative;} -.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} -.dropdown-submenu:hover>.dropdown-menu{display:block;} -.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#cccccc;margin-top:5px;margin-right:-10px;} -.dropdown-submenu:hover>a:after{border-left-color:#ffffff;} -.dropdown .dropdown-menu .nav-header{padding-left:20px;padding-right:20px;} -.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.accordion{margin-bottom:20px;} -.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.accordion-heading{border-bottom:0;} -.accordion-heading .accordion-toggle{display:block;padding:8px 15px;} -.accordion-toggle{cursor:pointer;} -.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;} -.carousel{position:relative;margin-bottom:20px;line-height:1;} -.carousel-inner{overflow:hidden;width:100%;position:relative;} -.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} -.carousel .item>img{display:block;line-height:1;} -.carousel .active,.carousel .next,.carousel .prev{display:block;} -.carousel .active{left:0;} -.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;} -.carousel .next{left:100%;} -.carousel .prev{left:-100%;} -.carousel .next.left,.carousel .prev.right{left:0;} -.carousel .active.left{left:-100%;} -.carousel .active.right{left:100%;} -.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;} -.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} -.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:15px;background:#333333;background:rgba(0, 0, 0, 0.75);} -.carousel-caption h4,.carousel-caption p{color:#ffffff;line-height:20px;} -.carousel-caption h4{margin:0 0 5px;} -.carousel-caption p{margin-bottom:0;} -.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} -.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);} -button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;} -.pull-right{float:right;} -.pull-left{float:left;} -.hide{display:none;} -.show{display:block;} -.invisible{visibility:hidden;} -.affix{position:fixed;} -.fade{opacity:0;-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;} -.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;}.collapse.in{height:auto;} -.hidden{display:none;visibility:hidden;} -.visible-phone{display:none !important;} -.visible-tablet{display:none !important;} -.hidden-desktop{display:none !important;} -.visible-desktop{display:inherit !important;} -@media (min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit !important;} .visible-desktop{display:none !important ;} .visible-tablet{display:inherit !important;} .hidden-tablet{display:none !important;}}@media (max-width:767px){.hidden-desktop{display:inherit !important;} .visible-desktop{display:none !important;} .visible-phone{display:inherit !important;} .hidden-phone{display:none !important;}}@media (max-width:767px){body{padding-left:20px;padding-right:20px;} .navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-left:-20px;margin-right:-20px;} .container-fluid{padding:0;} .dl-horizontal dt{float:none;clear:none;width:auto;text-align:left;} .dl-horizontal dd{margin-left:0;} .container{width:auto;} .row-fluid{width:100%;} .row,.thumbnails{margin-left:0;} .thumbnails>li{float:none;margin-left:0;} [class*="span"],.row-fluid [class*="span"]{float:none;display:block;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} .span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} .input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} .input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto;} .controls-row [class*="span"]+[class*="span"]{margin-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;}}@media (max-width:480px){.nav-collapse{-webkit-transform:translate3d(0, 0, 0);} .page-header h1 small{display:block;line-height:20px;} input[type="checkbox"],input[type="radio"]{border:1px solid #ccc;} .form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:10px;padding-right:10px;} .modal{top:10px;left:10px;right:10px;} .modal-header .close{padding:10px;margin:-10px;} .carousel-caption{position:static;}}@media (min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";line-height:0;} .row:after{clear:both;} [class*="span"]{float:left;min-height:1px;margin-left:20px;} .container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px;} .span12{width:724px;} .span11{width:662px;} .span10{width:600px;} .span9{width:538px;} .span8{width:476px;} .span7{width:414px;} .span6{width:352px;} .span5{width:290px;} .span4{width:228px;} .span3{width:166px;} .span2{width:104px;} .span1{width:42px;} .offset12{margin-left:764px;} .offset11{margin-left:702px;} .offset10{margin-left:640px;} .offset9{margin-left:578px;} .offset8{margin-left:516px;} .offset7{margin-left:454px;} .offset6{margin-left:392px;} .offset5{margin-left:330px;} .offset4{margin-left:268px;} .offset3{margin-left:206px;} .offset2{margin-left:144px;} .offset1{margin-left:82px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;} .row-fluid:after{clear:both;} .row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;} .row-fluid [class*="span"]:first-child{margin-left:0;} .row-fluid .span12{width:100%;*width:99.94680851063829%;} .row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%;} .row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%;} .row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%;} .row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%;} .row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%;} .row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%;} .row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%;} .row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%;} .row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%;} .row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%;} .row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%;} .row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%;} .row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%;} .row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%;} .row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%;} .row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%;} .row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%;} .row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%;} .row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%;} .row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%;} .row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%;} .row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%;} .row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%;} .row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%;} .row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%;} .row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%;} .row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%;} .row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%;} .row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%;} .row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%;} .row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%;} .row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%;} .row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%;} .row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%;} .row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%;} input,textarea,.uneditable-input{margin-left:0;} .controls-row [class*="span"]+[class*="span"]{margin-left:20px;} input.span12, textarea.span12, .uneditable-input.span12{width:710px;} input.span11, textarea.span11, .uneditable-input.span11{width:648px;} input.span10, textarea.span10, .uneditable-input.span10{width:586px;} input.span9, textarea.span9, .uneditable-input.span9{width:524px;} input.span8, textarea.span8, .uneditable-input.span8{width:462px;} input.span7, textarea.span7, .uneditable-input.span7{width:400px;} input.span6, textarea.span6, .uneditable-input.span6{width:338px;} input.span5, textarea.span5, .uneditable-input.span5{width:276px;} input.span4, textarea.span4, .uneditable-input.span4{width:214px;} input.span3, textarea.span3, .uneditable-input.span3{width:152px;} input.span2, textarea.span2, .uneditable-input.span2{width:90px;} input.span1, textarea.span1, .uneditable-input.span1{width:28px;}}@media (min-width:1200px){.row{margin-left:-30px;*zoom:1;}.row:before,.row:after{display:table;content:"";line-height:0;} .row:after{clear:both;} [class*="span"]{float:left;min-height:1px;margin-left:30px;} .container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px;} .span12{width:1170px;} .span11{width:1070px;} .span10{width:970px;} .span9{width:870px;} .span8{width:770px;} .span7{width:670px;} .span6{width:570px;} .span5{width:470px;} .span4{width:370px;} .span3{width:270px;} .span2{width:170px;} .span1{width:70px;} .offset12{margin-left:1230px;} .offset11{margin-left:1130px;} .offset10{margin-left:1030px;} .offset9{margin-left:930px;} .offset8{margin-left:830px;} .offset7{margin-left:730px;} .offset6{margin-left:630px;} .offset5{margin-left:530px;} .offset4{margin-left:430px;} .offset3{margin-left:330px;} .offset2{margin-left:230px;} .offset1{margin-left:130px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;} .row-fluid:after{clear:both;} .row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;} .row-fluid [class*="span"]:first-child{margin-left:0;} .row-fluid .span12{width:100%;*width:99.94680851063829%;} .row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%;} .row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%;} .row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%;} .row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%;} .row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%;} .row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%;} .row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%;} .row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%;} .row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%;} .row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%;} .row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%;} .row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%;} .row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%;} .row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%;} .row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%;} .row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%;} .row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%;} .row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%;} .row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%;} .row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%;} .row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%;} .row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%;} .row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%;} .row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%;} .row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%;} .row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%;} .row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%;} .row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%;} .row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%;} .row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%;} .row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%;} .row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%;} .row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%;} .row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%;} .row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%;} input,textarea,.uneditable-input{margin-left:0;} .controls-row [class*="span"]+[class*="span"]{margin-left:30px;} input.span12, textarea.span12, .uneditable-input.span12{width:1156px;} input.span11, textarea.span11, .uneditable-input.span11{width:1056px;} input.span10, textarea.span10, .uneditable-input.span10{width:956px;} input.span9, textarea.span9, .uneditable-input.span9{width:856px;} input.span8, textarea.span8, .uneditable-input.span8{width:756px;} input.span7, textarea.span7, .uneditable-input.span7{width:656px;} input.span6, textarea.span6, .uneditable-input.span6{width:556px;} input.span5, textarea.span5, .uneditable-input.span5{width:456px;} input.span4, textarea.span4, .uneditable-input.span4{width:356px;} input.span3, textarea.span3, .uneditable-input.span3{width:256px;} input.span2, textarea.span2, .uneditable-input.span2{width:156px;} input.span1, textarea.span1, .uneditable-input.span1{width:56px;} .thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;} .row-fluid .thumbnails{margin-left:0;}}@media (max-width:979px){body{padding-top:0;} .navbar-fixed-top,.navbar-fixed-bottom{position:static;} .navbar-fixed-top{margin-bottom:20px;} .navbar-fixed-bottom{margin-top:20px;} .navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px;} .navbar .container{width:auto;padding:0;} .navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px;} .nav-collapse{clear:both;} .nav-collapse .nav{float:none;margin:0 0 10px;} .nav-collapse .nav>li{float:none;} .nav-collapse .nav>li>a{margin-bottom:2px;} .nav-collapse .nav>.divider-vertical{display:none;} .nav-collapse .nav .nav-header{color:#777777;text-shadow:none;} .nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .nav-collapse .dropdown-menu li+li a{margin-bottom:2px;} .nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#f2f2f2;} .navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#111111;} .nav-collapse.in .btn-group{margin-top:5px;padding:0;} .nav-collapse .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none;} .nav-collapse .dropdown-menu .divider{display:none;} .nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none;} .nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);} .navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111111;border-bottom-color:#111111;} .navbar .nav-collapse .nav.pull-right{float:none;margin-left:0;} .nav-collapse,.nav-collapse.collapse{overflow:hidden;height:0;} .navbar .btn-navbar{display:block;} .navbar-static .navbar-inner{padding-left:10px;padding-right:10px;}}@media (min-width:980px){.nav-collapse.collapse{height:auto !important;overflow:visible !important;}} diff --git a/taiga/base/api/static/api/css/default.css b/taiga/base/api/static/api/css/default.css deleted file mode 100644 index 0c7abb09..00000000 --- a/taiga/base/api/static/api/css/default.css +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (C) 2014-2016 Andrey Antukh - * Copyright (C) 2014-2016 Jesús Espino - * Copyright (C) 2014-2016 David Barragán - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - * The code is partially taken (and modified) from django rest framework - * that is licensed under the following terms: - * - * Copyright (c) 2011-2014, Tom Christie - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 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 HOLDER 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. - */ - -/* The navbar is fixed at >= 980px wide, so add padding to the body to prevent -content running up underneath it. */ - -h1 { - font-weight: 500; -} - -h2, h3 { - font-weight: 300; -} - -.resource-description, .response-info { - margin-bottom: 2em; -} -.version:before { - content: "v"; - opacity: 0.6; - padding-right: 0.25em; -} - -.version { - font-size: 70%; -} - -.format-option { - font-family: Menlo, Consolas, "Andale Mono", "Lucida Console", monospace; -} - -.button-form { - float: right; - margin-right: 1em; -} - -ul.breadcrumb { - margin: 58px 0 0 0; -} - -form select, form input, form textarea { - width: 90%; -} - -form select[multiple] { - height: 150px; -} -/* To allow tooltips to work on disabled elements */ -.disabled-tooltip-shield { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; -} - -.errorlist { - margin-top: 0.5em; -} - -pre { - overflow: auto; - word-wrap: normal; - white-space: pre; - font-size: 12px; -} - -.page-header { - border-bottom: none; - padding-bottom: 0px; - margin-bottom: 20px; -} - diff --git a/taiga/base/api/static/api/css/prettify.css b/taiga/base/api/static/api/css/prettify.css deleted file mode 100644 index 03bac748..00000000 --- a/taiga/base/api/static/api/css/prettify.css +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) 2014-2016 Andrey Antukh - * Copyright (C) 2014-2016 Jesús Espino - * Copyright (C) 2014-2016 David Barragán - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - * The code is partially taken (and modified) from django rest framework - * that is licensed under the following terms: - * - * Copyright (c) 2011-2014, Tom Christie - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 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 HOLDER 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. - */ -.com { color: #93a1a1; } -.lit { color: #195f91; } -.pun, .opn, .clo { color: #93a1a1; } -.fun { color: #dc322f; } -.str, .atv { color: #D14; } -.kwd, .prettyprint .tag { color: #1e347b; } -.typ, .atn, .dec, .var { color: teal; } -.pln { color: #48484c; } - -.prettyprint { - padding: 8px; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} -.prettyprint.linenums { - -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; - -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; - box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; -} - -/* Specify class=linenums on a pre to get line numbering */ -ol.linenums { - margin: 0 0 0 33px; /* IE indents via margin-left */ -} -ol.linenums li { - padding-left: 12px; - color: #bebec5; - line-height: 20px; - text-shadow: 0 1px 0 #fff; -} diff --git a/taiga/base/api/static/api/img/glyphicons-halflings-white.png b/taiga/base/api/static/api/img/glyphicons-halflings-white.png deleted file mode 100644 index 3bf6484a29d8da269f9bc874b25493a45fae3bae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8777 zcmZvCbx;)C_xI8uA|W7xq_j#%h^VwEi1aQcAh9Cd-O?@H9STb~NP~34f^_H7uax#!+fb7$_H2zAwW6n7Z!0000ArS}S&0015o0088Y5&!^z zw3#|@004hMT}AsX4u=E$i<_I9zcLPo!(y?vwzdGkKk{Gv)xqI#XJ==(x3|~V*8l(j zgTefF9f!j$E-nH9fS#V7tE;QOyRNRT5D3J7kEpAw!(y=j0AO=-v%0$auMQfG-rL)| zy}kXbc6@vc001T?CIA2c7K^>UzCJ!a{;PvRp*A))5)u+_|3!CqcUoGSi;K&~#>V92 zBme-oyuAGN>sNk$en3C~7K@#ooi#Nz#o=&JC=`iAE-x>mP$)DSeQ!61=H7z~ENU>X}6`}_NMc6LrqPT+7j7K;Ug!4?)4XJ==Pjg9N;>j(q_g+d)1 z9PI4upin3z5;-z5g2Um0gM-h{&pkXm5D3J|%F4~n&EVkR^z`)6(Gd!TT3ub;+}zyV z-MzfL%*@RE`SWLSaq;r<^2x~w4u?BGKOY(zIy*c28_nr{hlhs;2M2#^3F)Nv zPdF}IG*z_#jDXn*e9H63RHwPdcZdW_&-&>$83;OA?eA+ftx1Re_9uQIzd>QG5LeX` z)1^kEMQKc$SDaBBJwq)%xh^Hj?q@>&Lq?co%9zKVrq8ZmIx7Bqz{k-1M3EXf4XgA< z2W~EQI-7=G4qZp5R{_kaY_bO5UVn}-vGo-V5fKzp3Mc%jF8`5ToR{C?1Gk<=$vXx0 zr}uUOKPPzOfz*qhJv{X2=KH$xA`C2Scon|Jq|;f)nHna{5M^59d5;>%KT%6|LbD1Mxb8?a@K4#@lXv7C{anU)wEPesEeVN*3){|H~GXdXMVW+t+s$BR#6_oH8 z%F>1>$w=9$^qCtcy;~@|N62e&2isiDYqdM>wp23JE2E&5$I?SQ@*#uq`j1Ov9dp7Mj=Gp0 zm`>05aJEY>^F{OszU|;bY}yfNwm7EBuYYAAwQCsSf?LjvCRVgIHm>>F1lit^w#1ol zn)h-9JpJ>qf_?z-x%~Y(DIJHCfLDH7RBX2&_6WmkdZw`qlcYk02?LyYAnG|Y+~b@aBD(#6Zxx6*A!E* zc`#tLRyJr3B&|V9j~8;jZ#ZdwSgKRg;m-*~^MtVW|9-#x_K^rbw4ybjp#ezp$@j1V z>mSNHeTSil#*5}F$lBLpz!mb>GS^R^2<@Lfi-%^`C6D%E>Nu#ja<*#}_L8v7kRW57 zCsCD2!vY!?)4%zkGBgluVt;$Ud(wig%rVmjXTs)Ln;g7Y?fTLt1>9AICV;Sy;JL1C z;bRjbij~7w5gWbUaj#LUme}mst%QunOzf)+WTLl(%JqE`Q@nua3$q4RJh$|Sj(aYK z6|^QzY1--c2k_RBWYdT^fC3T4c*uI&hK97!vnVK~F^LhUB;F_7(JF{6j}wxt>T~pl z*DYM1$1zU4MgMF*G;AItCk8qiJz@6@t#1?AUi*-R+p6g_T_*$(yNO1hvv{1r4hyL_ zH4T|eY*LR|*=KK+mh8jSBV>NN6mNqFJd;{asMl3aaSLUXwl)omok~A}ralJz)s4h9 z)?gm~4juCoBF3&2^YywjhEs*6nQY%rI+;PnI&0bWH;qM3ld6l->BuFwRS0wUQmro6 zk60nsuxoo)Oa5StGKirmpuZ%{lq=NtYU@F`rI=E&o{ehm+h^kEZ2QlCZJ1`RWm*J|)3YLPe0S=akRwB<=(93DTkEqcw-ceNZHW*VjKbJWjM z0_AL&PRlL4yqweImMT6}qi~?ig12UL+=Lv8udtNUPhV5+q1s()ex4L-Rm7@(DxI%V zi9WG~B0mk{kJC&I_c_Uw5Q^lu#%SL$eSw;B5fBq_EWH{OsdW;cc=FAPIa=s$?NqZ)FcJfqE!V`m7=H)jo-8fcqqP2nqp^U8+%i{ zYbj~p?Z=dm-^Av5E8UpE)ASDw#uEP*D^m7<3A6xNrD`}4>M8vtk!D<>hIvawpUg_@ zB@cYauus8NT3Px}1oYJ_>83o74y zBFEO#R9r}s!h|}iyFAG0Lu%AbE+a-=!&&fUvVO7e{rV8PNpO!!eZm~-@zq^eYM#?- zJf<$u?ZNkJee?Bws&tQY2vjQrC`1Sx1N_ z*|TxWEe$e>&b>cqb(2q%IrBiSWXqNOl3O6vsqq`4^ZUed)%g*Fy^|`g z*eoZdRy6!&Ozg>p>2OWPl-1+d+(N&cpzi4j0%`kNgfB~ce9)Qi3ujq%TS+BQ%Nx67 zMAaSkt6QjdO{VwQ%Gb8>x9bIEg%Ws0&VYR?S3tm+y-FnmY*71*^E?<%@(Q$qYN>E$ zf?u0C9x2?%BPkI%LpGn^#gHsfueW`p6cJD$hRB7}LJqKyIsl`bC}5QPhz`W_XZfx+ z^KY`xaJ=<)g;OGcI4(UWW1{KO5$kzlg(i^zWk*1F`C)Se$GTkDI>JmDXUL~jD<{>o=5Q__yPsY&=J{z#dwNB^L4l8)wOkAHXG_KBROe>FjL6+#mA!5&!2)=7u*9 zQ8w)eKB+-hXxc}xs}@s6X46ll3*&J$M7Rp3(74q1yFGX5@uMy)FWlh@z#)6T_0}8z zXVKiovW@F^NkX;r?n+4iC?CYRh>Jl(W^0Ud^|j%bOfs5)JP$Rl5QMtC=~t)ch0v>8 zC?lXPcOMH-|IjoHbIAE3)~?zM5iw$Bwuju5qS_1(!L`c6huuY%lX7WUqT-_WLj#Ol z@K60?!dw?>Z-H~slJ7)$I^!;$Ki4~S7>9+Ax|Y1-VGvaJTo9GczugyLhVE*~1*;oV zO2yMm!5%VYDBUF!b`cp*M96IqRqXzkpv&$5OJ~R~aj)S?9s9ia3liS40Soe~qT;AX z&!B3V(4@P}qEZ@*7i?=#5Ja)U*GP9h>}atqJOOGI)4);!rbj#%CsWC(o8-#5(5rv9 z`4x{GU6*0Q7$INbTfsN8`T9;c`{LWYtFwW(?dp5_bUOO!?a`no)VDG{p;Qx^6k^2Q zGWMfeV<;gyRczzv>kp!-qbD*>bo1Zkk(#dF=|9W)ze zj{3o?38hX)GxW;+d!BNKyPhODGt}XVUQ?8CMOxJY&H}2q_sph)gHWnEe(ERLR?s-d zi>a9LF1AGobDH%^CvaUixQf806^z$}f7Ex~!P+OB2pwizG$&mbGB<)hiDwi1)I7AtY3g4A)0K5dfpJD6_X(Cb(x^}F*m9f2n3(~`~h z>#Pu`V>!Cp_Wg@%w+%GxOGBjhV1tH>toHj!{cvmMuCmDf3PFHzbu&~e_oU5k1Ko0` z#+9DO(DcU8$M!QsF66u~uzR8_pGEnp8s~AhxvOE5K9zGNMVF$=nq+C;4GNWM0!K!5 zMGd4w@AZr_YKuDm267hL<2Aeolo3I7Y0`$iR zU|Ug<6=>^|GFK^ZEi!vet~yr5?8BD_8>aJg*HZK*jEQfiO*8#iTQm(#-fzLe8?)U)qVO{Vz5hHhx`yI^6_xf>auo zGtjphsu*>q{s`hyj{T(&)Q_-a9ja)ZV0kw+n@zD+UnvM!;(Ej57};CQH@I-ICm9{5 zG4i@oH(vmh7*%80TG&fJw<>DR< z`;psILS?!gY`Z4B`PJvjXNZK}(ATd;h!NRE^wCNdP|#J6KTSo$%c{Hyh+OHeP^MNF zmmnFH=k|0O9G#BMk{phIlsso>V zxsKKB4FL}Ax4PzWY!rcaXC;#Q*v;ID8~ESyG7*m}^9}C|v5((3(BY`CVl<|k?cJCx z0P7mhPZH_My(&U5RoPdEstNf?mrJU*%WskM3e+Aq)-V|~QOCx|U$E;q7ILjI&+^-V zd%N`b-lo4c3jeU9-=du?E;PqXAaDi`d<(zNaOcd<6_VG@*J^#4J^ zC+7F9Gq2o8Xp!ylj=VLaMM?>ABO`ch)RQl!HnnD~u`_P5~R4A^hWy8h!p(ODfxVcaoiB1~++e#E9?QWUO|CfNbZJG;W{|U% zAE#@0rEN@>J1<{%y;D*vi+!CCze3<~8q|_qq+OCh&CY;cu7TZoI81KaL29Lt;Jx;O z@Wnp)t80mm^Hz4laYgsyXNpeSwjF64R>_6GUKoYHZh`*ge>(qv`X9QyhE8#W@;W-e zNz|;%5@vmy*N{rm+IkZ2A(ggY<2*k!GvbeCyNbn)P4tkAD`mMLz)(94xz*Iq4VryD zpQ{*~-gc>vP*g0IT&K0Ska(ceDIq!SQY}&en>6wHl%6gf_q?TjvgUcL_>zYD@dFxs z^?*wg+Yf;^OUvGSGN7F>!2o69BgH3p0aWFkFSY|B4AgWWY6iPE6b#6g_z2IKx&fdb zB!+;sEIAy`E-iO8sKCsXO`;H(u4C0E^^8u|Qrx4^i|-e790(vM(`>&ft4Vlq|E@WF zfiY5sy1^nW{2l>-8g`oeDb(5i4d*Oy1p1`wSmfyp&eEzOX-Svd8WE2-@} zKCH=0jw)MI?;c3RxotLY9u5`;r`gn7eJ^czu76BV-S4uz_GE`H8dN+hTP|+#I#@7v zmr8?z>f3wLiajl-hvS8bQ;d6a=DvS!^x_=XXDti^ob?R%UilLmD#GONmC1;aw&}&p zKvQDG#^p;zb|mZ<_^dO8nRw6`b8(22HaY*uaA?90pcikkEgyQbQeJ`LbJ*N_uwaM4 zx#V7|*L~IE!Iuse_7vQzgxT^X^Fh(8VQnl@jXE<(Xti;|`FpFpbG{;7u()C{An%1k zf^EmM{m(peW}&~9=>(vZkf+x{U><-wQdg%dHhC+Jp3CF6JjR$S;2NbyyB*$n&#$K>pDvHF`ylkI_$@+2zuIzmI_2k4p zW)MTNXYhN!U8zQl_8Ku%;hL4z zL$`iVTSM70xNEVejEsI8D#XMGvi$w6p`f>Azx#hYt_E5lT>ykXz^8t4{-*{#P^zwV z**VJ4h_HqC4ayIgQU@RL>7lDejbH zCW##i=*%-7!A1Ugmruf9v}NAO9TkZP0(TSla7po2bLAheh`FJ+q{kvr z4iqjn(a|*~&ZKbYquknUsE#pkZM9E3fWVmNrML8%2_!UxXtun!?OW$QRP!%_G*%QFwV@16o9UrE1yZHg|XTIlP1aXlJYZt|_ zkiH8!M$oS_G`lV7Sl3o)iGMd1I>?X7f6wzNwF(bXUVB;Yih^k!y=|Jc#V=QRF!$?x zN<4tIZgK|`_v#6~H?s|X=CIgO`@qGw1^oooJ#=8(QRm*3RAxbh&Uxgat zX8sK6)aqeBlkxwig`m~~>;PR_YUgmjIJ>>ZrEMLodaVFU;OGN0%tahcd9{9&HcOxD zkB)1Ay1mgr(2L8hC5-#og9y1wO}Q9+d@_2$j zb@Bc5F#UsLyj??F-TsfMQS$~3DWYU=&5BCM5NrtB>at|Vn=;`w@qk@x{)PRW`BTDx zc_naV>`A&i04`!UyJxzbin+f%AkiY`({I_7J(0J2sJR4KRJI;BVXUYX_3|H9RjRXV#`cAS{qQQ=SA;XshzW2;(K74rK zHeEA}w(pIj{T&>Ar>m92Tyf~n+^vMcp0@8ygCf(!vm2$6RnS?44ah*fJGHK@j!ywZ zE?>?nu~O#iW34|rK|XgETSMIMO<9vXG^Cf~bHRM-;pDV1`~VuJ>4yg`Tajx-3V>tC8F&PnD?Jfz8bvRJk-Ylck3uh}b>rdEth~lq z8Tv_C1Iz@iNqpWeeTxCMX)OB3xGtTkiMa246_980iFlE8GZ*!Z6jqKKcE?XgqjEVm zl-#09+JP#6*uNH}FC1oeo}8CftvK&lCtN;~HFHw^c6Gbmo-q|15Eue_D|#)2@=ViR zo@VgdVHEWmZU$}DRdY3+KRsw!L-T#1L-uwNIlA;Zq`8*(ZBbB>uOeegW2gABiKRqF zyK_R4JJ^YX<=SfzoJdG7<%IJ1CcfGgZwXV=bz!Eyob-ouBOAJkJm@f7)6%opy^V(fkWW)4)eCHRWPqW?oW_+_i z^~0I0|H%Z7DEa`*rUlub0hjr#Y>_gxxStmccx<)~uR33y+e^)PE`jc7y~)@iE%+tn|6uLsrRs8a*;$Q5$@33D zT03|$X=e|P)Qc8oh!XY;1qCBB-P7)zp9H`knF$fFC*`T9`qaTJkA+SIB zO?DGe{7S;OYlY*3_?x$EZ?u@nK@|+2QbE$EI zbEz4rAu(#cTl2YW&(tue7gFHbMQiyI@%x4DCd^mHw=jSC?7I{NQ9kXPq?s?{@I!eAo$Ky=ie}Lrqmf_~JkMww7oQL$Uu=8$YL7>; zN=4P^VYURTKeOQyV<6bX9HxJlT$rbF8BqQ3dk!nYD3ov!lg@~43sb3MVTpH^Gskez zkj^~$SkUx&WlQVBb&SM(Q7r;;)XE=JhR%^Dvv>oNCgVLdWYdG-RZQQw)rI!0Q~0 zipkHz8QgpH&%gv5>C#VAd{k;(SdNLJ0A12g!%|X&;;r+tb zIuZ)WF*{+lA4DwV_(Wg$oSgsUjuRKKOeemeX`UnRM7%v+Wmab~`uxs=lTjL%vK)Z< zti7v}vFSMHLHDk+r1dt-IY;+GzeGY%twSkd>C$5#S#~ZBbmj3VK=P_*~~R`pGGqr5zSqiD+^fZ&QFF>IMX){2qhOL&EwnxAucT&5Xwa zw972*z2)xEwMtu{`T)jDssjI~b^hmrx2MYQ+0A#+Fpb*Y0-wuIU7NM<6bx!neEs>Z zVeNF^%3%XWn2)4FycJwVbqCd$C$hQd8jg+gk8J`OjhKbFu?@lwhFigQ>o3=0=K1L? zV$g8ry19?tc*tEzY3=LeXin3ff=tyh39jpaFjkCAfZz9&r=+jp;v#(y>`pSyHu=t; zYCN>vRkeQ|$3Ccz%rElh$*&%(lsp)D2^z(hmK%eza=DnyjEod2I&EYRVckrdQ`wb{ zh8xFzX5qj&μ$=cRF8EySH18_z`fwKEEj488`0Jj!~W#6wqD)i2VFf)b?e>OD?! zhL^uFmk-|X`LN>gcIuoa@lwjf4@OzcLViCzH{5%BP4b%TrL_e&%=1BshIEAondhTV zR_Q~1pbvugVz}F|Lq1`1;k(VYw~I(;P&3~fpp+U}SFlfG9SvRpC8vVNuYXgt8LI04 zZfr_)yoxIC>C}1XKW1}ykk@ygQK_md*eethKQWYy^N?mYTo=TIb!yheD)^Do-?aLq zM3zYSP9J|j`*nY~)=|zOS;n689tK4j1OTvi1$UXcLV{WVb z#qZikj?Q4|)>lDAevbG?BNqC~`kKh<$q!QDQD%|MQsEEGF=^F9PC8ZN8mkXXu`h$H z+UTpafDCekWvVZM_IgwS?xzOyouvkxCVV~VehfRC&v_u5-? zojKok_Bod0kETK=cgJ-^e9f^Tz$YC&VF63(dB0)S#zrh6^m^Rn-Zq2Wbfq=h-7I+-JpqA3Fj3I3)&vXc`Pdsc&^k2~ zexi6$J97~J{9KTFQ6f0epGZM*<}K;xV4SDHE%^bR_~Lus1mG+siIKhh_QKk4kpm`~ zNTbh;&`-hPogPBN%f9xmnJQ0iTW!(?D3=G~5^VjfmJPj|d!?l{dOus%YXbI^s27v+ zZ&{afg|p#l6ega<_E_oj`K>Rx2!V5a{bmz_LZUwxpvTvm1LGCXY<%X$eCk;KW*iL? zUUzx%l63Y)(k%3vmC84KFPkC9&5zSj+oQM&DRTGfD>JN+)ay&D327;%}WUW+#C0v zbdtsklKjoxMH&DFNVDF;>b2-SD`{$Rp~ngq3qVCniW zW2`IG1^|^pihgL~cyuxr&rW&PDToH(5a(iT-U(uxmk&)aRD^&rl_Y1Gx5UO-g17IyvYTj%;Hw z4T#uJrt-YW@YlS5Z@>-H8$r&Wr{_fn;B>|Nw;3_Rz(>U4bv2)8Z#$R*(=>c(*R>i z_o~#^^*d@NMwY0C7FQ>*f~k!_=TPi>j&?1;lkhJVx~R>p%ZE3@be=8yoMbcl=Ic-b_Uiq+VH@FHm zWk5rDIe-wP5l%$pd&B@wuY2u#@q)v@Jdrgsqp>q-Zf=rZ3|UNn3Mk9%xXh>Nbez458$FgJdK{m)P;86I&jzWU>f z5AMO|q#pWd7V~v{2di)XocW_~m&E6-hDeq@{v)OcS~o-tL#O>KAt8~O%jA1!w+PdO z58wIY;c7q{y+0nhz>dS0UizdiRLQau?ZC=9za?qVZJtzns%GudWpW(+_|~<(T^iHn zB2>GlODl9}k%r)BuB^%(#s01A`pbejPNl@3V9~OdE>%3hN@=R&KOh88ymh8e6!{8;*Y~Q?oiItZ9oB5oM%C$sw$oDZ^yNG2WA2kBbK-~Nn>#DB zni-*Q)hVCEyTjq2GcKN5@%O5uJ->~pP`Z2NVU=goXtkBp#9bmYposaPJGcA;K=tpRUd}=B$Ifk)aCi~N2v?@ML8+*BI1iIL>rj%M+{R-xC9E{i-A8U zeNw4D1BgyAtpM)plzjT1^U!fg)cNGo*)+Z7nbST20^=mfj0y*nemtEvdWY4vKYq!Z z@a(-5^%r_|z!y*!*>N~soD!EL&W+bJ0T$A7NS}aHQ6zAZ5zR)vRe9rP%GJ;A0tPUT zQ5SFar=Y^OEF||E50EiYN!F0%kG7sscbo+#RuXf~OL$B-2>9)1_hCz`w!@d%#VKI? z+(_*fMc@is5)IH=wL|6Ig5G`I2#0Y19DeLa*|mDXmF#y#Nm;KmFbTgu++5% z`@OxA?FdPn0AA1=)1Y_DBZuD18Ex0*d>NnEp$cMe3yUR7EhTmK>28w!IX6_+)vWtr zbrw3%>cPG!Jw|PQ;lf&SpZ#Ipv`_&U_=F>{vKV~jNzUaCGwA>{P{NJ9u+p*av|J>r zbH;WVmtJYO1KZ4&Cf@4J>|5fv$`8b&WH8>8Uo2X_oY>d)I;#1#Q%KDI-`OSgu!D-vR(xv*#`u>VO|0Yv>bIO(pK zsqX<|6!3TMqj+TveqJ}LM>p$%+nF6A6%Q``r38YiSruO?e-kuBgKEapwz>lgXqgJ^ znK0y5n}bEWpF}Aowb6^6Fn6>-zfvdDlhJ|0I-(&dRW#p8jo@n(h0t~hJbMBz%GbNL zDsw8x$&5)l1MW)%B;9tq(&!y@ww_!L67aO22mV%(QAW+d&Jf(<^|!4Jre!xbce~fB zad2_ro!|8|KqV>{Zo`xQH{*R#?KS&6m_gtu)2mKenSiyeh}Z$8z>oe$tb+zG$OVMq z`+Mb$U9U#lx8km)*3fd7w%7w+&v}rK7hdKUC##jb2!QoLh-j}*mH74OBycZme@v|` zQU;i15cN_JY&tZkD=NS!iFoEGrVW}sxq?el@aYy(c2R+U0Da{!j#e=rU%3}l*Cgm}e4I9_U{AnZ1*LgLJA44=L|I zlotd3zuoJ9Gd7&Rw*`mw(yOWzB6bJb+M$)ah?0+)5}Yt4^GZXtyhSH5NtoH?k z^7}^DaMhS^FKJvP>UX*yR~N{PdNV|$nKf#E?fg+|Dj%uV2!b_8WWYPwwOf;7F|0nQ z9or>ce|6rem!~!Hs~WJ?x7+2b3?eV$l*6KHC2)NO(wOC{Gf)$P8x~0e0pI%BH!rI} zA!M1Z@1Ku#%z{{dPNd9#r=sM2Bb$mmwcVH7_hTPPqQ~afb|)lA`PQt~W%%@ipgr_k zvGYt1b(3^Q+niJsDrxn1>B)e#F15E#>Ks);f_kbS{H$YEl>Gw`pv#hIqbvlHAkm^45s6k6{{bM-_?kC%9}F%?ouzPw@ms1O!SjmC%29 zY0u$N7mo!sB#n^g41%wByB_OGt#was2}MJH5>(8J>s?&h1a+QB@kWYKjsU1eN=h(I zqf-+bYV{QI^Kwf(?$_JP(e8t5t45U`?{8lwGjN1C939@=H9l3qSzUEek)kkcjrBS` z_!k6RemT-a(>6~OFm38FM1O=Ks{KjUzhHpg<#=rX#sBg!#8_I|++7<3sx# zVH%YL_AnNv5^Bm`U<$mIp1SoJ+`!e(1M9Q&mB8%lLL{fwnF{Q3V{xf=CyL>vFHS^c z=2vX$a`BgwpZu&Y`tA}N&h%nv{^hv!7NB8LQ!SAdU+~03zg54!?`XYoLI`v|`^_() zz07!J&?65xAFBWLbMr}b( z%$(~gBByD%lEr@wC}_m++Zte4je;JmCFsrKbv^Q<>v*()51`h&>Ed_ytz{K=c9J9uU!5fhQvU$}#fYZ!`p@>cZ-8orDyevxM+omMq=@)+=h9=U?Ze6+-4`fAv=(x@ z6nyY!?g#N3WRHy-*yLe1(`db*Tj^KfgIwR?#?JRdCuuzY-FqqS3d-t1<0|$ASXYVm z^R{TbTOK9U-(|A{yzb;-41rXP=J#0YG|!N~Fnoer*<{`a-Jfc-aGUm5Azu6`AZwr% zV1g@IN#Niy)-4W6GRhuW2z+3+9WBcxTmEJN&O7!5WM!eTsA#3P@84S);GrK zS0!=Ql?P+Pbt?P=X^I+|W?{$48Y2!`q5BLDKpUA2X#fgF0yWB^r~-IA`nG65QLe>AI2TuS5NY#v(o-!>B2eG?Q>6;Vg=4i&Ym1* zB=7UIjU5pXpwXAG9uhU7%$>k=%-Zh>sz{cRH3QLo{)p1q*Nud`(UpR2vpW2^!9Jejtc2j za72G7nWk3Ea{VIvLY@Zunq}F<8G?r|>}We@+trn-&i`$M%3*x@${^ z>V2sPqg8$^LIC$}t(0Om8X?DHA_~;wia9lJ`fgK&MI_(s;Myl`BuHd#SWhL`XVlgT zTC#t*Y5jYw_Iz*j#c|lLTp`NfpkJyna!H5IgD9T`?0eE{B8A?<8_S=HH<91!!}2IT z$F7TdzeBK(b(viYH^cQ1_r8bypJM`H8KoBawY4TD)Jv+&2x&D^(yOH=M@b2}lw3c)bfk{M+p9qy;(MANI>L*PmLva@uf)<})hKHlWAs7`Nw* zZTUfZADt0Z{NY60A?qnsvP>c{6CUITh}zb`VARfRPi-w2M|yz%6(8QSa(&M+aqF9E zBx!1|8@cm)b{9L!+R;7T?_5H=rhxD<(4K|8?cT;I{ZX@GYP0ayI`29?pgf&^vtt5a zct5nH+@Q#E<%o_w0l2;mw~loy6Umu|^|lHebpkudh>O_5%>U*9s9yE{sh4hVxPCE$ z@|=V2vCQ!eXJRTzQhTn+T^041AR&5&PBzd(tR~5_eyzp4Dh<5_OemL+`1tacx#1!e ze&Ng`Sj?xozRvTseVc-%jo_o<+OJ}`>jGN@JqTiq(5X4TER09>9DvIqNyn6bXFs0^ zQ%b$q1l5q9G6Xp~*6@y{TDLI+HeW8hXRv**PZ%E0`}jd)4E^jtpa9;DmmP-@|DtV{N`)&57SEOm7 zU)hr3fYi*=Nw9cXxInRvAvc?@FPwU{E{Nz)OvwS6PIag}(AHf3E@Zc@cu;lH^!LL) zc>^50rde4!o1zPp2yBvRywZwjw@dTzc%ZS`xEL%5NF;eT!KFtmN&O3Do-HzhUMBw{ zdVPVUo@FTjX%fOOuQj9D-vg|{itS>aE<1(C8oo<2W&5AGZDA%Q;R40eQ{zKd%TRbL zx<>~0Y;dMbwde1)*RoPc>%*2hdK;D;OS38vBvl}%x14KdHEM68+={%m9Lf&9`Ma>G zByt(e*M59`zHt#-`#C`#mEGsh33(_ORWf%K5WU`vkac3=onr&*Bb7_rBZW~Gq_0DN z@(h&y=L_=gl)F@?8>&c$n?vTr5P(ftI= z(!9Z)MA=+r<-QPX#$j4z)rPa(mmG{%^#C?m-H7i6^{Hj|85W_V%E!ldNa&X$|Nu_Ju%(4CHgKWr0nCC zJH&`}Ihp#(cZ2(1fu$ON(sLMoUR%5#Sb;Hd()d)de-S-2@QURyU7}GgfN3=37)Cqn zY2*L*T}}v_X30H+z6Y4_vE`YMmus3ax8FeU1N4?Z$%pjNme-kSRYM;FmoD2Y3E}?*K^(M~bGNRoG%fm0 z4eDS^y<#~`nHgrp?JF0@xh9EJ6>uD<993}$N0RjE%eFXguTY86phd()w|3qmj4$R1 z)qbn~<$BBlLNfeLV+4I*+@Sqj(;Q?$Htwb0e?6_#@*8exnUKx+e9W#loHzX4|Gm%p zUoKQ5lv$~Xz9M$XkxPM@W?xh_lj7tm3c_aV=ZQ;!##gHP;~A!vBERy@v7iq1TMBM5|j9xWWhld%? zd;;MTd->g1hcf*%Et%_SgPDb*VGmXmm23A_6mP1FQU$)}A|Zwf1o<|c-oFpD+RW>V z6B(nFBia0S*~ui59cXtvg+j6N=^OlU?eYzjpDcZtpxUS#gv#>CQF1RoO=R}8S+=2-Cm=BoE zP3Ih+FunX>V{k7&#`e3PTWz(?mn3s8n;B9JM)uoR6M<0Dk{<-5mM{ zgM|!J;y0yeLp`uzuqfe#u0w|+U6hw8W0K%b2unqFsvBqQrBfGqe}TX$9-s@B1e{MU z;6Z#G>5$hno~x8GFQqr3WQ`^sixGJg?;rs&fT6uq)S@tTvQed*ieMsgC={ctqPMTP z_mhGDI}K>?$a*$6#bJ`85A{Qs;VR0u+@@D)D3V|6*`n3^%+hjwL99c4 zUYCZ?mW}iF*k0tY@<VdJPRhwI#XkSS4lpwYSStIhfD)$IR z_DmFu?fO0D$}U7N7*IT5z-W64M@HB#$J_&l_WqBpww=gK^~xC&`c**E23(Nm9!Z7> zXQ|4ND5TG+r;0NSm{CcdsO~nw0eqKPbt5YUbQlvW?=qd={kd96Pe$RL&SvX3Mk;uG zO2BTHLmGeR+*8$4YaAm)xL9u;(kD{VV=y}P_+-r7uN5xnx&s!+zE8_6 zb-%A+jD77~rU%rOv(3t)cPAY3wk`=P{CK#ORzsWKo2Ix+F2{>XVU03TO=&*Uvwq<8 z{=knE#(OS*>{L3_hV**)pLa*mm?kr^^0qCRCCO#%>FRm@^!^r!9SZW|1mP87bTLK5 zkx15bT*4UDW}YM}GACuzFxCB5Ed0q~E(?glJ9!)4WJV@0j=cW+?N2zvB)G=PXG(yE zi8p&uyEIP;sDJ)PH+DzzCdpK&l+mlW&BC+Zk{$)Z_cL17sqGJSl0)($r^V_q+aKFm zqqcDQptr%|9Rv2%>Ho!9D-VTU-9fJ^@%U5R~zZ~69FoM^D$JS&{Q<-j)dQggjvPK&p!3^00_SV5M6 zX8Bf0mW-8;d;Vg8Z(@8bb%38;&Ge>z`q)I*{PTlvB!V~d_RCd8i}{Dh0}?Le)(%<&-P`vwc zg$SZnbk;3-Xtw(FFY>joL~rE{xyl^k78^<$o0AAbHC9?^8d`nVz19{%dQw8Hwzgv4e>+N~d- z$4TFLYnP!c_?Y|%(B4;!<>8g7Ec2fG`aHh0m zHj9SpJSaLi6r#y(gYFNx>yvdum4^TN{ip~;!Maj?7-+egXqqh~#-bP~PDrJvp?YC7 zmQYNj51vr&;1zj;wY{Dh&)-+(rpX34*mR^y{seKvCA((9<)Eo092m|@=-P;}=s5DI z+4Da@CtQq_hbM*))`BedI!L<8mmVLrWV@t}5Z{~o37vdF77l;9C|a9O74F}3mQD|N z{fj#GTd%}pFk@XPYRR=T@V@6dI2K3pB{OclV;Z^mn0T-jp}Nx>gI2W2qTXCJCB)zS z=2LcUF!!(68Y1nTC%JPV1APc@L~_`hQ+K+B`5h2Vo+OQ!5n9*knD>j}m%V^;uvpUb z#5qvSeigAno(}V=vLJw|*UNO~{dS4hrh?QT3%?&9@6z8Scil7;UA20dHa+l1sGCk^ zfp+!-$&uPEcJ6)uMey6I5F5SyO>xpS4dBgy1hpGdy208r%Bw|VVbZ8?_TvlbFxuF! z8;D2lHW0y<(5;x+-E@a%TwIkE3~Bl-)w-pOq8wZ(ISnq}kuR{L*JN`MlPRmeFlb z28DIBw|KK_?!9~4ebr#MWQJcdos=dRH_bk zccXV%M^zvhpojQ^Lihue(QJA4ULWfWgNoZ2s=NaBFu2^enbYB(Qb+5)a@h-KH&}5b%s9anSEqYLjH}*Jgj{X?oKX(%jwb1wcR-C zbgU%H>3;w`FqrDIE@$SRXyUET#DVX}!UY=yjy+->G4geiCr1d`K^}sMm9fr16nK!d zu=JX*0}}8QYLi+YWN-;p^-`Os^?A&$a7{XTnA*|psB_{wk<9ugMolU?iyOE0MDQaV zd$_IYi3}EsGQsQ9k>p7Fn(z96cO}!zjK&?|Ttf3zPo?8TpkqycNst_($8o7gMd4qR z+5QL*u{OT|B#K~}9yV{%U7H7^OYrFCq=yAce0{dGT8T^C<%vI(F{80lX^epKX8Y@D z&nF`KZVU5eJw~^8%@%sPcsYR<>H$l4M0Oz=?&H83s+F}JPO(<;)>aQ7)Zrz!^6gjI zl7AaNPVLq-JKY$wS%Y>nCmVX+N27f!#wykgYlkKWYFIBDDSRFl2{@Z9E_`M1qqQ%^fLGIL!L`w}0G^w{A8zj=&o+rsuytm8 zyO28;$_`^kxA*|7w;rUXzvXzTv}DJ8HZd&~@XR$xET$MxfdG$7RQ>42-iF zFahxl|CgMYAHwaZn}hcBa=R#9gw)(k?>Xga;`yqL1K~KiTF&xcLhNh;4jkI0C*IMo zlES>YZS>IWk3X;by8Xj1DT`SoPk&Z6<0afKkvM^|+6xtbFm;^1!$<%(Y!+6kj{R?i*mElN79&BC-;pcNBxeF`OJruX&TV*rbD;A+$!HAa++bSM zB@$p%cA!5a-$6KGH}dOR=cKH4U&1yY2gP4@$4M3{Y%!PjSEH0jzQV2`0FSx;ev#eR*{$cHbh$#)Wm1ox6ENAvprF1Bn^6+;k>P^Zr zuMw|6xDsr~H)G;lXh2KOz?<%odFHG|*!v|TAA-}t-eP-lbbgqq;$M+LT~|ajC85^4 zwJL>wQp(;q1Z?Wnjx7+C&S0$F))<TQP#y$b?!}kAn>NJFz)y8~+TqLrb9mwY zIvgo+ezK*-x!u*nF@w1r;hcS6jD8&akVJwgJ2&O&^wC$IN$G-;jXxidj(!wB6ICEn zyyjHJChm$DV|W;WeLimN$0~buaQ3mdDs8@RzmjEypnqYA*M;+P0lPYtFLe3)%#^@k^-K_o=UC-ob8lxZQ*O2T|wm3Qq0zRpHlZL{S4 z1vAruL?f0pUVb$B647d}r~u%ZN0ESNYptfq8P>=vih2v)@0t$ojz;>MHE$L| zlZXPJ8{@>#GMD=E?>@!-xa}lwJ_rs6{dmZHQq=dhpKK8RnQmkevw%5$pY{(S#q`cO zy5ibOS0al)=T|*QqMF%j9}Wi*KSEEsq;Aj6hkbafZ(m2nUXQNZ2d!|3*-;oRUj|5E4r zH)z&t!vp8Y=Gg^gCs?ehP>v3rOzp$ILzAL~kv!F@QCC_q`TH_4@bcT8_?{>CCz(c` z)5bcHA4tlUCM+C}G}H-B^|cs^4n zOis2;)TIGxaF=_rH;WbMI(?{B?69`-glde>jzw_6lzYzw3l=ac*b z+MaL^Mq|z6OtlGyB|v8jk90}IO8#NQ$~G`vwrwizwJJa&zkjl~g`=GyQXN7wEy1g| zMJT}A^>0yYWw#+`w2xYPw~dqtmrJiU^HHY1NgkxhQ^wirdWmkjjCo{JDQvtjnEiP{ zgEXKIoFSCD|Emg}3VMb#k2nYFS@-md%~or_`20j7A!h`3SeIg0^H>9#Ahw;>()rtO z2PLWlBgBR4F*bwoxELQUb}E2Z@M6mRYkiG<(ykC zG>PPs{K}fg*_3e$8X&ncMbQC)dn)=eLZRDn>Sfs97z74+r%Ly~cS;gbcPxj4^e&c` zh>K)A%fO7Llc+m7@|` zR4i`ttPWl0nl85-PaT>4P0_dSyx%7k>NLRjLvvc2Dr%=|)5-s|1lbe`w&1KNLQ!$O z5`V1ErA*~}*XRlPg}Q8{rPD)iK2A06dcpQp9jihuSd1wqGs)q#~X#V`-F zL`1_~8e^ChMCEPirGL`N+}dOomSGtJ!b<^rV@XiisMj;7JdOC&g2Q2NYq>e;f74EL zOj>NpbX%*eW=2U3M3pL1%RRB&=G_bj2cOHrLmaO0%Zhmj62vX$gQQ0e z%z{?_(TDj=C%nvRbmZKXl(_cxu~q4w@hrq)GGD@xQMF6T`5Y3*svvG-1(C{6d1v4y z84@-|3-Ys~tmcxuwX_+8qWil1%2MWc|(*lX7d} zdYht=OZ}a`YnSF}Hi^Xdl_piw7kAw(myHpVPxR8?KNE6A{@C+u7WQ9~-Ykyn*^-c; zb_;7&tceJRtcd(HvP9r*;YT#+cCq<%y~*te4NbLLnX=$|)XJ`E`(sROd7f!oAq%xdCmXPv-CX;(mvbaIAgFq_NXHKc7>Z!ol zqQU)JT!U#Ysta2{TqFF8O`NwFFxGEmSL0E*A--&ocRnUwZAW~P_O}RB>6DR7j?5E& zgZ*)gSMA@^Xz4Arziip))L;r>jmg_<(W8@xnkPJkOz1OTXAuny3=9kv1x@+NPoKa2 E4-Uwn`Tzg` diff --git a/taiga/base/api/static/api/img/grid.png b/taiga/base/api/static/api/img/grid.png deleted file mode 100644 index 878c3ed5c196539c4e2da35b7787ab08e98b9cca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1458 zcmeAS@N?(olHy`uVBq!ia0y~yV2EO1U^L=jV_;yYsyN=rz`(#+;1OBOz`!jG!i)^F z=14FwFy>{3M3hAM`dB6B=jtV<`9GBGMIdz2D!M|aoOm@!_toHsXebF z0|WCbPZ!6KiaBrZ9xRd$6>zvH$K1H+!GC)ZGlxUT6N3&O>g+MyXT$$|O|0zGv_Cq& z(H9Mk?a!Zie|Yw>-W>hvsuBi$!O4A3yXqrbor^N= z?)Y6HXq9wWXk%jMGYcyv91ew>D?P1)*W2XyMM1a-4$s}#;F1%u$g-~wpZ`II98tgP zUUR9I7&9yQy^mBAXK0&h5^>>brXwglEu(L-GFsGN_-|uk=Zy_6#p`NH*8Km)_~-KF zoNo=!_8c#sWAa>N-HQ`bo%5fbxey)esBZQ2{nIXNu`Os-bmok|{*PU&?;Wq;K7ViC z-rR_~+KOL=H4)jidxUnsl5uxWInH}pb>|{zg1Kqa^u)65X8UD|ehd)XEf4<}YtNlW|awFoTf4#T=YOyae zyVmG=clY;{ zAzn+2N`B@EsFntb4f8KoFNf?;?#bt7DDRW|qYf%nJzf1=);T3K0RY0WPZ9tC diff --git a/taiga/base/api/static/api/js/bootstrap.min.js b/taiga/base/api/static/api/js/bootstrap.min.js deleted file mode 100644 index e0b220f4..00000000 --- a/taiga/base/api/static/api/js/bootstrap.min.js +++ /dev/null @@ -1,7 +0,0 @@ -/** -* Bootstrap.js by @fat & @mdo -* plugins: bootstrap-transition.js, bootstrap-modal.js, bootstrap-dropdown.js, bootstrap-scrollspy.js, bootstrap-tab.js, bootstrap-tooltip.js, bootstrap-popover.js, bootstrap-affix.js, bootstrap-alert.js, bootstrap-button.js, bootstrap-collapse.js, bootstrap-carousel.js, bootstrap-typeahead.js -* Copyright 2012 Twitter, Inc. -* http://www.apache.org/licenses/LICENSE-2.0.txt -*/ -!function(a){a(function(){a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;a("body").addClass("modal-open"),this.isShown=!0,this.escape(),this.backdrop(function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in").attr("aria-hidden",!1).focus(),b.enforceFocus(),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();var c=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,a("body").removeClass("modal-open"),this.escape(),a(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),a.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var b=this;a(document).on("focusin.modal",function(a){b.$element[0]!==a.target&&!b.$element.has(a.target).length&&b.$element.focus()})},escape:function(){var a=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(b){b.which==27&&a.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),b.hideModal()},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),b.hideModal()})},hideModal:function(a){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(this.removeBackdrop,this)):this.removeBackdrop()):b&&b()}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f).one("hide",function(){c.focus()})})})}(window.jQuery),!function(a){function d(){e(a(b)).removeClass("open")}function e(b){var c=b.attr("data-target"),d;return c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,"")),d=a(c),d.length||(d=b.parent()),d}var b="[data-toggle=dropdown]",c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),f,g;if(c.is(".disabled, :disabled"))return;return f=e(c),g=f.hasClass("open"),d(),g||(f.toggleClass("open"),c.focus()),!1},keydown:function(b){var c,d,f,g,h,i;if(!/(38|40|27)/.test(b.keyCode))return;c=a(this),b.preventDefault(),b.stopPropagation();if(c.is(".disabled, :disabled"))return;g=e(c),h=g.hasClass("open");if(!h||h&&b.keyCode==27)return c.click();d=a("[role=menu] li:not(.divider) a",g);if(!d.length)return;i=d.index(d.filter(":focus")),b.keyCode==38&&i>0&&i--,b.keyCode==40&&i a",this.$body=a("body"),this.refresh(),this.process()}b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var b=a(this),c=b.data("target")||b.attr("href"),d=/^#\w/.test(c)&&a(c);return d&&d.length&&[[d.position().top,c]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu").length&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this)):this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f+"."+this.type,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.show)return c.show();clearTimeout(this.timeout),c.hoverState="in",this.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!c.options.delay||!c.options.delay.hide)return c.hide();c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();return c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove(),this},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(a){var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content > *")[this.options.html?"html":"text"](c),a.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

'})}(window.jQuery),!function(a){var b=function(b,c){this.options=a.extend({},a.fn.affix.defaults,c),this.$window=a(window).on("scroll.affix.data-api",a.proxy(this.checkPosition,this)),this.$element=a(b),this.checkPosition()};b.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var b=a(document).height(),c=this.$window.scrollTop(),d=this.$element.offset(),e=this.options.offset,f=e.bottom,g=e.top,h="affix affix-top affix-bottom",i;typeof e!="object"&&(f=g=e),typeof g=="function"&&(g=e.top()),typeof f=="function"&&(f=e.bottom()),i=this.unpin!=null&&c+this.unpin<=d.top?!1:f!=null&&d.top+this.$element.height()>=b-f?"bottom":g!=null&&c<=g?"top":!1;if(this.affixed===i)return;this.affixed=i,this.unpin=i=="bottom"?d.top-c:null,this.$element.removeClass(h).addClass("affix"+(i?"-"+i:""))},a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("affix"),f=typeof c=="object"&&c;e||d.data("affix",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.defaults={offset:0},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(window.jQuery),!function(a){var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.closest('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),a.support.transition&&this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();c[a(e).hasClass("in")?"addClass":"removeClass"]("collapsed"),a(e).collapse(f)})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".item.active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide",{relatedTarget:e[0]});this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c),g=typeof c=="string"?c:f.slide;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):g?e[g]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c;return this.query=this.$element.val(),!this.query||this.query.length"+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.chrome||a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keydown,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},move:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}a.stopPropagation()},keydown:function(b){this.suppressKeyPressRepeat=!~a.inArray(b.keyCode,[40,38,9,13,27]),this.move(b)},keypress:function(a){if(this.suppressKeyPressRepeat)return;this.move(a)},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
    ',item:'
    • ',minLength:1},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery) \ No newline at end of file diff --git a/taiga/base/api/static/api/js/default.js b/taiga/base/api/static/api/js/default.js deleted file mode 100644 index 0cecc85a..00000000 --- a/taiga/base/api/static/api/js/default.js +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2014-2016 Andrey Antukh - * Copyright (C) 2014-2016 Jesús Espino - * Copyright (C) 2014-2016 David Barragán - * Copyright (C) 2014-2016 Alejandro Alonso - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - * The code is partially taken (and modified) from django rest framework - * that is licensed under the following terms: - * - * Copyright (c) 2011-2014, Tom Christie - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 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 HOLDER 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. - */ - -function getCookie(c_name) -{ - // From http://www.w3schools.com/js/js_cookies.asp - var c_value = document.cookie; - var c_start = c_value.indexOf(" " + c_name + "="); - if (c_start == -1) { - c_start = c_value.indexOf(c_name + "="); - } - if (c_start == -1) { - c_value = null; - } else { - c_start = c_value.indexOf("=", c_start) + 1; - var c_end = c_value.indexOf(";", c_start); - if (c_end == -1) { - c_end = c_value.length; - } - c_value = unescape(c_value.substring(c_start,c_end)); - } - return c_value; -} - -// JSON highlighting. -prettyPrint(); - -// Bootstrap tooltips. -$('.js-tooltip').tooltip({ - delay: 1000 -}); - -// Deal with rounded tab styling after tab clicks. -$('a[data-toggle="tab"]:first').on('shown', function (e) { - $(e.target).parents('.tabbable').addClass('first-tab-active'); -}); -$('a[data-toggle="tab"]:not(:first)').on('shown', function (e) { - $(e.target).parents('.tabbable').removeClass('first-tab-active'); -}); - -$('a[data-toggle="tab"]').click(function(){ - document.cookie="tabstyle=" + this.name + "; path=/"; -}); - -// Store tab preference in cookies & display appropriate tab on load. -var selectedTab = null; -var selectedTabName = getCookie('tabstyle'); - -if (selectedTabName) { - selectedTab = $('.form-switcher a[name=' + selectedTabName + ']'); -} - -if (selectedTab && selectedTab.length > 0) { - // Display whichever tab is selected. - selectedTab.tab('show'); -} else { - // If no tab selected, display rightmost tab. - $('.form-switcher a:first').tab('show'); -} diff --git a/taiga/base/api/static/api/js/jquery-1.8.1-min.js b/taiga/base/api/static/api/js/jquery-1.8.1-min.js deleted file mode 100644 index 3b8d15d0..00000000 --- a/taiga/base/api/static/api/js/jquery-1.8.1-min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v@1.8.1 jquery.com | jquery.org/license */ -(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.1",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b
    a",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="
    t
    ",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="
    ",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j=0),h[l]&&j.push(k);j.length&&t.push({elem:f,matches:j})}n.length>o&&t.push({elem:this,matches:n.slice(o)});for(d=0;d0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function $(a,b,c,d){c=c||[],b=b||q;var e,f,g,j,k=b.nodeType;if(k!==1&&k!==9)return[];if(!a||typeof a!="string")return c;g=h(b);if(!g&&!d)if(e=L.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&i(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return u.apply(c,t.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&X&&b.getElementsByClassName)return u.apply(c,t.call(b.getElementsByClassName(j),0)),c}return bk(a,b,c,d,g)}function _(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function ba(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bb(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bc(a,b,c,d){var e,g,h,i,j,k,l,m,n,p,r=!c&&b!==q,s=(r?"":"")+a.replace(H,"$1"),u=y[o][s];if(u)return d?0:t.call(u,0);j=a,k=[],m=0,n=f.preFilter,p=f.filter;while(j){if(!e||(g=I.exec(j)))g&&(j=j.slice(g[0].length),h.selector=l),k.push(h=[]),l="",r&&(j=" "+j);e=!1;if(g=J.exec(j))l+=g[0],j=j.slice(g[0].length),e=h.push({part:g.pop().replace(H," "),string:g[0],captures:g});for(i in p)(g=S[i].exec(j))&&(!n[i]||(g=n[i](g,b,c)))&&(l+=g[0],j=j.slice(g[0].length),e=h.push({part:i,string:g.shift(),captures:g}));if(!e)break}return l&&(h.selector=l),d?j.length:j?$.error(a):t.call(y(s,k),0)}function bd(a,b,e,f){var g=b.dir,h=s++;return a||(a=function(a){return a===e}),b.first?function(b){while(b=b[g])if(b.nodeType===1)return a(b)&&b}:f?function(b){while(b=b[g])if(b.nodeType===1&&a(b))return b}:function(b){var e,f=h+"."+c,i=f+"."+d;while(b=b[g])if(b.nodeType===1){if((e=b[o])===i)return b.sizset;if(typeof e=="string"&&e.indexOf(f)===0){if(b.sizset)return b}else{b[o]=i;if(a(b))return b.sizset=!0,b;b.sizset=!1}}}}function be(a,b){return a?function(c){var d=b(c);return d&&a(d===!0?c:d)}:b}function bf(a,b,c){var d,e,g=0;for(;d=a[g];g++)f.relative[d.part]?e=bd(e,f.relative[d.part],b,c):e=be(e,f.filter[d.part].apply(null,d.captures.concat(b,c)));return e}function bg(a){return function(b){var c,d=0;for(;c=a[d];d++)if(c(b))return!0;return!1}}function bh(a,b,c,d){var e=0,f=b.length;for(;e0?i(h,c,g):[]}function bj(a,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q,r,s=0,t=a.length,v=S.POS,w=new RegExp("^"+v.source+"(?!"+A+")","i"),x=function(){var a=1,c=arguments.length-2;for(;al){g+=k.slice(l,n.index),l=p,q=[c],J.test(g)&&(m&&(q=m),m=e);if(r=O.test(g))g=g.slice(0,-5).replace(J,"$&*"),l++;n.length>1&&n[0].replace(w,x),m=bi(g,n[1],n[2],q,m,r)}g=""}}o||(g+=k),o=!1}g?J.test(g)?bh(g,m||[c],d,e):$(g,c,d,e?e.concat(m):m):u.apply(d,m)}return t===1?d:$.uniqueSort(d)}function bk(a,b,e,g,h){a=a.replace(H,"$1");var i,k,l,m,n,o,p,q,r,s,v=bc(a,b,h),w=b.nodeType;if(S.POS.test(a))return bj(v,b,e,g);if(g)i=t.call(g,0);else if(v.length===1){if((o=t.call(v[0],0)).length>2&&(p=o[0]).part==="ID"&&w===9&&!h&&f.relative[o[1].part]){b=f.find.ID(p.captures[0].replace(R,""),b,h)[0];if(!b)return e;a=a.slice(o.shift().string.length)}r=(v=N.exec(o[0].string))&&!v.index&&b.parentNode||b,q="";for(n=o.length-1;n>=0;n--){p=o[n],s=p.part,q=p.string+q;if(f.relative[s])break;if(f.order.test(s)){i=f.find[s](p.captures[0].replace(R,""),r,h);if(i==null)continue;a=a.slice(0,a.length-q.length)+q.replace(S[s],""),a||u.apply(e,t.call(i,0));break}}}if(a){k=j(a,b,h),c=k.dirruns++,i==null&&(i=f.find.TAG("*",N.test(a)&&b.parentNode||b));for(n=0;m=i[n];n++)d=k.runs++,k(m)&&e.push(m)}return e}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=a.document,r=q.documentElement,s=0,t=[].slice,u=[].push,v=function(a,b){return a[o]=b||!0,a},w=function(){var a={},b=[];return v(function(c,d){return b.push(c)>f.cacheLength&&delete a[b.shift()],a[c]=d},a)},x=w(),y=w(),z=w(),A="[\\x20\\t\\r\\n\\f]",B="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",C=B.replace("w","w#"),D="([*^$|!~]?=)",E="\\["+A+"*("+B+")"+A+"*(?:"+D+A+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+C+")|)|)"+A+"*\\]",F=":("+B+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+E+")|[^:]|\\\\.)*|.*))\\)|)",G=":(nth|eq|gt|lt|first|last|even|odd)(?:\\(((?:-\\d)?\\d*)\\)|)(?=[^-]|$)",H=new RegExp("^"+A+"+|((?:^|[^\\\\])(?:\\\\.)*)"+A+"+$","g"),I=new RegExp("^"+A+"*,"+A+"*"),J=new RegExp("^"+A+"*([\\x20\\t\\r\\n\\f>+~])"+A+"*"),K=new RegExp(F),L=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,M=/^:not/,N=/[\x20\t\r\n\f]*[+~]/,O=/:not\($/,P=/h\d/i,Q=/input|select|textarea|button/i,R=/\\(?!\\)/g,S={ID:new RegExp("^#("+B+")"),CLASS:new RegExp("^\\.("+B+")"),NAME:new RegExp("^\\[name=['\"]?("+B+")['\"]?\\]"),TAG:new RegExp("^("+B.replace("w","w*")+")"),ATTR:new RegExp("^"+E),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+A+"*(even|odd|(([+-]|)(\\d*)n|)"+A+"*(?:([+-]|)"+A+"*(\\d+)|))"+A+"*\\)|)","i"),POS:new RegExp(G,"ig"),needsContext:new RegExp("^"+A+"*[>+~]|"+G,"i")},T=function(a){var b=q.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},U=T(function(a){return a.appendChild(q.createComment("")),!a.getElementsByTagName("*").length}),V=T(function(a){return a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),W=T(function(a){a.innerHTML="";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),X=T(function(a){return a.innerHTML="",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),Y=T(function(a){a.id=o+0,a.innerHTML="
    ",r.insertBefore(a,r.firstChild);var b=q.getElementsByName&&q.getElementsByName(o).length===2+q.getElementsByName(o+0).length;return e=!q.getElementById(o),r.removeChild(a),b});try{t.call(r.childNodes,0)[0].nodeType}catch(Z){t=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}$.matches=function(a,b){return $(a,null,null,b)},$.matchesSelector=function(a,b){return $(b,null,null,[a]).length>0},g=$.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=g(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=g(b);return c},h=$.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},i=$.contains=r.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:r.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},$.attr=function(a,b){var c,d=h(a);return d||(b=b.toLowerCase()),f.attrHandle[b]?f.attrHandle[b](a):W||d?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},f=$.selectors={cacheLength:50,createPseudo:v,match:S,order:new RegExp("ID|TAG"+(Y?"|NAME":"")+(X?"|CLASS":"")),attrHandle:V?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:e?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:U?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(R,""),a[3]=(a[4]||a[5]||"").replace(R,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||$.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&$.error(a[0]),a},PSEUDO:function(a,b,c){var d,e;if(S.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(d=a[4])K.test(d)&&(e=bc(d,b,c,!0))&&(e=d.indexOf(")",d.length-e)-d.length)&&(d=d.slice(0,e),a[0]=a[0].slice(0,e)),a[2]=d;return a.slice(0,3)}},filter:{ID:e?function(a){return a=a.replace(R,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(R,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(R,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=x[o][a];return b||(b=x(a,new RegExp("(^|"+A+")"+a+"("+A+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=$.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return $.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=s++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[o]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[o]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e,g=f.pseudos[a]||f.pseudos[a.toLowerCase()];return g||$.error("unsupported pseudo: "+a),g[o]?g(b,c,d):g.length>1?(e=[a,a,"",b],function(a){return g(a,0,e)}):g}},pseudos:{not:v(function(a,b,c){var d=j(a.replace(H,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!f.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:v(function(a){return function(b){return(b.textContent||b.innerText||g(b)).indexOf(a)>-1}}),has:v(function(a){return function(b){return $(a,b).length>0}}),header:function(a){return P.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:_("radio"),checkbox:_("checkbox"),file:_("file"),password:_("password"),image:_("image"),submit:ba("submit"),reset:ba("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return Q.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e",a.querySelectorAll("[selected]").length||e.push("\\["+A+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="

    ",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+A+"*(?:\"\"|'')"),a.innerHTML="",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bk=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return u.apply(f,t.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j,k,l,m=d.getAttribute("id"),n=m||o,p=N.test(a)&&d.parentNode||d;m?n=n.replace(c,"\\$&"):d.setAttribute("id",n),j=bc(a,d,h),n="[id='"+n+"']";for(k=0,l=j.length;k0})}(),f.setFilters.nth=f.setFilters.eq,f.filters=f.pseudos,$.attr=p.attr,p.find=$,p.expr=$.selectors,p.expr[":"]=p.expr.pseudos,p.unique=$.uniqueSort,p.text=$.getText,p.isXMLDoc=$.isXML,p.contains=$.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b0)for(e=d;e=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*\s*$/g,bz={option:[1,""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X
    ","
    "]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]===""&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{cj=f.href}catch(cy){cj=e.createElement("a"),cj.href="",cj=cj.href}ck=ct.exec(cj.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("
    ").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:cj,isLocal:cn.test(ck[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,ck[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==ck[1]&&i[2]==ck[2]&&(i[3]||(i[1]==="http:"?80:443))==(ck[3]||(ck[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cQ.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window); \ No newline at end of file diff --git a/taiga/base/api/static/api/js/prettify-min.js b/taiga/base/api/static/api/js/prettify-min.js deleted file mode 100644 index 2ae43c52..00000000 --- a/taiga/base/api/static/api/js/prettify-min.js +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2014-2016 Andrey Antukh - * Copyright (C) 2014-2016 Jesús Espino - * Copyright (C) 2014-2016 David Barragán - * Copyright (C) 2014-2016 Alejandro Alonso - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - * Copyright (c) 2011-2014, Tom Christie - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 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 HOLDER 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. - */ -var q=null;window.PR_SHOULD_USE_CONTINUATION=!0; -(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a= -[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;ci[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m), -l=[],p={},d=0,g=e.length;d=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/, -q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/, -q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g, -"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a), -a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e} -for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"], -"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"], -H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"], -J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+ -I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]), -["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css", -/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}), -["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes", -hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p=0){var k=k.match(g),f,b;if(b= -!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p - - - {% block head %} - - {% block meta %} - - - {% endblock %} - - {% block title %}Taiga API REST{% endblock %} - - {% block style %} - {% block bootstrap_theme %} - - - {% endblock %} - - - {% endblock %} - - {% endblock %} - - - - -
    - - {% block navbar %} -
    -
    -
    - - {% block branding %} - - Taiga API REST - - {% endblock %} - -
      - {% block userlinks %} - {% if user.is_authenticated %} -
    • - - {{ user }} - - -
        -
      • {% optional_logout request %}
        • -
      -
      • - {% else %} -
    • {% optional_login request %}
      • - {% endif %} - {% endblock %} -
    -
    -
    -
    - {% endblock %} - - {% block breadcrumbs %} -
      - {% for breadcrumb_name, breadcrumb_url in breadcrumblist %} -
    • - {{ breadcrumb_name }} {% if not forloop.last %}›{% endif %} -
      • - {% endfor %} -
    - {% endblock %} - - -
    - - {% if 'GET' in allowed_methods %} -
    -
    -
    - GET - - -
      - {% for format in available_formats %} -
    • - {{ format }} -
      • - {% endfor %} -
    -
    - -
    - - {% endif %} - - {% if options_form %} -
    - {% csrf_token %} - - - - {% endif %} - - {% if delete_form %} -
    - {% csrf_token %} - - - - {% endif %} - -
    -

    {{ name }}

    - {% block description %} - {{ description }} - {% endblock %} -
    - 
    {{ request.method }} {{ request.get_full_path }}
    -
    -
    - 
    HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}
-{% for key, val in response_headers.items %}{{ key }}: {{ val|break_long_headers|urlize_quoted_links }}
-{% endfor %}
-
    {{ content|urlize_quoted_links }}
    {% endautoescape %} -
    -
    - - {% if display_edit_forms %} - - {% if post_form or raw_data_post_form %} -
    - {% if post_form %} - - {% endif %} -
    - {% if post_form %} -
    - {% with form=post_form %} -
    -
    - {{ post_form }} -
    - -
    -
    - - {% endwith %} -
    - {% endif %} -
    - {% with form=raw_data_post_form %} -
    -
    - {% include "api/raw_data_form.html" %} -
    - -
    -
    - - {% endwith %} -
    -
    -
    - {% endif %} - - {% if put_form or raw_data_put_form or raw_data_patch_form %} -
    - {% if put_form %} - - {% endif %} -
    - {% if put_form %} -
    -
    -
    - {{ put_form }} -
    - -
    -
    - -
    - {% endif %} -
    - {% with form=raw_data_put_or_patch_form %} -
    -
    - {% include "api/raw_data_form.html" %} -
    - {% if raw_data_put_form %} - - {% endif %} - {% if raw_data_patch_form %} - - {% endif %} -
    -
    - - {% endwith %} -
    -
    -
    - {% endif %} - {% endif %} - -
    - - -
    - - -
    - -
    - - - - {% block footer %} - {% endblock %} - - {% block script %} - - - - - {% endblock %} - - diff --git a/taiga/base/api/templates/api/form.html b/taiga/base/api/templates/api/form.html deleted file mode 100644 index 9bbf6c97..00000000 --- a/taiga/base/api/templates/api/form.html +++ /dev/null @@ -1,15 +0,0 @@ -{% load api %} -{% csrf_token %} -{{ form.non_field_errors }} -{% for field in form.fields.values %} - {% if not field.read_only %} -
    - {{ field.label_tag|add_class:"control-label" }} -
    - {{ field.widget_html }} - {% if field.help_text %}{{ field.help_text }}{% endif %} - {% for error in field.errors %}{{ error }}{% endfor %} -
    -
    - {% endif %} -{% endfor %} diff --git a/taiga/base/api/templates/api/login.html b/taiga/base/api/templates/api/login.html deleted file mode 100644 index ab4f1aea..00000000 --- a/taiga/base/api/templates/api/login.html +++ /dev/null @@ -1,3 +0,0 @@ -{% extends "api/login_base.html" %} - -{# Override this template in your own templates directory to customize #} diff --git a/taiga/base/api/templates/api/login_base.html b/taiga/base/api/templates/api/login_base.html deleted file mode 100644 index 96870344..00000000 --- a/taiga/base/api/templates/api/login_base.html +++ /dev/null @@ -1,52 +0,0 @@ -{% load api %} - - - - {% block style %} - {% block bootstrap_theme %} - - - {% endblock %} - - {% endblock %} - - - - -
    -
    -
    -
    -
    - {% block branding %}

    Taiga API REST

    {% endblock %} -
    -
    - -
    -
    -
    - {% csrf_token %} -
    -
    - - -
    -
    -
    -
    - - -
    -
    - -
    - -
    - -
    -
    -
    -
    -
    - - diff --git a/taiga/base/api/templates/api/raw_data_form.html b/taiga/base/api/templates/api/raw_data_form.html deleted file mode 100644 index 520ff583..00000000 --- a/taiga/base/api/templates/api/raw_data_form.html +++ /dev/null @@ -1,12 +0,0 @@ -{% load api %} -{% csrf_token %} -{{ form.non_field_errors }} -{% for field in form %} -
    - {{ field.label_tag|add_class:"control-label" }} -
    - {{ field }} - {{ field.help_text }} -
    -
    -{% endfor %} diff --git a/taiga/base/api/templatetags/__init__.py b/taiga/base/api/templatetags/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/taiga/base/api/templatetags/api.py b/taiga/base/api/templatetags/api.py deleted file mode 100644 index c40b0aa4..00000000 --- a/taiga/base/api/templatetags/api.py +++ /dev/null @@ -1,258 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -# The code is partially taken (and modified) from django rest framework -# that is licensed under the following terms: -# -# Copyright (c) 2011-2014, Tom Christie -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 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 HOLDER 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. - -from django import template -from django.core.urlresolvers import reverse, NoReverseMatch -from django.contrib.staticfiles.templatetags.staticfiles import StaticFilesNode -from django.http import QueryDict -from django.utils.encoding import iri_to_uri -from django.utils.html import escape -from django.utils.safestring import SafeData, mark_safe -from django.utils import six -from django.utils.encoding import force_text -from django.utils.html import smart_urlquote - -from urllib import parse as urlparse - -import re - -register = template.Library() - - - -@register.tag("static") -def do_static(parser, token): - return StaticFilesNode.handle_token(parser, token) - - -def replace_query_param(url, key, val): - """ - Given a URL and a key/val pair, set or replace an item in the query - parameters of the URL, and return the new URL. - """ - (scheme, netloc, path, query, fragment) = urlparse.urlsplit(url) - query_dict = QueryDict(query).copy() - query_dict[key] = val - query = query_dict.urlencode() - return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) - - -# Regex for adding classes to html snippets -class_re = re.compile(r'(?<=class=["\'])(.*)(?=["\'])') - - -# And the template tags themselves... - -@register.simple_tag -def optional_login(request): - """ - Include a login snippet if REST framework's login view is in the URLconf. - """ - try: - login_url = reverse("api:login") - except NoReverseMatch: - return "" - - snippet = "Log in" % (login_url, request.path) - return snippet - - -@register.simple_tag -def optional_logout(request): - """ - Include a logout snippet if REST framework's logout view is in the URLconf. - """ - try: - logout_url = reverse("api:logout") - except NoReverseMatch: - return "" - - snippet = "Log out" % (logout_url, request.path) - return snippet - - -@register.simple_tag -def add_query_param(request, key, val): - """ - Add a query parameter to the current request url, and return the new url. - """ - iri = request.get_full_path() - uri = iri_to_uri(iri) - return replace_query_param(uri, key, val) - - -@register.filter -def add_class(value, css_class): - """ - http://stackoverflow.com/questions/4124220/django-adding-css-classes-when-rendering-form-fields-in-a-template - - Inserts classes into template variables that contain HTML tags, - useful for modifying forms without needing to change the Form objects. - - Usage: - - {{ field.label_tag|add_class:"control-label" }} - - In the case of REST Framework, the filter is used to add Bootstrap-specific - classes to the forms. - """ - html = six.text_type(value) - match = class_re.search(html) - if match: - m = re.search(r"^%s$|^%s\s|\s%s\s|\s%s$" % (css_class, css_class, - css_class, css_class), - match.group(1)) - if not m: - return mark_safe(class_re.sub(match.group(1) + " " + css_class, - html)) - else: - return mark_safe(html.replace(">", ' class="%s">' % css_class, 1)) - return value - - -# Bunch of stuff cloned from urlize -TRAILING_PUNCTUATION = [".", ",", ":", ";", ".)", "\"", "'"] -WRAPPING_PUNCTUATION = [("(", ")"), ("<", ">"), ("[", "]"), ("<", ">"), - ("\"", "\""), ("'", "'")] -word_split_re = re.compile(r"(\s+)") -simple_url_re = re.compile(r"^https?://\[?\w", re.IGNORECASE) -simple_url_2_re = re.compile(r"^www\.|^(?!http)\w[^@]+\.(com|edu|gov|int|mil|net|org)$", re.IGNORECASE) -simple_email_re = re.compile(r"^\S+@\S+\.\S+$") - - -def smart_urlquote_wrapper(matched_url): - """ - Simple wrapper for smart_urlquote. ValueError("Invalid IPv6 URL") can - be raised here, see issue #1386 - """ - try: - return smart_urlquote(matched_url) - except ValueError: - return None - - -@register.filter -def urlize_quoted_links(text, trim_url_limit=None, nofollow=True, autoescape=True): - """ - Converts any URLs in text into clickable links. - - Works on http://, https://, www. links, and also on links ending in one of - the original seven gTLDs (.com, .edu, .gov, .int, .mil, .net, and .org). - Links can have trailing punctuation (periods, commas, close-parens) and - leading punctuation (opening parens) and it"ll still do the right thing. - - If trim_url_limit is not None, the URLs in link text longer than this limit - will truncated to trim_url_limit-3 characters and appended with an elipsis. - - If nofollow is True, the URLs in link text will get a rel="nofollow" - attribute. - - If autoescape is True, the link text and URLs will get autoescaped. - """ - trim_url = lambda x, limit=trim_url_limit: limit is not None and (len(x) > limit and ("%s..." % x[:max(0, limit - 3)])) or x - safe_input = isinstance(text, SafeData) - words = word_split_re.split(force_text(text)) - for i, word in enumerate(words): - if "." in word or "@" in word or ":" in word: - # Deal with punctuation. - lead, middle, trail = "", word, "" - for punctuation in TRAILING_PUNCTUATION: - if middle.endswith(punctuation): - middle = middle[:-len(punctuation)] - trail = punctuation + trail - for opening, closing in WRAPPING_PUNCTUATION: - if middle.startswith(opening): - middle = middle[len(opening):] - lead = lead + opening - # Keep parentheses at the end only if they"re balanced. - if (middle.endswith(closing) - and middle.count(closing) == middle.count(opening) + 1): - middle = middle[:-len(closing)] - trail = closing + trail - - # Make URL we want to point to. - url = None - nofollow_attr = ' rel="nofollow"' if nofollow else "" - if simple_url_re.match(middle): - url = smart_urlquote_wrapper(middle) - elif simple_url_2_re.match(middle): - url = smart_urlquote_wrapper("http://%s" % middle) - elif not ":" in middle and simple_email_re.match(middle): - local, domain = middle.rsplit("@", 1) - try: - domain = domain.encode("idna").decode("ascii") - except UnicodeError: - continue - url = "mailto:%s@%s" % (local, domain) - nofollow_attr = "" - - # Make link. - if url: - trimmed = trim_url(middle) - if autoescape and not safe_input: - lead, trail = escape(lead), escape(trail) - url, trimmed = escape(url), escape(trimmed) - middle = '%s' % (url, nofollow_attr, trimmed) - words[i] = mark_safe("%s%s%s" % (lead, middle, trail)) - else: - if safe_input: - words[i] = mark_safe(word) - elif autoescape: - words[i] = escape(word) - elif safe_input: - words[i] = mark_safe(word) - elif autoescape: - words[i] = escape(word) - return "".join(words) - - -@register.filter -def break_long_headers(header): - """ - Breaks headers longer than 160 characters (~page length) - when possible (are comma separated) - """ - if len(header) > 160 and "," in header: - header = mark_safe("
    " + ",
    ".join(header.split(","))) - return header diff --git a/taiga/base/api/urls.py b/taiga/base/api/urls.py deleted file mode 100644 index 01be0d71..00000000 --- a/taiga/base/api/urls.py +++ /dev/null @@ -1,68 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -# The code is partially taken (and modified) from django rest framework -# that is licensed under the following terms: -# -# Copyright (c) 2011-2014, Tom Christie -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 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 HOLDER 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. - -""" -Login and logout views for the browsable API. - -Add these to your root URLconf if you're using the browsable API and -your API requires authentication. - -The urls must be namespaced as 'api', and you should make sure -your authentication settings include `SessionAuthentication`. - - urlpatterns = patterns('', - ... - url(r'^auth', include('taiga.base.api.urls', namespace='api')) - ) -""" -from django.conf.urls import patterns -from django.conf.urls import url - - -template_name = {"template_name": "api/login.html"} - -urlpatterns = patterns("django.contrib.auth.views", - url(r"^login/$", "login", template_name, name="login"), - url(r"^logout/$", "logout", template_name, name="logout"), -) diff --git a/taiga/base/api/utils/breadcrumbs.py b/taiga/base/api/utils/breadcrumbs.py deleted file mode 100644 index 0d10758f..00000000 --- a/taiga/base/api/utils/breadcrumbs.py +++ /dev/null @@ -1,99 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -# The code is partially taken (and modified) from django rest framework -# that is licensed under the following terms: -# -# Copyright (c) 2011-2014, Tom Christie -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 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 HOLDER 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. - -from django.core.urlresolvers import resolve, get_script_prefix - - -def get_breadcrumbs(url): - """ - Given a url returns a list of breadcrumbs, which are each a - tuple of (name, url). - """ - - from taiga.base.api.settings import api_settings - from taiga.base.api.views import APIView - - view_name_func = api_settings.VIEW_NAME_FUNCTION - - def breadcrumbs_recursive(url, breadcrumbs_list, prefix, seen): - """ - Add tuples of (name, url) to the breadcrumbs list, - progressively chomping off parts of the url. - """ - - try: - (view, unused_args, unused_kwargs) = resolve(url) - except Exception: - pass - else: - # Check if this is a REST framework view, - # and if so add it to the breadcrumbs - cls = getattr(view, "cls", None) - if cls is not None and issubclass(cls, APIView): - # Don't list the same view twice in a row. - # Probably an optional trailing slash. - if not seen or seen[-1] != view: - suffix = getattr(view, "suffix", None) - name = view_name_func(cls, suffix) - breadcrumbs_list.insert(0, (name, prefix + url)) - seen.append(view) - - if url == "": - # All done - return breadcrumbs_list - - elif url.endswith("/"): - # Drop trailing slash off the end and continue to try to - # resolve more breadcrumbs - url = url.rstrip("/") - return breadcrumbs_recursive(url, breadcrumbs_list, prefix, seen) - - # Drop trailing non-slash off the end and continue to try to - # resolve more breadcrumbs - url = url[:url.rfind("/") + 1] - return breadcrumbs_recursive(url, breadcrumbs_list, prefix, seen) - - prefix = get_script_prefix().rstrip("/") - url = url[len(prefix):] - return breadcrumbs_recursive(url, [], prefix, []) diff --git a/taiga/projects/tagging/services.py b/taiga/projects/tagging/services.py index 43cf8567..747a3ecf 100644 --- a/taiga/projects/tagging/services.py +++ b/taiga/projects/tagging/services.py @@ -34,7 +34,6 @@ def create_tag(project, tag, color): def edit_tag(project, from_tag, to_tag, color): - print("edit_tag", project, from_tag, to_tag, color) sql = """ UPDATE userstories_userstory SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) diff --git a/taiga/urls.py b/taiga/urls.py index 110285f4..95b27ce8 100644 --- a/taiga/urls.py +++ b/taiga/urls.py @@ -29,7 +29,6 @@ from .routers import router urlpatterns = [ url(r'^api/v1/', include(router.urls)), - url(r'^api/v1/api-auth/', include('taiga.base.api.urls', namespace='api')), url(r'^admin/', include(admin.site.urls)), ] From 2520eb3d077a14c8f33162f2337ec9f66dda0e06 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 5 Oct 2016 09:17:37 +0200 Subject: [PATCH 006/144] Fixing webhooks test API call if the response isnt a valid json --- taiga/webhooks/tasks.py | 6 ++- tests/integration/test_webhooks.py | 61 ++++++++++++++++++++++ tests/integration/test_webhooks_signals.py | 6 +-- 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 tests/integration/test_webhooks.py diff --git a/taiga/webhooks/tasks.py b/taiga/webhooks/tasks.py index 9e9489ab..a0b737d0 100644 --- a/taiga/webhooks/tasks.py +++ b/taiga/webhooks/tasks.py @@ -22,6 +22,7 @@ import requests from requests.exceptions import RequestException from taiga.base.api.renderers import UnicodeJSONRenderer +from taiga.base.utils import json from taiga.base.utils.db import get_typename_for_model_instance from taiga.celery import app @@ -86,11 +87,14 @@ def _send_request(webhook_id, url, key, data): duration=0) else: # Webhook was sent successfully + + # response.content can be a not valid json so we encapsulate it + response_data = json.dumps({"content": response.text}) webhook_log = WebhookLog.objects.create(webhook_id=webhook_id, url=url, status=response.status_code, request_data=data, request_headers=dict(prepared_request.headers), - response_data=response.content, + response_data=response_data, response_headers=dict(response.headers), duration=response.elapsed.total_seconds()) finally: diff --git a/tests/integration/test_webhooks.py b/tests/integration/test_webhooks.py new file mode 100644 index 00000000..071bf89f --- /dev/null +++ b/tests/integration/test_webhooks.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2016 Anler Hernández +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import pytest + +from django.core.urlresolvers import reverse +from unittest.mock import patch +from unittest.mock import Mock + +from taiga.base.utils import json + +from .. import factories as f + +pytestmark = pytest.mark.django_db + + +@pytest.fixture +def data(): + m = type("Models", (object,), {}) + m.project_owner = f.UserFactory.create() + + m.project1 = f.ProjectFactory(is_private=True, + anon_permissions=[], + public_permissions=[], + owner=m.project_owner) + f.MembershipFactory(project=m.project1, + user=m.project_owner, + is_admin=True) + m.webhook1 = f.WebhookFactory(project=m.project1) + m.webhooklog1 = f.WebhookLogFactory(webhook=m.webhook1) + + return m + + +def test_webhook_action_test_transform_to_json(client, data): + url = reverse('webhooks-test', kwargs={"pk": data.webhook1.pk}) + + response = Mock(status_code=200, headers={}, text="ok") + response.elapsed.total_seconds.return_value = 100 + + with patch("taiga.webhooks.tasks.requests.Session.send", return_value=response) as session_send_mock: + client.login(data.project_owner) + response = client.json.post(url) + assert response.status_code == 200 + assert json.loads(response.data["response_data"]) == {"content": "ok"} diff --git a/tests/integration/test_webhooks_signals.py b/tests/integration/test_webhooks_signals.py index 1db818e6..2d6e5bc4 100644 --- a/tests/integration/test_webhooks_signals.py +++ b/tests/integration/test_webhooks_signals.py @@ -40,7 +40,7 @@ def test_new_object_with_one_webhook_signal(settings): f.WikiPageFactory.create(project=project) ] - response = Mock(status_code=200, headers={}, content="ok") + response = Mock(status_code=200, headers={}, text="ok") response.elapsed.total_seconds.return_value = 100 for obj in objects: @@ -77,7 +77,7 @@ def test_new_object_with_two_webhook_signals(settings): f.WikiPageFactory.create(project=project) ] - response = Mock(status_code=200, headers={}, content="ok") + response = Mock(status_code=200, headers={}, text="ok") response.elapsed.total_seconds.return_value = 100 for obj in objects: @@ -113,7 +113,7 @@ def test_send_request_one_webhook_signal(settings): f.WikiPageFactory.create(project=project) ] - response = Mock(status_code=200, headers={}, content="ok") + response = Mock(status_code=200, headers={}, text="ok") response.elapsed.total_seconds.return_value = 100 for obj in objects: From 853b896b3a5eebd4c14383cbb1d9e9169c49267e Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 7 Oct 2016 07:44:27 +0200 Subject: [PATCH 007/144] Fixing send_notifications command --- .../notifications/management/commands/send_notifications.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/taiga/projects/notifications/management/commands/send_notifications.py b/taiga/projects/notifications/management/commands/send_notifications.py index e3eefedc..4c87b569 100644 --- a/taiga/projects/notifications/management/commands/send_notifications.py +++ b/taiga/projects/notifications/management/commands/send_notifications.py @@ -28,4 +28,7 @@ class Command(BaseCommand): def handle(self, *args, **options): qs = HistoryChangeNotification.objects.all() for change_notification in iter_queryset(qs, itersize=100): - send_sync_notifications(change_notification.pk) + try: + send_sync_notifications(change_notification.pk) + except HistoryChangeNotification.DoesNotExist: + pass From 922571c56b7561bdf9bf73e3fb33ff7e53f62c70 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 11 Oct 2016 07:36:17 +0200 Subject: [PATCH 008/144] Fixing commit webhooks --- taiga/hooks/gitlab/event_hooks.py | 4 ++-- taiga/hooks/gogs/event_hooks.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/taiga/hooks/gitlab/event_hooks.py b/taiga/hooks/gitlab/event_hooks.py index 5b4b4006..e7ada033 100644 --- a/taiga/hooks/gitlab/event_hooks.py +++ b/taiga/hooks/gitlab/event_hooks.py @@ -40,7 +40,7 @@ class IssuesEventHook(BaseGitLabEventHook, BaseNewIssueEventHook): def get_data(self): description = self.payload.get('object_attributes', {}).get('description', None) - project_url = self.payload.get('repository', {}).get('homepage', None) + project_url = self.payload.get('repository', {}).get('homepage', "") user_name = self.payload.get('user', {}).get('username', None) return { "number": self.payload.get('object_attributes', {}).get('iid', None), @@ -59,7 +59,7 @@ class IssueCommentEventHook(BaseGitLabEventHook, BaseIssueCommentEventHook): def get_data(self): comment_message = self.payload.get('object_attributes', {}).get('note', None) - project_url = self.payload.get('repository', {}).get('homepage', None) + project_url = self.payload.get('repository', {}).get('homepage', "") number = self.payload.get('issue', {}).get('iid', None) user_name = self.payload.get('user', {}).get('username', None) return { diff --git a/taiga/hooks/gogs/event_hooks.py b/taiga/hooks/gogs/event_hooks.py index b392afe2..399fa960 100644 --- a/taiga/hooks/gogs/event_hooks.py +++ b/taiga/hooks/gogs/event_hooks.py @@ -37,10 +37,10 @@ class PushEventHook(BaseGogsEventHook, BasePushEventHook): def get_data(self): result = [] commits = self.payload.get("commits", []) - project_url = self.payload.get("repository", {}).get("html_url", None) + project_url = self.payload.get("repository", {}).get("html_url", "") for commit in filter(None, commits): - user_name = commit.get('author', {}).get('username', None) + user_name = commit.get('author', {}).get('username', "") result.append({ "user_id": user_name, "user_name": user_name, From 8c3fed2088ed64c03f5bee7b33a53f2d524a6791 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 11 Oct 2016 08:58:25 +0200 Subject: [PATCH 009/144] Fixing method total_closed_points_by_date for milestone model --- taiga/projects/milestones/models.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/taiga/projects/milestones/models.py b/taiga/projects/milestones/models.py index 4488d178..ef58437d 100644 --- a/taiga/projects/milestones/models.py +++ b/taiga/projects/milestones/models.py @@ -124,18 +124,22 @@ class Milestone(WatchedModelMixin, models.Model): user_stories[us.id] = us tasks = self.tasks.\ - select_related("user_story").\ - exclude(finished_date__isnull=True).\ - exclude(user_story__isnull=True) + select_related("user_story").\ + exclude(finished_date__isnull=True).\ + exclude(user_story__isnull=True) # For each finished task we try to know the proporional part of points # it represetnts from the user story and add it to the closed points # for that date # This calulation is the total user story points divided by its number of tasks for task in tasks: - user_story = user_stories[task.user_story.id] - total_us_points = user_story._total_us_points - us_tasks_counter = user_story.num_tasks + user_story = user_stories.get(task.user_story.id, None) + if user_story is None: + total_us_points = 0 + us_tasks_counter = 0 + else: + total_us_points = user_story._total_us_points + us_tasks_counter = user_story.num_tasks # If the task was finished before starting the sprint it needs # to be included @@ -144,7 +148,9 @@ class Milestone(WatchedModelMixin, models.Model): finished_date = self.estimated_start points_by_date = self._total_closed_points_by_date.get(finished_date, 0) - points_by_date += total_us_points / us_tasks_counter + if us_tasks_counter != 0: + points_by_date += total_us_points / us_tasks_counter + self._total_closed_points_by_date[finished_date] = points_by_date # At this point self._total_closed_points_by_date keeps a dict where the From bdd312e9e82c51abfb5180e6bdab5bfdf022ec32 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 11 Oct 2016 08:59:25 +0200 Subject: [PATCH 010/144] Making capitalized tags work properly --- taiga/projects/tagging/api.py | 1 + tests/integration/test_userstories_tags.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/taiga/projects/tagging/api.py b/taiga/projects/tagging/api.py index db57b946..01a7d07e 100644 --- a/taiga/projects/tagging/api.py +++ b/taiga/projects/tagging/api.py @@ -109,6 +109,7 @@ class TaggedResourceMixin: for tag in obj.tags: if isinstance(tag, (list, tuple)): name, color = tag + name = name.lower() if color and not services.tag_exist_for_project_elements(obj.project, name): new_tags_colors[name] = color diff --git a/tests/integration/test_userstories_tags.py b/tests/integration/test_userstories_tags.py index d89c172f..0cc56868 100644 --- a/tests/integration/test_userstories_tags.py +++ b/tests/integration/test_userstories_tags.py @@ -159,3 +159,25 @@ def test_api_create_new_user_story_with_tags(client): assert tags_colors["back"] == "#fff8e7" assert tags_colors["ux"] == "#fabada" assert tags_colors["front"] == "#aaaaaa" + + +def test_api_create_new_user_story_with_tag_capitalized(client): + project = f.ProjectFactory.create() + f.MembershipFactory.create(project=project, user=project.owner, is_admin=True) + url = reverse("userstories-list") + + data = { + "subject": "Test user story", + "project": project.id, + "tags": [ + ["CapTag", "#fabada"] + ] + } + + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 201, response.data + + project.refresh_from_db() + assert project.tags_colors == [["captag", "#fabada"]] From cda0d6451c913ae6a8da19163e7408e3095577a7 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 11 Oct 2016 09:49:07 +0200 Subject: [PATCH 011/144] Fixing apply_order_updates method --- taiga/projects/services/bulk_update_order.py | 5 ++++ tests/unit/test_order_updates.py | 25 ++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/taiga/projects/services/bulk_update_order.py b/taiga/projects/services/bulk_update_order.py index 614fd507..c07b48a2 100644 --- a/taiga/projects/services/bulk_update_order.py +++ b/taiga/projects/services/bulk_update_order.py @@ -36,6 +36,11 @@ def apply_order_updates(base_orders: dict, new_orders: dict): The elements where no order update is needed will be removed. """ updated_order_ids = set() + + # Remove the elements from new_orders non existint in base_orders + invalid_keys = new_orders.keys() - base_orders.keys() + [new_orders.pop(id, None) for id in invalid_keys] + # We will apply the multiple order changes by the new position order sorted_new_orders = [(k, v) for k, v in new_orders.items()] sorted_new_orders = sorted(sorted_new_orders, key=lambda e: e[1]) diff --git a/tests/unit/test_order_updates.py b/tests/unit/test_order_updates.py index 1a4a571c..3f9625aa 100644 --- a/tests/unit/test_order_updates.py +++ b/tests/unit/test_order_updates.py @@ -161,3 +161,28 @@ def test_apply_order_updates_multiple_elements_duplicated_orders(): "e": 5, "f": 6 } + + +def test_apply_order_invalid_new_order(): + orders = { + "a": 1, + "b": 2, + "c": 3, + "d": 3, + "e": 3, + "f": 4 + } + new_orders = { + "c": 3, + "d": 3, + "x": 3, + "a": 4 + } + apply_order_updates(orders, new_orders) + assert orders == { + "c": 3, + "d": 3, + "a": 4, + "e": 5, + "f": 6 + } From cb027411e2e753303a41beeddd834973435d8961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 11 Oct 2016 12:42:23 +0200 Subject: [PATCH 012/144] Fix issue tg-4633: Return project attributes in the correct order --- taiga/projects/utils.py | 306 +++++++++++++++++++++++----------------- 1 file changed, 175 insertions(+), 131 deletions(-) diff --git a/taiga/projects/utils.py b/taiga/projects/utils.py index d56a96c9..1b1316ad 100644 --- a/taiga/projects/utils.py +++ b/taiga/projects/utils.py @@ -26,25 +26,26 @@ def attach_members(queryset, as_field="members_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(t)) - FROM( - SELECT - users_user.id, - users_user.username, - users_user.full_name, - users_user.email, - concat(full_name, username) complete_user_name, - users_user.color, - users_user.photo, - users_user.is_active, - users_role.id "role", - users_role.name role_name - - FROM projects_membership - LEFT JOIN users_user ON projects_membership.user_id = users_user.id - LEFT JOIN users_role ON users_role.id = projects_membership.role_id - WHERE projects_membership.project_id = {tbl}.id - ORDER BY complete_user_name) t""" + sql = """ + SELECT json_agg(row_to_json(t)) + FROM ( + SELECT users_user.id, + users_user.username, + users_user.full_name, + users_user.email, + concat(full_name, username) complete_user_name, + users_user.color, + users_user.photo, + users_user.is_active, + users_role.id "role", + users_role.name role_name + FROM projects_membership + LEFT JOIN users_user ON projects_membership.user_id = users_user.id + LEFT JOIN users_role ON users_role.id = projects_membership.role_id + WHERE projects_membership.project_id = {tbl}.id + ORDER BY complete_user_name + ) t + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -60,16 +61,18 @@ def attach_milestones(queryset, as_field="milestones_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(t)) - FROM( - SELECT - milestones_milestone.id, - milestones_milestone.slug, - milestones_milestone.name, - milestones_milestone.closed - FROM milestones_milestone - WHERE milestones_milestone.project_id = {tbl}.id - ORDER BY estimated_start) t""" + sql = """ + SELECT json_agg(row_to_json(t)) + FROM ( + SELECT milestones_milestone.id, + milestones_milestone.slug, + milestones_milestone.name, + milestones_milestone.closed + FROM milestones_milestone + WHERE milestones_milestone.project_id = {tbl}.id + ORDER BY estimated_start + ) t + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -85,12 +88,12 @@ def attach_closed_milestones(queryset, as_field="closed_milestones_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT COUNT(milestones_milestone.id) - FROM milestones_milestone - WHERE - milestones_milestone.project_id = {tbl}.id AND + sql = """ + SELECT COUNT(milestones_milestone.id) + FROM milestones_milestone + WHERE milestones_milestone.project_id = {tbl}.id AND milestones_milestone.closed = True - """ + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -106,11 +109,11 @@ def attach_notify_policies(queryset, as_field="notify_policies_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(notifications_notifypolicy)) - FROM notifications_notifypolicy - WHERE - notifications_notifypolicy.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg(row_to_json(notifications_notifypolicy)) + FROM notifications_notifypolicy + WHERE notifications_notifypolicy.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -126,11 +129,14 @@ def attach_epic_statuses(queryset, as_field="epic_statuses_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(projects_epicstatus)) - FROM projects_epicstatus - WHERE - projects_epicstatus.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(projects_epicstatus) + ORDER BY projects_epicstatus.order + ) + FROM projects_epicstatus + WHERE projects_epicstatus.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -146,11 +152,14 @@ def attach_userstory_statuses(queryset, as_field="userstory_statuses_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(projects_userstorystatus)) - FROM projects_userstorystatus - WHERE - projects_userstorystatus.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(projects_userstorystatus) + ORDER BY projects_userstorystatus.order + ) + FROM projects_userstorystatus + WHERE projects_userstorystatus.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -166,10 +175,13 @@ def attach_points(queryset, as_field="points_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(projects_points)) - FROM projects_points - WHERE - projects_points.project_id = {tbl}.id + sql = """ + SELECT json_agg( + row_to_json(projects_points) + ORDER BY projects_points.order + ) + FROM projects_points + WHERE projects_points.project_id = {tbl}.id """ sql = sql.format(tbl=model._meta.db_table) @@ -186,11 +198,14 @@ def attach_task_statuses(queryset, as_field="task_statuses_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(projects_taskstatus)) - FROM projects_taskstatus - WHERE - projects_taskstatus.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(projects_taskstatus) + ORDER BY projects_taskstatus + ) + FROM projects_taskstatus + WHERE projects_taskstatus.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -206,11 +221,14 @@ def attach_issue_statuses(queryset, as_field="issue_statuses_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(projects_issuestatus)) - FROM projects_issuestatus - WHERE - projects_issuestatus.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(projects_issuestatus) + ORDER BY projects_issuestatus.order + ) + FROM projects_issuestatus + WHERE projects_issuestatus.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -226,11 +244,14 @@ def attach_issue_types(queryset, as_field="issue_types_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(projects_issuetype)) - FROM projects_issuetype - WHERE - projects_issuetype.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(projects_issuetype) + ORDER BY projects_issuetype.order + ) + FROM projects_issuetype + WHERE projects_issuetype.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -246,11 +267,14 @@ def attach_priorities(queryset, as_field="priorities_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(projects_priority)) - FROM projects_priority - WHERE - projects_priority.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(projects_priority) + ORDER BY projects_priority.order + ) + FROM projects_priority + WHERE projects_priority.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -266,11 +290,14 @@ def attach_severities(queryset, as_field="severities_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(projects_severity)) - FROM projects_severity - WHERE - projects_severity.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(projects_severity) + ORDER BY projects_severity.order + ) + FROM projects_severity + WHERE projects_severity.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -286,11 +313,14 @@ def attach_epic_custom_attributes(queryset, as_field="epic_custom_attributes_att :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(custom_attributes_epiccustomattribute)) - FROM custom_attributes_epiccustomattribute - WHERE - custom_attributes_epiccustomattribute.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(custom_attributes_epiccustomattribute) + ORDER BY custom_attributes_epiccustomattribute.order + ) + FROM custom_attributes_epiccustomattribute + WHERE custom_attributes_epiccustomattribute.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -306,11 +336,14 @@ def attach_userstory_custom_attributes(queryset, as_field="userstory_custom_attr :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(custom_attributes_userstorycustomattribute)) - FROM custom_attributes_userstorycustomattribute - WHERE - custom_attributes_userstorycustomattribute.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(custom_attributes_userstorycustomattribute) + ORDER BY custom_attributes_userstorycustomattribute.order + ) + FROM custom_attributes_userstorycustomattribute + WHERE custom_attributes_userstorycustomattribute.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -326,11 +359,14 @@ def attach_task_custom_attributes(queryset, as_field="task_custom_attributes_att :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(custom_attributes_taskcustomattribute)) - FROM custom_attributes_taskcustomattribute - WHERE - custom_attributes_taskcustomattribute.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(custom_attributes_taskcustomattribute) + ORDER BY custom_attributes_taskcustomattribute.order + ) + FROM custom_attributes_taskcustomattribute + WHERE custom_attributes_taskcustomattribute.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -346,11 +382,14 @@ def attach_issue_custom_attributes(queryset, as_field="issue_custom_attributes_a :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(custom_attributes_issuecustomattribute)) - FROM custom_attributes_issuecustomattribute - WHERE - custom_attributes_issuecustomattribute.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(custom_attributes_issuecustomattribute) + ORDER BY custom_attributes_issuecustomattribute.order + ) + FROM custom_attributes_issuecustomattribute + WHERE custom_attributes_issuecustomattribute.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -366,11 +405,14 @@ def attach_roles(queryset, as_field="roles_attr"): :return: Queryset object with the additional `as_field` field. """ model = queryset.model - sql = """SELECT json_agg(row_to_json(users_role)) - FROM users_role - WHERE - users_role.project_id = {tbl}.id - """ + sql = """ + SELECT json_agg( + row_to_json(users_role) + ORDER BY users_role.order + ) + FROM users_role + WHERE users_role.project_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table) queryset = queryset.extra(select={as_field: sql}) @@ -387,17 +429,17 @@ def attach_is_fan(queryset, user, as_field="is_fan_attr"): """ model = queryset.model if user is None or user.is_anonymous(): - sql = """SELECT false""" + sql = "SELECT false" else: - sql = """SELECT COUNT(likes_like.id) > 0 - FROM likes_like - INNER JOIN django_content_type - ON likes_like.content_type_id = django_content_type.id - WHERE - django_content_type.model = 'project' AND + sql = """ + SELECT COUNT(likes_like.id) > 0 + FROM likes_like + INNER JOIN django_content_type ON likes_like.content_type_id = django_content_type.id + WHERE django_content_type.model = 'project' AND django_content_type.app_label = 'projects' AND likes_like.user_id = {user_id} AND - likes_like.object_id = {tbl}.id""" + likes_like.object_id = {tbl}.id + """ sql = sql.format(tbl=model._meta.db_table, user_id=user.id) @@ -415,15 +457,15 @@ def attach_my_role_permissions(queryset, user, as_field="my_role_permissions_att """ model = queryset.model if user is None or user.is_anonymous(): - sql = """SELECT '{}'""" + sql = "SELECT '{}'" else: - sql = """SELECT users_role.permissions - FROM projects_membership - LEFT JOIN users_user ON projects_membership.user_id = users_user.id - LEFT JOIN users_role ON users_role.id = projects_membership.role_id - WHERE - projects_membership.project_id = {tbl}.id AND - users_user.id = {user_id}""" + sql = """ + SELECT users_role.permissions + FROM projects_membership + LEFT JOIN users_user ON projects_membership.user_id = users_user.id + LEFT JOIN users_role ON users_role.id = projects_membership.role_id + WHERE projects_membership.project_id = {tbl}.id AND + users_user.id = {user_id}""" sql = sql.format(tbl=model._meta.db_table, user_id=user.id) @@ -441,13 +483,14 @@ def attach_private_projects_same_owner(queryset, user, as_field="private_project """ model = queryset.model if user is None or user.is_anonymous(): - sql = """SELECT 0""" + sql = "SELECT 0" else: - sql = """SELECT COUNT(id) - FROM projects_project p_aux - WHERE - p_aux.is_private = True AND - p_aux.owner_id = {tbl}.owner_id""" + sql = """ + SELECT COUNT(id) + FROM projects_project p_aux + WHERE p_aux.is_private = True AND + p_aux.owner_id = {tbl}.owner_id + """ sql = sql.format(tbl=model._meta.db_table, user_id=user.id) @@ -465,13 +508,14 @@ def attach_public_projects_same_owner(queryset, user, as_field="public_projects_ """ model = queryset.model if user is None or user.is_anonymous(): - sql = """SELECT 0""" + sql = "SELECT 0" else: - sql = """SELECT COUNT(id) - FROM projects_project p_aux - WHERE - p_aux.is_private = False AND - p_aux.owner_id = {tbl}.owner_id""" + sql = """ + SELECT COUNT(id) + FROM projects_project p_aux + WHERE p_aux.is_private = False AND + p_aux.owner_id = {tbl}.owner_id + """ sql = sql.format(tbl=model._meta.db_table, user_id=user.id) From 4ae4c40ba8ef1f460f4e6aeef35979c345a43ec2 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 11 Oct 2016 12:47:39 +0200 Subject: [PATCH 013/144] Errors on unique constraints on creation --- taiga/projects/api.py | 41 +++++++++++++++++++++++++++++ taiga/projects/milestones/api.py | 6 +++++ taiga/projects/milestones/models.py | 8 ++---- 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/taiga/projects/api.py b/taiga/projects/api.py index 5284f44e..a3ca3445 100644 --- a/taiga/projects/api.py +++ b/taiga/projects/api.py @@ -474,6 +474,11 @@ class EpicStatusViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, move_on_destroy_related_field = "status" move_on_destroy_project_default_field = "default_epic_status" + def create(self, request, *args, **kwargs): + project_id = request.DATA.get("project", 0) + with advisory_lock("epic-status-creation-{}".format(project_id)): + return super().create(request, *args, **kwargs) + class UserStoryStatusViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, ModelCrudViewSet, BulkUpdateOrderMixin): @@ -491,6 +496,11 @@ class UserStoryStatusViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, move_on_destroy_related_field = "status" move_on_destroy_project_default_field = "default_us_status" + def create(self, request, *args, **kwargs): + project_id = request.DATA.get("project", 0) + with advisory_lock("epic-user-story-status-creation-{}".format(project_id)): + return super().create(request, *args, **kwargs) + class PointsViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, ModelCrudViewSet, BulkUpdateOrderMixin): @@ -508,6 +518,11 @@ class PointsViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, move_on_destroy_related_field = "points" move_on_destroy_project_default_field = "default_points" + def create(self, request, *args, **kwargs): + project_id = request.DATA.get("project", 0) + with advisory_lock("points-creation-{}".format(project_id)): + return super().create(request, *args, **kwargs) + class TaskStatusViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, ModelCrudViewSet, BulkUpdateOrderMixin): @@ -525,6 +540,11 @@ class TaskStatusViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, move_on_destroy_related_field = "status" move_on_destroy_project_default_field = "default_task_status" + def create(self, request, *args, **kwargs): + project_id = request.DATA.get("project", 0) + with advisory_lock("task-status-creation-{}".format(project_id)): + return super().create(request, *args, **kwargs) + class SeverityViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, ModelCrudViewSet, BulkUpdateOrderMixin): @@ -542,6 +562,11 @@ class SeverityViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, move_on_destroy_related_field = "severity" move_on_destroy_project_default_field = "default_severity" + def create(self, request, *args, **kwargs): + project_id = request.DATA.get("project", 0) + with advisory_lock("severity-creation-{}".format(project_id)): + return super().create(request, *args, **kwargs) + class PriorityViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, ModelCrudViewSet, BulkUpdateOrderMixin): @@ -558,6 +583,11 @@ class PriorityViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, move_on_destroy_related_field = "priority" move_on_destroy_project_default_field = "default_priority" + def create(self, request, *args, **kwargs): + project_id = request.DATA.get("project", 0) + with advisory_lock("priority-creation-{}".format(project_id)): + return super().create(request, *args, **kwargs) + class IssueTypeViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, ModelCrudViewSet, BulkUpdateOrderMixin): @@ -574,6 +604,11 @@ class IssueTypeViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, move_on_destroy_related_field = "type" move_on_destroy_project_default_field = "default_issue_type" + def create(self, request, *args, **kwargs): + project_id = request.DATA.get("project", 0) + with advisory_lock("issue-type-creation-{}".format(project_id)): + return super().create(request, *args, **kwargs) + class IssueStatusViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, ModelCrudViewSet, BulkUpdateOrderMixin): @@ -590,6 +625,12 @@ class IssueStatusViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, move_on_destroy_related_field = "status" move_on_destroy_project_default_field = "default_issue_status" + def create(self, request, *args, **kwargs): + project_id = request.DATA.get("project", 0) + with advisory_lock("issue-status-creation-{}".format(project_id)): + return super().create(request, *args, **kwargs) + + ###################################################### ## Project Template diff --git a/taiga/projects/milestones/api.py b/taiga/projects/milestones/api.py index 2e0047fc..820e90c7 100644 --- a/taiga/projects/milestones/api.py +++ b/taiga/projects/milestones/api.py @@ -37,6 +37,7 @@ from . import models from . import permissions from . import utils as milestones_utils +from django_pglocks import advisory_lock import datetime @@ -53,6 +54,11 @@ class MilestoneViewSet(HistoryResourceMixin, WatchedResourceMixin, ) queryset = models.Milestone.objects.all() + def create(self, request, *args, **kwargs): + project_id = request.DATA.get("project", 0) + with advisory_lock("milestone-creation-{}".format(project_id)): + return super().create(request, *args, **kwargs) + def list(self, request, *args, **kwargs): res = super().list(request, *args, **kwargs) self._add_taiga_info_headers() diff --git a/taiga/projects/milestones/models.py b/taiga/projects/milestones/models.py index ef58437d..86eb3251 100644 --- a/taiga/projects/milestones/models.py +++ b/taiga/projects/milestones/models.py @@ -27,7 +27,6 @@ from django.utils.functional import cached_property from taiga.base.utils.slug import slugify_uniquely from taiga.base.utils.dicts import dict_sum from taiga.projects.notifications.mixins import WatchedModelMixin -from django_pglocks import advisory_lock import itertools import datetime @@ -83,11 +82,8 @@ class Milestone(WatchedModelMixin, models.Model): if not self._importing or not self.modified_date: self.modified_date = timezone.now() if not self.slug: - with advisory_lock("milestone-creation-{}".format(self.project_id)): - self.slug = slugify_uniquely(self.name, self.__class__) - super().save(*args, **kwargs) - else: - super().save(*args, **kwargs) + self.slug = slugify_uniquely(self.name, self.__class__) + super().save(*args, **kwargs) @cached_property def cached_user_stories(self): From ce99a949c7fb6447c66b5ee230450d80ea42d6b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 11 Oct 2016 14:15:46 +0200 Subject: [PATCH 014/144] Adding cache to HistoryEntry values_diff --- .../0013_historyentry_values_diff_cache.py | 21 +++++++++++++++++++ taiga/projects/history/models.py | 13 ++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 taiga/projects/history/migrations/0013_historyentry_values_diff_cache.py diff --git a/taiga/projects/history/migrations/0013_historyentry_values_diff_cache.py b/taiga/projects/history/migrations/0013_historyentry_values_diff_cache.py new file mode 100644 index 00000000..1fe73a96 --- /dev/null +++ b/taiga/projects/history/migrations/0013_historyentry_values_diff_cache.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-10-11 12:17 +from __future__ import unicode_literals + +from django.db import migrations +import django_pgjson.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('history', '0012_auto_20160629_1036'), + ] + + operations = [ + migrations.AddField( + model_name='historyentry', + name='values_diff_cache', + field=django_pgjson.fields.JsonField(blank=True, default=None, null=True), + ), + ] diff --git a/taiga/projects/history/models.py b/taiga/projects/history/models.py index 4697875c..c4155eee 100644 --- a/taiga/projects/history/models.py +++ b/taiga/projects/history/models.py @@ -60,6 +60,9 @@ class HistoryEntry(models.Model): # Stores the last diff diff = JsonField(null=True, blank=True, default=None) + # Stores the values_diff cache + values_diff_cache = JsonField(null=True, blank=True, default=None) + # Stores the last complete frozen object snapshot snapshot = JsonField(null=True, blank=True, default=None) @@ -135,8 +138,11 @@ class HistoryEntry(models.Model): if user: version["user"] = UserSerializer(user).data - @cached_property + @property def values_diff(self): + if self.values_diff_cache is not None: + return self.values_diff_cache + result = {} users_keys = ["assigned_to", "owner"] @@ -286,7 +292,10 @@ class HistoryEntry(models.Model): result[key] = value - return result + self.values_diff_cache = result + # Update values_diff_cache without dispatching signals + HistoryEntry.objects.filter(pk=self.pk).update(values_diff_cache=self.values_diff_cache) + return self.values_diff_cache class Meta: ordering = ["created_at"] From ea0f496c9b7177e2efd2b2d4aa0db1299fa10055 Mon Sep 17 00:00:00 2001 From: Allan Simon Date: Mon, 10 Oct 2016 05:58:49 +0800 Subject: [PATCH 015/144] simplified how the get_total_points is calculated --- taiga/projects/userstories/models.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/taiga/projects/userstories/models.py b/taiga/projects/userstories/models.py index 178f2cc1..21a67fd9 100644 --- a/taiga/projects/userstories/models.py +++ b/taiga/projects/userstories/models.py @@ -137,14 +137,14 @@ class UserStory(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, mod return self.role_points def get_total_points(self): - not_null_role_points = [rp for rp in self.role_points.all() if rp.points.value is not None] + not_null_role_points = [ + rp.points.value + for rp in self.role_points.all() + if rp.points.value is not None + ] #If we only have None values the sum should be None if not not_null_role_points: return None - total = 0.0 - for rp in not_null_role_points: - total += rp.points.value - - return total + return sum(not_null_role_points) From 9d3e53f3c5384b499feee6eca131f984912c125a Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 13 Oct 2016 10:48:05 +0200 Subject: [PATCH 016/144] Fixing and refactoring by_ref api endpoints --- taiga/projects/epics/api.py | 23 +++------------ taiga/projects/issues/api.py | 18 ++---------- taiga/projects/mixins/by_ref.py | 48 +++++++++++++++++++++++++++++++ taiga/projects/tasks/api.py | 21 ++------------ taiga/projects/userstories/api.py | 24 ++-------------- taiga/projects/votes/services.py | 33 ++++++++++----------- 6 files changed, 76 insertions(+), 91 deletions(-) create mode 100644 taiga/projects/mixins/by_ref.py diff --git a/taiga/projects/epics/api.py b/taiga/projects/epics/api.py index fed57abd..84b13dad 100644 --- a/taiga/projects/epics/api.py +++ b/taiga/projects/epics/api.py @@ -29,6 +29,7 @@ from taiga.base.api.viewsets import NestedViewSetMixin from taiga.base.utils import json from taiga.projects.history.mixins import HistoryResourceMixin +from taiga.projects.mixins.by_ref import ByRefMixin from taiga.projects.models import Project, EpicStatus from taiga.projects.notifications.mixins import WatchedResourceMixin, WatchersViewSetMixin from taiga.projects.occ import OCCResourceMixin @@ -43,9 +44,8 @@ from . import validators from . import utils as epics_utils -class EpicViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, - WatchedResourceMixin, TaggedResourceMixin, BlockedByProjectMixin, - ModelCrudViewSet): +class EpicViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, WatchedResourceMixin, + ByRefMixin, TaggedResourceMixin, BlockedByProjectMixin, ModelCrudViewSet): validator_class = validators.EpicValidator queryset = models.Epic.objects.all() permission_classes = (permissions.EpicPermission,) @@ -172,21 +172,6 @@ class EpicViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, } return response.Ok(services.get_epics_filters_data(project, querysets)) - @list_route(methods=["GET"]) - def by_ref(self, request): - retrieve_kwargs = { - "ref": request.QUERY_PARAMS.get("ref", None) - } - project_id = request.QUERY_PARAMS.get("project", None) - if project_id is not None: - retrieve_kwargs["project_id"] = project_id - - project_slug = request.QUERY_PARAMS.get("project__slug", None) - if project_slug is not None: - retrieve_kwargs["project__slug"] = project_slug - - return self.retrieve(request, **retrieve_kwargs) - @list_route(methods=["GET"]) def csv(self, request): uuid = request.QUERY_PARAMS.get("uuid", None) @@ -222,7 +207,7 @@ class EpicViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, epics = self.get_queryset().filter(id__in=[i.id for i in epics]) for epic in epics: self.persist_history_snapshot(obj=epic) - + epics_serialized = self.get_serializer_class()(epics, many=True) return response.Ok(epics_serialized.data) diff --git a/taiga/projects/issues/api.py b/taiga/projects/issues/api.py index 617b13ec..a7479d64 100644 --- a/taiga/projects/issues/api.py +++ b/taiga/projects/issues/api.py @@ -28,6 +28,7 @@ from taiga.base.api.mixins import BlockedByProjectMixin from taiga.base.api.utils import get_object_or_404 from taiga.projects.history.mixins import HistoryResourceMixin +from taiga.projects.mixins.by_ref import ByRefMixin from taiga.projects.models import Project, IssueStatus, Severity, Priority, IssueType from taiga.projects.notifications.mixins import WatchedResourceMixin, WatchersViewSetMixin from taiga.projects.occ import OCCResourceMixin @@ -44,7 +45,7 @@ from . import validators class IssueViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, WatchedResourceMixin, - TaggedResourceMixin, BlockedByProjectMixin, ModelCrudViewSet): + ByRefMixin, TaggedResourceMixin, BlockedByProjectMixin, ModelCrudViewSet): validator_class = validators.IssueValidator queryset = models.Issue.objects.all() permission_classes = (permissions.IssuePermission, ) @@ -174,21 +175,6 @@ class IssueViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, W super().pre_conditions_on_save(obj) - @list_route(methods=["GET"]) - def by_ref(self, request): - retrieve_kwargs = { - "ref": request.QUERY_PARAMS.get("ref", None) - } - project_id = request.QUERY_PARAMS.get("project", None) - if project_id is not None: - retrieve_kwargs["project_id"] = project_id - - project_slug = request.QUERY_PARAMS.get("project__slug", None) - if project_slug is not None: - retrieve_kwargs["project__slug"] = project_slug - - return self.retrieve(request, **retrieve_kwargs) - @list_route(methods=["GET"]) def filters_data(self, request, *args, **kwargs): project_id = request.QUERY_PARAMS.get("project", None) diff --git a/taiga/projects/mixins/by_ref.py b/taiga/projects/mixins/by_ref.py new file mode 100644 index 00000000..4e1dbad9 --- /dev/null +++ b/taiga/projects/mixins/by_ref.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.utils.translation import ugettext as _ + +from taiga.base import response +from taiga.base.decorators import list_route + + +class ByRefMixin: + """ + Get an instance by ref. + """ + @list_route(methods=["GET"]) + def by_ref(self, request): + if "ref" not in request.QUERY_PARAMS: + return response.BadRequest(_("ref param is needed")) + + if "project__slug" not in request.QUERY_PARAMS and "project" not in request.QUERY_PARAMS: + return response.BadRequest(_("project or project__slug param is needed")) + + retrieve_kwargs = { + "ref": request.QUERY_PARAMS.get("ref", None) + } + project_id = request.QUERY_PARAMS.get("project", None) + if project_id is not None: + retrieve_kwargs["project_id"] = project_id + + project_slug = request.QUERY_PARAMS.get("project__slug", None) + if project_slug is not None: + retrieve_kwargs["project__slug"] = project_slug + + return self.retrieve(request, **retrieve_kwargs) diff --git a/taiga/projects/tasks/api.py b/taiga/projects/tasks/api.py index 778e080d..2a10620d 100644 --- a/taiga/projects/tasks/api.py +++ b/taiga/projects/tasks/api.py @@ -28,6 +28,7 @@ from taiga.base.api.mixins import BlockedByProjectMixin from taiga.base.utils import json from taiga.projects.history.mixins import HistoryResourceMixin from taiga.projects.milestones.models import Milestone +from taiga.projects.mixins.by_ref import ByRefMixin from taiga.projects.models import Project, TaskStatus from taiga.projects.notifications.mixins import WatchedResourceMixin, WatchersViewSetMixin from taiga.projects.occ import OCCResourceMixin @@ -44,9 +45,8 @@ from . import validators from . import utils as tasks_utils -class TaskViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, - WatchedResourceMixin, TaggedResourceMixin, BlockedByProjectMixin, - ModelCrudViewSet): +class TaskViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, WatchedResourceMixin, + ByRefMixin, TaggedResourceMixin, BlockedByProjectMixin, ModelCrudViewSet): validator_class = validators.TaskValidator queryset = models.Task.objects.all() permission_classes = (permissions.TaskPermission,) @@ -220,21 +220,6 @@ class TaskViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, } return response.Ok(services.get_tasks_filters_data(project, querysets)) - @list_route(methods=["GET"]) - def by_ref(self, request): - retrieve_kwargs = { - "ref": request.QUERY_PARAMS.get("ref", None) - } - project_id = request.QUERY_PARAMS.get("project", None) - if project_id is not None: - retrieve_kwargs["project_id"] = project_id - - project_slug = request.QUERY_PARAMS.get("project__slug", None) - if project_slug is not None: - retrieve_kwargs["project__slug"] = project_slug - - return self.retrieve(request, **retrieve_kwargs) - @list_route(methods=["GET"]) def csv(self, request): uuid = request.QUERY_PARAMS.get("uuid", None) diff --git a/taiga/projects/userstories/api.py b/taiga/projects/userstories/api.py index 6ee1d72c..bb888f88 100644 --- a/taiga/projects/userstories/api.py +++ b/taiga/projects/userstories/api.py @@ -36,6 +36,7 @@ from taiga.base.utils import json from taiga.projects.history.mixins import HistoryResourceMixin from taiga.projects.history.services import take_snapshot from taiga.projects.milestones.models import Milestone +from taiga.projects.mixins.by_ref import ByRefMixin from taiga.projects.models import Project, UserStoryStatus from taiga.projects.notifications.mixins import WatchedResourceMixin from taiga.projects.notifications.mixins import WatchersViewSetMixin @@ -54,7 +55,7 @@ from . import validators class UserStoryViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, WatchedResourceMixin, - TaggedResourceMixin, BlockedByProjectMixin, ModelCrudViewSet): + ByRefMixin, TaggedResourceMixin, BlockedByProjectMixin, ModelCrudViewSet): validator_class = validators.UserStoryValidator queryset = models.UserStory.objects.all() permission_classes = (permissions.UserStoryPermission,) @@ -295,27 +296,6 @@ class UserStoryViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixi } return response.Ok(services.get_userstories_filters_data(project, querysets)) - @list_route(methods=["GET"]) - def by_ref(self, request): - if "ref" not in request.QUERY_PARAMS: - return response.BadRequest(_("ref param is needed")) - - if "project_slug" not in request.QUERY_PARAMS and "project" not in request.QUERY_PARAMS: - return response.BadRequest(_("project or project_slug param is needed")) - - retrieve_kwargs = { - "ref": request.QUERY_PARAMS["ref"] - } - project_id = request.QUERY_PARAMS.get("project", None) - if project_id is not None: - retrieve_kwargs["project_id"] = project_id - - project_slug = request.QUERY_PARAMS.get("project__slug", None) - if project_slug is not None: - retrieve_kwargs["project__slug"] = project_slug - - return self.retrieve(request, **retrieve_kwargs) - @list_route(methods=["GET"]) def csv(self, request): uuid = request.QUERY_PARAMS.get("uuid", None) diff --git a/taiga/projects/votes/services.py b/taiga/projects/votes/services.py index 38c3b93a..6d80c20d 100644 --- a/taiga/projects/votes/services.py +++ b/taiga/projects/votes/services.py @@ -18,13 +18,15 @@ # along with this program. If not, see . from django.db.models import F -from django.db.transaction import atomic +from django.db import transaction as tx + from django.apps import apps from django.contrib.auth import get_user_model from .models import Votes, Vote +@tx.atomic def add_vote(obj, user): """Add a vote to an object. @@ -35,17 +37,17 @@ def add_vote(obj, user): :param user: User adding the vote. :class:`~taiga.users.models.User` instance. """ obj_type = apps.get_model("contenttypes", "ContentType").objects.get_for_model(obj) - with atomic(): - vote, created = Vote.objects.get_or_create(content_type=obj_type, object_id=obj.id, user=user) - if not created: - return + vote, created = Vote.objects.get_or_create(content_type=obj_type, object_id=obj.id, user=user) + if not created: + return - votes, _ = Votes.objects.get_or_create(content_type=obj_type, object_id=obj.id) - votes.count = F('count') + 1 - votes.save() + votes, _ = Votes.objects.get_or_create(content_type=obj_type, object_id=obj.id) + votes.count = F('count') + 1 + votes.save() return vote +@tx.atomic def remove_vote(obj, user): """Remove an user vote from an object. @@ -56,16 +58,15 @@ def remove_vote(obj, user): :param user: User removing her vote. :class:`~taiga.users.models.User` instance. """ obj_type = apps.get_model("contenttypes", "ContentType").objects.get_for_model(obj) - with atomic(): - qs = Vote.objects.filter(content_type=obj_type, object_id=obj.id, user=user) - if not qs.exists(): - return + qs = Vote.objects.filter(content_type=obj_type, object_id=obj.id, user=user) + if not qs.exists(): + return - qs.delete() + qs.delete() - votes, _ = Votes.objects.get_or_create(content_type=obj_type, object_id=obj.id) - votes.count = F('count') - 1 - votes.save() + votes, _ = Votes.objects.get_or_create(content_type=obj_type, object_id=obj.id) + votes.count = F('count') - 1 + votes.save() def get_voters(obj): From b78d1b9a262e00453b98c244016011f05dfc7066 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 17 Oct 2016 10:22:34 +0200 Subject: [PATCH 017/144] Fixing sql related with tags --- taiga/projects/tagging/services.py | 57 ++++++++++++++---------------- tests/integration/test_projects.py | 46 ++++++++++++------------ 2 files changed, 50 insertions(+), 53 deletions(-) diff --git a/taiga/projects/tagging/services.py b/taiga/projects/tagging/services.py index 747a3ecf..4e7fe1f7 100644 --- a/taiga/projects/tagging/services.py +++ b/taiga/projects/tagging/services.py @@ -36,24 +36,23 @@ def create_tag(project, tag, color): def edit_tag(project, from_tag, to_tag, color): sql = """ UPDATE userstories_userstory - SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) - WHERE project_id = {project_id}; + SET tags = array_distinct(array_replace(tags, %(from_tag)s, %(to_tag)s)) + WHERE project_id = %(project_id)s; UPDATE tasks_task - SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) - WHERE project_id = {project_id}; + SET tags = array_distinct(array_replace(tags, %(from_tag)s, %(to_tag)s)) + WHERE project_id = %(project_id)s; UPDATE issues_issue - SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) - WHERE project_id = {project_id}; + SET tags = array_distinct(array_replace(tags, %(from_tag)s, %(to_tag)s)) + WHERE project_id = %(project_id)s; UPDATE epics_epic - SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) - WHERE project_id = {project_id}; + SET tags = array_distinct(array_replace(tags, %(from_tag)s, %(to_tag)s)) + WHERE project_id = %(project_id)s; """ - sql = sql.format(project_id=project.id, from_tag=from_tag, to_tag=to_tag) cursor = connection.cursor() - cursor.execute(sql) + cursor.execute(sql, params={"from_tag": from_tag, "to_tag": to_tag, "project_id": project.id}) tags_colors = dict(project.tags_colors) tags_colors.pop(from_tag) @@ -71,24 +70,23 @@ def rename_tag(project, from_tag, to_tag, **kwargs): color = dict(project.tags_colors)[from_tag] sql = """ UPDATE userstories_userstory - SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) - WHERE project_id = {project_id}; + SET tags = array_distinct(array_replace(tags, %(from_tag)s, %(to_tag)s)) + WHERE project_id = %(project_id)s; UPDATE tasks_task - SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) - WHERE project_id = {project_id}; + SET tags = array_distinct(array_replace(tags, %(from_tag)s, %(to_tag)s)) + WHERE project_id = %(project_id)s; UPDATE issues_issue - SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) - WHERE project_id = {project_id}; + SET tags = array_distinct(array_replace(tags, %(from_tag)s, %(to_tag)s)) + WHERE project_id = %(project_id)s; UPDATE epics_epic - SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) - WHERE project_id = {project_id}; + SET tags = array_distinct(array_replace(tags, %(from_tag)s, %(to_tag)s)) + WHERE project_id = %(project_id)s; """ - sql = sql.format(project_id=project.id, from_tag=from_tag, to_tag=to_tag, color=color) cursor = connection.cursor() - cursor.execute(sql) + cursor.execute(sql, params={"from_tag": from_tag, "to_tag": to_tag, "project_id": project.id}) tags_colors = dict(project.tags_colors) tags_colors.pop(from_tag) @@ -100,24 +98,23 @@ def rename_tag(project, from_tag, to_tag, **kwargs): def delete_tag(project, tag): sql = """ UPDATE userstories_userstory - SET tags = array_remove(tags, '{tag}') - WHERE project_id = {project_id}; + SET tags = array_remove(tags, %(tag)s) + WHERE project_id = %(project_id)s; UPDATE tasks_task - SET tags = array_remove(tags, '{tag}') - WHERE project_id = {project_id}; + SET tags = array_remove(tags, %(tag)s) + WHERE project_id = %(project_id)s; UPDATE issues_issue - SET tags = array_remove(tags, '{tag}') - WHERE project_id = {project_id}; + SET tags = array_remove(tags, %(tag)s) + WHERE project_id = %(project_id)s; UPDATE epics_epic - SET tags = array_remove(tags, '{tag}') - WHERE project_id = {project_id}; + SET tags = array_remove(tags, %(tag)s) + WHERE project_id = %(project_id)s; """ - sql = sql.format(project_id=project.id, tag=tag) cursor = connection.cursor() - cursor.execute(sql) + cursor.execute(sql, params={"tag": tag, "project_id": project.id}) tags_colors = dict(project.tags_colors) del tags_colors[tag] diff --git a/tests/integration/test_projects.py b/tests/integration/test_projects.py index 7d90d7b0..bd4fbac8 100644 --- a/tests/integration/test_projects.py +++ b/tests/integration/test_projects.py @@ -1915,19 +1915,19 @@ def test_create_tag_without_color(client, settings): def test_edit_tag_only_name(client, settings): user = f.UserFactory.create() - project = f.ProjectFactory.create(owner=user, tags_colors=[("tag", "#123123")]) - user_story = f.UserStoryFactory.create(project=project, tags=["tag"]) - task = f.TaskFactory.create(project=project, tags=["tag"]) - issue = f.IssueFactory.create(project=project, tags=["tag"]) - epic = f.EpicFactory.create(project=project, tags=["tag"]) + project = f.ProjectFactory.create(owner=user, tags_colors=[("tag'1", "#123123")]) + user_story = f.UserStoryFactory.create(project=project, tags=["tag'1"]) + task = f.TaskFactory.create(project=project, tags=["tag'1"]) + issue = f.IssueFactory.create(project=project, tags=["tag'1"]) + epic = f.EpicFactory.create(project=project, tags=["tag'1"]) role = f.RoleFactory.create(project=project, permissions=["view_project"]) membership = f.MembershipFactory.create(project=project, user=user, role=role, is_admin=True) url = reverse("projects-edit-tag", args=(project.id,)) client.login(user) data = { - "from_tag": "tag", - "to_tag": "renamed_tag" + "from_tag": "tag'1", + "to_tag": "renamed_tag'1" } client.login(user) @@ -1935,15 +1935,15 @@ def test_edit_tag_only_name(client, settings): assert response.status_code == 200 project = Project.objects.get(id=project.pk) - assert project.tags_colors == [["renamed_tag", "#123123"]] + assert project.tags_colors == [["renamed_tag'1", "#123123"]] user_story = UserStory.objects.get(id=user_story.pk) - assert user_story.tags == ["renamed_tag"] + assert user_story.tags == ["renamed_tag'1"] task = Task.objects.get(id=task.pk) - assert task.tags == ["renamed_tag"] + assert task.tags == ["renamed_tag'1"] issue = Issue.objects.get(id=issue.pk) - assert issue.tags == ["renamed_tag"] + assert issue.tags == ["renamed_tag'1"] epic = Epic.objects.get(id=epic.pk) - assert epic.tags == ["renamed_tag"] + assert epic.tags == ["renamed_tag'1"] def test_edit_tag_only_color(client, settings): @@ -2013,18 +2013,18 @@ def test_edit_tag(client, settings): def test_delete_tag(client, settings): user = f.UserFactory.create() - project = f.ProjectFactory.create(owner=user, tags_colors=[("tag", "#123123")]) - user_story = f.UserStoryFactory.create(project=project, tags=["tag"]) - task = f.TaskFactory.create(project=project, tags=["tag"]) - issue = f.IssueFactory.create(project=project, tags=["tag"]) - epic = f.EpicFactory.create(project=project, tags=["tag"]) + project = f.ProjectFactory.create(owner=user, tags_colors=[("tag'1", "#123123")]) + user_story = f.UserStoryFactory.create(project=project, tags=["tag'1"]) + task = f.TaskFactory.create(project=project, tags=["tag'1"]) + issue = f.IssueFactory.create(project=project, tags=["tag'1"]) + epic = f.EpicFactory.create(project=project, tags=["tag'1"]) role = f.RoleFactory.create(project=project, permissions=["view_project"]) membership = f.MembershipFactory.create(project=project, user=user, role=role, is_admin=True) url = reverse("projects-delete-tag", args=(project.id,)) client.login(user) data = { - "tag": "tag" + "tag": "tag'1" } client.login(user) @@ -2044,18 +2044,18 @@ def test_delete_tag(client, settings): def test_mix_tags(client, settings): user = f.UserFactory.create() - project = f.ProjectFactory.create(owner=user, tags_colors=[("tag1", "#123123"), ("tag2", "#123123"), ("tag3", "#123123")]) - user_story = f.UserStoryFactory.create(project=project, tags=["tag1", "tag3"]) + project = f.ProjectFactory.create(owner=user, tags_colors=[("tag'1", "#123123"), ("tag2", "#123123"), ("tag3", "#123123")]) + user_story = f.UserStoryFactory.create(project=project, tags=["tag'1", "tag3"]) task = f.TaskFactory.create(project=project, tags=["tag2", "tag3"]) - issue = f.IssueFactory.create(project=project, tags=["tag1", "tag2", "tag3"]) - epic = f.EpicFactory.create(project=project, tags=["tag1", "tag2", "tag3"]) + issue = f.IssueFactory.create(project=project, tags=["tag'1", "tag2", "tag3"]) + epic = f.EpicFactory.create(project=project, tags=["tag'1", "tag2", "tag3"]) role = f.RoleFactory.create(project=project, permissions=["view_project"]) membership = f.MembershipFactory.create(project=project, user=user, role=role, is_admin=True) url = reverse("projects-mix-tags", args=(project.id,)) client.login(user) data = { - "from_tags": ["tag1", "tag2"], + "from_tags": ["tag'1", "tag2"], "to_tag": "tag2" } From be55c5cb58533510116d1240ecb16dfb286bd68b Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 17 Oct 2016 10:47:48 +0200 Subject: [PATCH 018/144] Fixing project validation on hooks app --- taiga/hooks/api.py | 2 +- tests/integration/test_hooks_github.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/taiga/hooks/api.py b/taiga/hooks/api.py index eef06cf8..baf94e9d 100644 --- a/taiga/hooks/api.py +++ b/taiga/hooks/api.py @@ -44,7 +44,7 @@ class BaseWebhookApiViewSet(GenericViewSet): try: project = Project.objects.get(id=project_id) return project - except Project.DoesNotExist: + except (ValueError, Project.DoesNotExist): return None def _get_payload(self, request): diff --git a/tests/integration/test_hooks_github.py b/tests/integration/test_hooks_github.py index 1bcbcdbe..cf3b8bad 100644 --- a/tests/integration/test_hooks_github.py +++ b/tests/integration/test_hooks_github.py @@ -43,6 +43,19 @@ from .. import factories as f pytestmark = pytest.mark.django_db +def test_bad_project(client): + project = f.ProjectFactory() + url = reverse("github-hook-list") + url = "%s?project=%s-extra-text-added" % (url, project.id) + data = {"test:": "data"} + response = client.post(url, json.dumps(data), + HTTP_X_HUB_SIGNATURE="sha1=3c8e83fdaa266f81c036ea0b71e98eb5e054581a", + content_type="application/json") + response_content = response.data + assert response.status_code == 400 + assert "The project doesn't exist" in response_content["_error_message"] + + def test_bad_signature(client): project = f.ProjectFactory() url = reverse("github-hook-list") From 63cd90c4179f0b68c1af0a174e30b25906e6319e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 17 Oct 2016 19:20:25 +0200 Subject: [PATCH 019/144] Create command to change project slug --- .../commands/change_project_slug.py | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 taiga/projects/management/commands/change_project_slug.py diff --git a/taiga/projects/management/commands/change_project_slug.py b/taiga/projects/management/commands/change_project_slug.py new file mode 100644 index 00000000..8e8d012e --- /dev/null +++ b/taiga/projects/management/commands/change_project_slug.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.core.management.base import BaseCommand +from django.core.management.base import CommandError +from django.test.utils import override_settings + +from taiga.base.utils.slug import slugify_uniquely +from taiga.projects.models import Project +from taiga.projects.history.models import HistoryEntry +from taiga.timeline.management.commands.rebuild_timeline import generate_timeline + + +class Command(BaseCommand): + help = 'Change the project slug from a new one' + + def add_arguments(self, parser): + parser.add_argument('current_slug', help="The current project slug") + parser.add_argument('new_slug', help="The new project slug") + + @override_settings(DEBUG=False) + def handle(self, *args, **options): + current_slug = options["current_slug"] + new_slug = options["new_slug"] + + try: + project = Project.objects.get(slug=current_slug) + except Project.DoesNotExist: + raise CommandError("There is no project with the slug '{}'".format(current_slug)) + + slug = slugify_uniquely(new_slug, Project) + if slug != new_slug: + raise CommandError("Invalid new slug, maybe you can try with '{}'".format(slug)) + + # Change slug + self.stdout.write(self.style.SUCCESS("-> Change slug to '{}'.".format(slug))) + project.slug = slug + project.save() + + # Reset diff cache in history entries + self.stdout.write(self.style.SUCCESS("-> Reset value_diff cache for history entries.")) + HistoryEntry.objects.filter(project=project).update(values_diff_cache=None) + + # Regenerate timeline + self.stdout.write(self.style.SUCCESS("-> Regenerate timeline entries.")) + generate_timeline(None, None, project.id) From f7918abddb0cb2d00646d75b774e3384b6a53212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 17 Oct 2016 19:17:21 +0200 Subject: [PATCH 020/144] Clean duplicate code in project slug generation process --- taiga/base/api/permissions.py | 3 +-- taiga/base/utils/sequence.py | 34 ---------------------------------- taiga/projects/models.py | 11 ++--------- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 taiga/base/utils/sequence.py diff --git a/taiga/base/api/permissions.py b/taiga/base/api/permissions.py index b03d6c18..ec994b0b 100644 --- a/taiga/base/api/permissions.py +++ b/taiga/base/api/permissions.py @@ -20,7 +20,6 @@ import abc from functools import reduce -from taiga.base.utils import sequence as sq from taiga.permissions.services import user_has_perm, is_project_admin from django.apps import apps @@ -112,7 +111,7 @@ class Not(PermissionOperator): super().__init__(component) def check_permissions(self, *args, **kwargs): - component = sq.first(self.components) + component = self.components[0] return (not component.check_permissions(*args, **kwargs)) diff --git a/taiga/base/utils/sequence.py b/taiga/base/utils/sequence.py deleted file mode 100644 index 4e0c3e24..00000000 --- a/taiga/base/utils/sequence.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - - -def first(iterable): - if len(iterable) == 0: - return None - return iterable[0] - - -def next(data:list): - return data[1:] - - -def arithmetic_progression(step=1, start=1): - i = start - while True: - yield i - i += step diff --git a/taiga/projects/models.py b/taiga/projects/models.py index f6f6cc52..c23fcc4b 100644 --- a/taiga/projects/models.py +++ b/taiga/projects/models.py @@ -35,7 +35,6 @@ from taiga.base.utils.time import timestamp_ms from taiga.projects.tagging.models import TaggedMixin from taiga.projects.tagging.models import TagsColorsdMixin from taiga.base.utils.files import get_file_path -from taiga.base.utils.sequence import arithmetic_progression from taiga.base.utils.slug import slugify_uniquely from taiga.base.utils.slug import slugify_uniquely_for_queryset @@ -287,14 +286,8 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): if not self.slug: with advisory_lock("project-creation"): - base_name = "{}-{}".format(self.owner.username, self.name) - base_slug = slugify_uniquely(base_name, self.__class__) - slug = base_slug - for i in arithmetic_progression(): - if not type(self).objects.filter(slug=slug).exists() or i > 100: - break - slug = "{}-{}".format(base_slug, i) - self.slug = slug + base_slug = "{}-{}".format(self.owner.username, self.name) + self.slug = slugify_uniquely(base_slug, self.__class__) super().save(*args, **kwargs) else: super().save(*args, **kwargs) From c334836ef22dfdd476c48508f944343fbb1be4b5 Mon Sep 17 00:00:00 2001 From: Yongdae Hwang Date: Mon, 17 Oct 2016 17:00:42 +0900 Subject: [PATCH 021/144] Make migration compatible with EnterpriseDB 9.4 --- taiga/projects/tasks/migrations/0009_auto_20151104_1131.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taiga/projects/tasks/migrations/0009_auto_20151104_1131.py b/taiga/projects/tasks/migrations/0009_auto_20151104_1131.py index da11ea7b..064f8848 100644 --- a/taiga/projects/tasks/migrations/0009_auto_20151104_1131.py +++ b/taiga/projects/tasks/migrations/0009_auto_20151104_1131.py @@ -12,11 +12,11 @@ WITH status_update AS( WITH status_update AS( WITH history_entries AS ( SELECT - diff#>>'{status, 1}' new_status_id, + diff #>>'{status, 1}' new_status_id, regexp_split_to_array(key, ':') as split_key, created_at as date FROM history_historyentry - WHERE diff#>>'{status, 1}' != '' + WHERE diff #>>'{status, 1}' != '' ) SELECT split_key[2] as object_id, From a1e3812bbf0f31e063f8771cff0a9cf4fb164bfe Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 14 Oct 2016 09:24:46 +0200 Subject: [PATCH 022/144] Error on unique constratins on cretaion for epic related user stories --- taiga/projects/epics/api.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/taiga/projects/epics/api.py b/taiga/projects/epics/api.py index 84b13dad..542fd61d 100644 --- a/taiga/projects/epics/api.py +++ b/taiga/projects/epics/api.py @@ -36,6 +36,8 @@ from taiga.projects.occ import OCCResourceMixin from taiga.projects.tagging.api import TaggedResourceMixin from taiga.projects.votes.mixins.viewsets import VotedResourceMixin, VotersViewSetMixin +from django_pglocks import advisory_lock + from . import models from . import permissions from . import serializers @@ -261,6 +263,11 @@ class EpicRelatedUserStoryViewSet(NestedViewSetMixin, HistoryResourceMixin, super().post_save(obj, created) + def create(self, request, *args, **kwargs): + epic_id = request.DATA.get("epic", 0) + with advisory_lock("epic-related-user-stories-creation-{}".format(epic_id)): + return super().create(request, *args, **kwargs) + @list_route(methods=["POST"]) def bulk_create(self, request, **kwargs): validator = validators.CreateRelatedUserStoriesBulkValidator(data=request.DATA) From 15b9fb5f537cd9aa9b4ff0543800e6f8c832a90d Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 18 Oct 2016 08:41:31 +0200 Subject: [PATCH 023/144] Issue 4652: Lost tasks on sprint view --- taiga/projects/userstories/services.py | 6 +++++- tests/integration/test_userstories.py | 15 +++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/taiga/projects/userstories/services.py b/taiga/projects/userstories/services.py index 2a381eb0..9a94fecd 100644 --- a/taiga/projects/userstories/services.py +++ b/taiga/projects/userstories/services.py @@ -32,12 +32,12 @@ from taiga.projects.services import apply_order_updates from taiga.projects.userstories.apps import connect_userstories_signals from taiga.projects.userstories.apps import disconnect_userstories_signals from taiga.events import events +from taiga.projects.tasks.models import Task from taiga.projects.votes.utils import attach_total_voters_to_queryset from taiga.projects.notifications.utils import attach_watchers_to_queryset from . import models - ##################################################### # Bulk actions ##################################################### @@ -129,6 +129,10 @@ def update_userstories_milestone_in_bulk(bulk_data: list, milestone: object): db.update_attr_in_bulk_for_ids(us_milestones, "milestone_id", model=models.UserStory) db.update_attr_in_bulk_for_ids(us_orders, "sprint_order", models.UserStory) + + # Updating the milestone for the tasks + Task.objects.filter(user_story_id__in=[e["us_id"] for e in bulk_data]).update(milestone=milestone) + return us_orders diff --git a/tests/integration/test_userstories.py b/tests/integration/test_userstories.py index bf6f1b26..daae88a5 100644 --- a/tests/integration/test_userstories.py +++ b/tests/integration/test_userstories.py @@ -317,7 +317,10 @@ def test_api_update_milestone_in_bulk(client): f.MembershipFactory.create(project=project, user=project.owner, is_admin=True) milestone = f.MilestoneFactory.create(project=project) us1 = f.create_userstory(project=project) + t1 = f.create_task(user_story=us1, project=project) + t2 = f.create_task(user_story=us1, project=project) us2 = f.create_userstory(project=project) + t3 = f.create_task(user_story=us2, project=project) us3 = f.create_userstory(project=project, milestone=milestone, sprint_order=1) us4 = f.create_userstory(project=project, milestone=milestone, sprint_order=2) @@ -335,10 +338,14 @@ def test_api_update_milestone_in_bulk(client): response = client.json.post(url, json.dumps(data)) assert response.status_code == 204, response.data assert project.milestones.get(id=milestone.id).user_stories.count() == 4 - assert list(project.milestones.get(id=milestone.id).\ - user_stories.\ - order_by("sprint_order").\ - values_list("id", "sprint_order")) == [(us3.id, 1), (us1.id, 2), (us2.id,3), (us4.id,4)] + + uss_list = list(project.milestones.get(id=milestone.id).user_stories.order_by("sprint_order") + .values_list("id", "sprint_order")) + assert uss_list == [(us3.id, 1), (us1.id, 2), (us2.id,3), (us4.id,4)] + + tasks_list = list(project.milestones.get(id=milestone.id).tasks.order_by("id") + .values_list("id", flat=True)) + assert tasks_list == [t1.id, t2.id, t3.id] def test_api_update_milestone_in_bulk_invalid_milestone(client): From c2637e02e9822235015b683c9712e5cc7ec250d2 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 13 Oct 2016 11:18:28 +0200 Subject: [PATCH 024/144] Fixing upvote downvote api --- taiga/projects/votes/services.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/taiga/projects/votes/services.py b/taiga/projects/votes/services.py index 6d80c20d..5c99efa9 100644 --- a/taiga/projects/votes/services.py +++ b/taiga/projects/votes/services.py @@ -23,6 +23,8 @@ from django.db import transaction as tx from django.apps import apps from django.contrib.auth import get_user_model +from django_pglocks import advisory_lock + from .models import Votes, Vote @@ -37,14 +39,15 @@ def add_vote(obj, user): :param user: User adding the vote. :class:`~taiga.users.models.User` instance. """ obj_type = apps.get_model("contenttypes", "ContentType").objects.get_for_model(obj) - vote, created = Vote.objects.get_or_create(content_type=obj_type, object_id=obj.id, user=user) - if not created: - return + with advisory_lock("vote-{}-{}".format(obj_type.id, obj.id)): + vote, created = Vote.objects.get_or_create(content_type=obj_type, object_id=obj.id, user=user) + if not created: + return - votes, _ = Votes.objects.get_or_create(content_type=obj_type, object_id=obj.id) - votes.count = F('count') + 1 - votes.save() - return vote + votes, _ = Votes.objects.get_or_create(content_type=obj_type, object_id=obj.id) + votes.count = F('count') + 1 + votes.save() + return vote @tx.atomic @@ -58,9 +61,10 @@ def remove_vote(obj, user): :param user: User removing her vote. :class:`~taiga.users.models.User` instance. """ obj_type = apps.get_model("contenttypes", "ContentType").objects.get_for_model(obj) - qs = Vote.objects.filter(content_type=obj_type, object_id=obj.id, user=user) - if not qs.exists(): - return + with advisory_lock("vote-{}-{}".format(obj_type.id, obj.id)): + qs = Vote.objects.filter(content_type=obj_type, object_id=obj.id, user=user) + if not qs.exists(): + return qs.delete() From beeb17575a5ea06c06cd90bfda28a73acdce6f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 18 Oct 2016 15:54:43 +0200 Subject: [PATCH 025/144] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cfd015fb..ec08071c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Taiga Backend # ![Kaleidos Project](http://kaleidos.net/static/img/badge.png "Kaleidos Project") -[![Managed with Taiga.io](https://taiga.io/media/support/attachments/article-22/banner-gh.png)](https://taiga.io "Managed with Taiga.io") +[![Managed with Taiga.io](https://tree.taiga.io/support/images/taiga-badge-gh.png)](https://taiga.io "Managed with Taiga.io") [![Build Status](https://travis-ci.org/taigaio/taiga-back.svg?branch=master)](https://travis-ci.org/taigaio/taiga-back "Build Status") [![Coverage Status](https://coveralls.io/repos/taigaio/taiga-back/badge.svg?branch=master)](https://coveralls.io/r/taigaio/taiga-back?branch=master "Coverage Status") [![Dependency Status](https://www.versioneye.com/user/projects/561bd091a193340f32001464/badge.svg?style=flat)](https://www.versioneye.com/user/projects/561bd091a193340f32001464) From 99f8bfdc9ff73779b7b7873ac2ebe95138786935 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 19 Oct 2016 08:37:01 +0200 Subject: [PATCH 026/144] Error on unique constratins on memberships bulk creation --- taiga/projects/api.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/taiga/projects/api.py b/taiga/projects/api.py index a3ca3445..31a6cf84 100644 --- a/taiga/projects/api.py +++ b/taiga/projects/api.py @@ -716,11 +716,12 @@ class MembershipViewSet(BlockedByProjectMixin, ModelCrudViewSet): self._check_if_project_can_have_more_memberships(project, total_new_memberships) try: - members = services.create_members_in_bulk(data["bulk_memberships"], - project=project, - invitation_extra_text=invitation_extra_text, - callback=self.post_save, - precall=self.pre_save) + with advisory_lock("membership-creation-{}".format(project.id)): + members = services.create_members_in_bulk(data["bulk_memberships"], + project=project, + invitation_extra_text=invitation_extra_text, + callback=self.post_save, + precall=self.pre_save) except exc.ValidationError as err: return response.BadRequest(err.message_dict) From 132f7591908470e1311f22a59076a3d4caf97a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 19 Oct 2016 10:22:06 +0200 Subject: [PATCH 027/144] Add issues temaplate --- ISSUE_TEMPLATE.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..068b5851 --- /dev/null +++ b/ISSUE_TEMPLATE.md @@ -0,0 +1,19 @@ +**Before adding an issue** +Please ensure that your issue is not already reported in our [issues list](https://tree.taiga.io/project/taiga/issues?order_by=-created_date). +If this issue was already reported, remember that you can upvote it to raise its importance. + +**Do you want to request a *feature* or report a *bug*?** + +**What is the current behavior?** + +**If the current behavior is a bug, please provide the steps to reproduce.** + +**What is the expected behavior?** + +**Is it happening in taiga.io or in your own instance?** + +**What browser/version are you using?** + +**Are there any console errors *(Ctrl + F12)* in red?** + +Thanks for reporting! From 2516fb9685a1f884a4d5fa3c2d3306a8dd3b9c75 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 20 Oct 2016 09:25:01 +0200 Subject: [PATCH 028/144] Tanking snapshot when creating related user stories for an epic in bulk mode --- taiga/projects/epics/api.py | 1 + taiga/projects/userstories/models.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/taiga/projects/epics/api.py b/taiga/projects/epics/api.py index 542fd61d..b2e53052 100644 --- a/taiga/projects/epics/api.py +++ b/taiga/projects/epics/api.py @@ -292,6 +292,7 @@ class EpicRelatedUserStoryViewSet(NestedViewSetMixin, HistoryResourceMixin, for related_userstory in related_userstories: self.persist_history_snapshot(obj=related_userstory) + self.persist_history_snapshot(obj=related_userstory.user_story) related_uss_serialized = self.get_serializer_class()(epic.relateduserstory_set.all(), many=True) return response.Ok(related_uss_serialized.data) diff --git a/taiga/projects/userstories/models.py b/taiga/projects/userstories/models.py index 21a67fd9..a82dcab5 100644 --- a/taiga/projects/userstories/models.py +++ b/taiga/projects/userstories/models.py @@ -127,6 +127,12 @@ class UserStory(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, mod super().save(*args, **kwargs) + if not self.role_points.all(): + for role in self.project.roles.all(): + RolePoints.objects.create(role=role, + points=self.project.default_points, + user_story=self) + def __str__(self): return "({1}) {0}".format(self.ref, self.subject) From 88994892f29313865d26722a326deecb3021d878 Mon Sep 17 00:00:00 2001 From: Yongdae Hwang Date: Wed, 19 Oct 2016 10:14:32 +0900 Subject: [PATCH 029/144] Update README.md it is wrong link for translate --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec08071c..c5d46e28 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Currently, we have authored three main documentation hubs: #### Translation #### -We are ready now to accept your help translating Taiga. It's easy (and fun!) just access our team of translators with the link below, set up an account in Transifex and start contributing. Join us to make sure your language is covered! **[Help Taiga to translate content](https://www.transifex.com/signup/ "Help Taiga to trasnlatecontent")** +We are ready now to accept your help translating Taiga. It's easy (and fun!) just access our team of translators with the link below, set up an account in Transifex and start contributing. Join us to make sure your language is covered! **[Help Taiga to translate content](https://www.transifex.com/taiga-agile-llc/taiga-back/ "Help Taiga to trasnlatecontent")** #### Code patches #### From bc726cbcda831f33f442951764f9b2def55dfa3c Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 20 Oct 2016 15:27:57 +0200 Subject: [PATCH 030/144] Fixing tests --- .../test_userstories_resources.py | 82 +++++++----- tests/integration/test_models.py | 10 +- tests/integration/test_stats.py | 120 ++++++++---------- 3 files changed, 108 insertions(+), 104 deletions(-) diff --git a/tests/integration/resources_permissions/test_userstories_resources.py b/tests/integration/resources_permissions/test_userstories_resources.py index bf8c596d..3c91bad7 100644 --- a/tests/integration/resources_permissions/test_userstories_resources.py +++ b/tests/integration/resources_permissions/test_userstories_resources.py @@ -60,33 +60,42 @@ def data(): m.project_owner = f.UserFactory.create() m.other_user = f.UserFactory.create() + + m.public_points = f.PointsFactory() m.public_project = f.ProjectFactory(is_private=False, anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), owner=m.project_owner, - userstories_csv_uuid=uuid.uuid4().hex) + userstories_csv_uuid=uuid.uuid4().hex, + default_points=m.public_points) m.public_project = attach_project_extra_info(Project.objects.all()).get(id=m.public_project.id) + m.private_points1 = f.PointsFactory() m.private_project1 = f.ProjectFactory(is_private=True, anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), owner=m.project_owner, - userstories_csv_uuid=uuid.uuid4().hex) + userstories_csv_uuid=uuid.uuid4().hex, + default_points=m.private_points1) m.private_project1 = attach_project_extra_info(Project.objects.all()).get(id=m.private_project1.id) + m.private_points2 = f.PointsFactory() m.private_project2 = f.ProjectFactory(is_private=True, anon_permissions=[], public_permissions=[], owner=m.project_owner, - userstories_csv_uuid=uuid.uuid4().hex) + userstories_csv_uuid=uuid.uuid4().hex, + default_points=m.private_points2) m.private_project2 = attach_project_extra_info(Project.objects.all()).get(id=m.private_project2.id) + m.blocked_points = f.PointsFactory() m.blocked_project = f.ProjectFactory(is_private=True, anon_permissions=[], public_permissions=[], owner=m.project_owner, userstories_csv_uuid=uuid.uuid4().hex, - blocked_code=project_choices.BLOCKED_BY_STAFF) + blocked_code=project_choices.BLOCKED_BY_STAFF, + default_points=m.blocked_points) m.blocked_project = attach_project_extra_info(Project.objects.all()).get(id=m.blocked_project.id) m.public_membership = f.MembershipFactory( @@ -138,39 +147,24 @@ def data(): user=m.project_owner, is_admin=True) - m.public_points = f.PointsFactory(project=m.public_project) - m.private_points1 = f.PointsFactory(project=m.private_project1) - m.private_points2 = f.PointsFactory(project=m.private_project2) - m.blocked_points = f.PointsFactory(project=m.blocked_project) - - m.public_role_points = f.RolePointsFactory(role=m.public_project.roles.all()[0], - points=m.public_points, - user_story__project=m.public_project, - user_story__milestone__project=m.public_project, - user_story__status__project=m.public_project) - m.private_role_points1 = f.RolePointsFactory(role=m.private_project1.roles.all()[0], - points=m.private_points1, - user_story__project=m.private_project1, - user_story__milestone__project=m.private_project1, - user_story__status__project=m.private_project1) - m.private_role_points2 = f.RolePointsFactory(role=m.private_project2.roles.all()[0], - points=m.private_points2, - user_story__project=m.private_project2, - user_story__milestone__project=m.private_project2, - user_story__status__project=m.private_project2) - m.blocked_role_points = f.RolePointsFactory(role=m.blocked_project.roles.all()[0], - points=m.blocked_points, - user_story__project=m.blocked_project, - user_story__milestone__project=m.blocked_project, - user_story__status__project=m.blocked_project) - - m.public_user_story = m.public_role_points.user_story + m.public_user_story = f.UserStoryFactory(project=m.public_project, + milestone__project=m.public_project, + status__project=m.public_project) m.public_user_story = attach_userstory_extra_info(UserStory.objects.all()).get(id=m.public_user_story.id) - m.private_user_story1 = m.private_role_points1.user_story + + m.private_user_story1 = f.UserStoryFactory(project=m.private_project1, + milestone__project=m.private_project1, + status__project=m.private_project1) m.private_user_story1 = attach_userstory_extra_info(UserStory.objects.all()).get(id=m.private_user_story1.id) - m.private_user_story2 = m.private_role_points2.user_story + + m.private_user_story2 = f.UserStoryFactory(project=m.private_project2, + milestone__project=m.private_project2, + status__project=m.private_project2) m.private_user_story2 = attach_userstory_extra_info(UserStory.objects.all()).get(id=m.private_user_story2.id) - m.blocked_user_story = m.blocked_role_points.user_story + + m.blocked_user_story = f.UserStoryFactory(project=m.blocked_project, + milestone__project=m.blocked_project, + status__project=m.blocked_project) m.blocked_user_story = attach_userstory_extra_info(UserStory.objects.all()).get(id=m.blocked_user_story.id) return m @@ -274,24 +268,28 @@ def test_user_story_put_update(client, data): with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): user_story_data = UserStorySerializer(data.public_user_story).data + del user_story_data["points"] user_story_data["subject"] = "test" user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', public_url, user_story_data, users) assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.private_user_story1).data + del user_story_data["points"] user_story_data["subject"] = "test" user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', private_url1, user_story_data, users) assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.private_user_story2).data + del user_story_data["points"] user_story_data["subject"] = "test" user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', private_url2, user_story_data, users) assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.blocked_user_story).data + del user_story_data["points"] user_story_data["subject"] = "test" user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', blocked_url, user_story_data, users) @@ -314,24 +312,28 @@ def test_user_story_put_comment(client, data): with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): user_story_data = UserStorySerializer(data.public_user_story).data + del user_story_data["points"] user_story_data["comment"] = "test comment" user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', public_url, user_story_data, users) assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.private_user_story1).data + del user_story_data["points"] user_story_data["comment"] = "test comment" user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', private_url1, user_story_data, users) assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.private_user_story2).data + del user_story_data["points"] user_story_data["comment"] = "test comment" user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', private_url2, user_story_data, users) assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.blocked_user_story).data + del user_story_data["points"] user_story_data["comment"] = "test comment" user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', blocked_url, user_story_data, users) @@ -354,6 +356,7 @@ def test_user_story_put_update_and_comment(client, data): with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): user_story_data = UserStorySerializer(data.public_user_story).data + del user_story_data["points"] user_story_data["subject"] = "test" user_story_data["comment"] = "test comment" user_story_data = json.dumps(user_story_data) @@ -361,6 +364,7 @@ def test_user_story_put_update_and_comment(client, data): assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.private_user_story1).data + del user_story_data["points"] user_story_data["subject"] = "test" user_story_data["comment"] = "test comment" user_story_data = json.dumps(user_story_data) @@ -368,6 +372,7 @@ def test_user_story_put_update_and_comment(client, data): assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.private_user_story2).data + del user_story_data["points"] user_story_data["subject"] = "test" user_story_data["comment"] = "test comment" user_story_data = json.dumps(user_story_data) @@ -375,6 +380,7 @@ def test_user_story_put_update_and_comment(client, data): assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.blocked_user_story).data + del user_story_data["points"] user_story_data["subject"] = "test" user_story_data["comment"] = "test comment" user_story_data = json.dumps(user_story_data) @@ -392,9 +398,13 @@ def test_user_story_put_update_with_project_change(client): us_status1 = f.UserStoryStatusFactory.create(project=project1) us_status2 = f.UserStoryStatusFactory.create(project=project2) + points1 = f.PointsFactory.create(project=project1) + points2 = f.PointsFactory.create(project=project2) project1.default_us_status = us_status1 project2.default_us_status = us_status2 + project1.default_points = points1 + project2.default_points = points2 project1.save() project2.save() @@ -429,6 +439,7 @@ def test_user_story_put_update_with_project_change(client): us_data = UserStorySerializer(us).data us_data["project"] = project2.id + del us_data["points"] us_data = json.dumps(us_data) response = client.put(url, data=us_data, content_type="application/json") @@ -443,6 +454,7 @@ def test_user_story_put_update_with_project_change(client): us_data = UserStorySerializer(us).data us_data["project"] = project2.id + del us_data["points"] us_data = json.dumps(us_data) response = client.put(url, data=us_data, content_type="application/json") @@ -457,6 +469,7 @@ def test_user_story_put_update_with_project_change(client): us_data = UserStorySerializer(us).data us_data["project"] = project2.id + del us_data["points"] us_data = json.dumps(us_data) response = client.put(url, data=us_data, content_type="application/json") @@ -471,6 +484,7 @@ def test_user_story_put_update_with_project_change(client): us_data = UserStorySerializer(us).data us_data["project"] = project2.id + del us_data["points"] us_data = json.dumps(us_data) response = client.put(url, data=us_data, content_type="application/json") diff --git a/tests/integration/test_models.py b/tests/integration/test_models.py index 6c6229b1..6c0b7b01 100644 --- a/tests/integration/test_models.py +++ b/tests/integration/test_models.py @@ -42,11 +42,15 @@ def test_project_update_role_points(): """ project = f.ProjectFactory.create() related_role = f.RoleFactory.create(project=project, computable=True) - not_related_role = f.RoleFactory.create(project=project, computable=True) null_points = f.PointsFactory.create(project=project, value=None) user_story = f.UserStoryFactory(project=project) - user_story.role_points.add(f.RolePointsFactory(role=related_role, points=null_points)) + + new_related_role = f.RoleFactory.create(project=project, computable=True) + + assert user_story.role_points.count() == 1 + assert user_story.role_points.filter(role=new_related_role, points=null_points).count() == 0 project.update_role_points() - assert user_story.role_points.filter(role=not_related_role, points=null_points).count() == 1 + assert user_story.role_points.count() == 2 + assert user_story.role_points.filter(role=new_related_role, points=null_points).count() == 1 diff --git a/tests/integration/test_stats.py b/tests/integration/test_stats.py index 5dfdd3d9..790dd3e8 100644 --- a/tests/integration/test_stats.py +++ b/tests/integration/test_stats.py @@ -48,6 +48,7 @@ def data(): m.role2 = f.RoleFactory(project=m.project) m.null_points = f.PointsFactory(project=m.project, value=None) + m.default_points = f.PointsFactory(project=m.project, value=0) m.points1 = f.PointsFactory(project=m.project, value=1) m.points2 = f.PointsFactory(project=m.project, value=2) m.points3 = f.PointsFactory(project=m.project, value=4) @@ -57,94 +58,83 @@ def data(): m.open_status = f.UserStoryStatusFactory(is_closed=False) m.closed_status = f.UserStoryStatusFactory(is_closed=True) + m.project.default_points = m.default_points + m.project.save() - m.role_points1 = f.RolePointsFactory(role=m.role1, - points=m.points1, - user_story__project=m.project, - user_story__status=m.open_status, - user_story__milestone=None) - m.role_points2 = f.RolePointsFactory(role=m.role1, - points=m.points2, - user_story__project=m.project, - user_story__status=m.open_status, - user_story__milestone=None) - m.role_points3 = f.RolePointsFactory(role=m.role1, - points=m.points3, - user_story__project=m.project, - user_story__status=m.open_status, - user_story__milestone=None) - m.role_points4 = f.RolePointsFactory(role=m.project.roles.all()[0], - points=m.points4, - user_story__project=m.project, - user_story__status=m.open_status, - user_story__milestone=None) - # 5 and 6 are in closed milestones - m.role_points5 = f.RolePointsFactory(role=m.project.roles.all()[0], - points=m.points5, - user_story__project=m.project, - user_story__status=m.open_status, - user_story__milestone__closed=True, - user_story__milestone__project=m.project) - m.role_points6 = f.RolePointsFactory(role=m.project.roles.all()[0], - points=m.points6, - user_story__project=m.project, - user_story__status=m.open_status, - user_story__milestone__closed=True, - user_story__milestone__project=m.project) + m.user_story1 = f.UserStoryFactory(project=m.project, + status=m.open_status, + milestone=None) + m.user_story1.role_points.filter(role=m.role1).update(points=m.points1) - m.user_story1 = m.role_points1.user_story - m.user_story2 = m.role_points2.user_story - m.user_story3 = m.role_points3.user_story - m.user_story4 = m.role_points4.user_story - m.user_story5 = m.role_points5.user_story - m.user_story6 = m.role_points6.user_story + m.user_story2 = f.UserStoryFactory(project=m.project, + status=m.open_status, + milestone=None) + m.user_story2.role_points.filter(role=m.role1).update(points=m.points2) - m.milestone = f.MilestoneFactory(project=m.project) + m.user_story3 = f.UserStoryFactory(project=m.project, + status=m.open_status, + milestone=None) + m.user_story3.role_points.filter(role=m.role1).update(points=m.points3) + + m.user_story4 = f.UserStoryFactory(project=m.project, + status=m.open_status, + milestone=None) + m.user_story4.role_points.filter(role=m.role1).update(points=m.points4) + + # 5 and 6 are inclosed milestones + m.user_story5 = f.UserStoryFactory(project=m.project, + status=m.open_status, + milestone__closed=True, + milestone__project=m.project) + + m.user_story5.role_points.filter(role=m.role1).update(points=m.points5) + + m.user_story6 = f.UserStoryFactory(project=m.project, + status=m.open_status, + milestone__closed=True, + milestone__project=m.project) + + m.user_story6.role_points.filter(role=m.role1).update(points=m.points6) return m def test_project_defined_points(client, data): project_stats = get_stats_for_project(data.project) - assert project_stats["defined_points_per_role"] == {data.role1.pk: 63} - data.role_points1.role = data.role2 - data.role_points1.save() + assert project_stats["defined_points_per_role"] == {data.role1.pk: 63, data.role2.pk: 0} + data.user_story1.role_points.filter(role=data.role1).update(points=data.default_points) + data.user_story1.role_points.filter(role=data.role2).update(points=data.points1) project_stats = get_stats_for_project(data.project) assert project_stats["defined_points_per_role"] == {data.role1.pk: 62, data.role2.pk: 1} def test_project_closed_points(client, data): - project_stats = get_stats_for_project(data.project) - assert project_stats["closed_points_per_role"] == {} - data.role_points1.role = data.role2 - data.role_points1.save() project_stats = get_stats_for_project(data.project) assert project_stats["closed_points_per_role"] == {} data.user_story1.is_closed = True data.user_story1.save() project_stats = get_stats_for_project(data.project) - assert project_stats["closed_points_per_role"] == {data.role2.pk: 1} + assert project_stats["closed_points_per_role"] == {data.role1.pk: 1, data.role2.pk: 0} data.user_story2.is_closed = True data.user_story2.save() project_stats = get_stats_for_project(data.project) - assert project_stats["closed_points_per_role"] == {data.role1.pk: 2, data.role2.pk: 1} + assert project_stats["closed_points_per_role"] == {data.role1.pk: 3, data.role2.pk: 0} data.user_story3.is_closed = True data.user_story3.save() project_stats = get_stats_for_project(data.project) - assert project_stats["closed_points_per_role"] == {data.role1.pk: 6, data.role2.pk: 1} + assert project_stats["closed_points_per_role"] == {data.role1.pk: 7, data.role2.pk: 0} data.user_story4.is_closed = True data.user_story4.save() project_stats = get_stats_for_project(data.project) - assert project_stats["closed_points_per_role"] == {data.role1.pk: 14, data.role2.pk: 1} - + assert project_stats["closed_points_per_role"] == {data.role1.pk: 15, data.role2.pk: 0} data.user_story5.is_closed = True data.user_story5.save() project_stats = get_stats_for_project(data.project) - assert project_stats["closed_points_per_role"] == {data.role1.pk: 30, data.role2.pk: 1} + assert project_stats["closed_points_per_role"] == {data.role1.pk: 31, data.role2.pk: 0} data.user_story6.is_closed = True data.user_story6.save() project_stats = get_stats_for_project(data.project) - assert project_stats["closed_points_per_role"] == {data.role1.pk: 62, data.role2.pk: 1} + assert project_stats["closed_points_per_role"] == {data.role1.pk: 63, data.role2.pk: 0} project_stats = get_stats_for_project(data.project) assert project_stats["closed_points"] == 63 @@ -153,24 +143,20 @@ def test_project_closed_points(client, data): def test_project_assigned_points(client, data): project_stats = get_stats_for_project(data.project) - assert project_stats["assigned_points_per_role"] == {data.role1.pk: 48} - data.role_points1.role = data.role2 - data.role_points1.save() - project_stats = get_stats_for_project(data.project) - assert project_stats["assigned_points_per_role"] == {data.role1.pk: 48} - data.user_story1.milestone = data.milestone + assert project_stats["assigned_points_per_role"] == {data.role1.pk: 48, data.role2.pk: 0} + data.user_story1.milestone = data.user_story6.milestone data.user_story1.save() project_stats = get_stats_for_project(data.project) - assert project_stats["assigned_points_per_role"] == {data.role1.pk: 48, data.role2.pk: 1} - data.user_story2.milestone = data.milestone + assert project_stats["assigned_points_per_role"] == {data.role1.pk: 49, data.role2.pk: 0} + data.user_story2.milestone = data.user_story6.milestone data.user_story2.save() project_stats = get_stats_for_project(data.project) - assert project_stats["assigned_points_per_role"] == {data.role1.pk: 50, data.role2.pk: 1} - data.user_story3.milestone = data.milestone + assert project_stats["assigned_points_per_role"] == {data.role1.pk: 51, data.role2.pk: 0} + data.user_story3.milestone = data.user_story6.milestone data.user_story3.save() project_stats = get_stats_for_project(data.project) - assert project_stats["assigned_points_per_role"] == {data.role1.pk: 54, data.role2.pk: 1} - data.user_story4.milestone = data.milestone + assert project_stats["assigned_points_per_role"] == {data.role1.pk: 55, data.role2.pk: 0} + data.user_story4.milestone = data.user_story6.milestone data.user_story4.save() project_stats = get_stats_for_project(data.project) - assert project_stats["assigned_points_per_role"] == {data.role1.pk: 62, data.role2.pk: 1} + assert project_stats["assigned_points_per_role"] == {data.role1.pk: 63, data.role2.pk: 0} From 6144100713315fab654c832ad1fb1c475658473d Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 21 Oct 2016 09:04:15 +0200 Subject: [PATCH 031/144] Issue 4679: Comment permission isn't working for external users --- taiga/permissions/permissions.py | 18 +++++------------- .../test_epics_resources.py | 4 ++-- .../test_issues_resources.py | 4 ++-- .../test_tasks_resources.py | 4 ++-- .../test_userstories_resources.py | 4 ++-- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/taiga/permissions/permissions.py b/taiga/permissions/permissions.py index 0ffefe40..95a2620b 100644 --- a/taiga/permissions/permissions.py +++ b/taiga/permissions/permissions.py @@ -74,18 +74,10 @@ class CommentAndOrUpdatePerm(PermissionComponent): else: project = obj.project - data_keys = request.DATA.keys() + data_keys = set(request.DATA.keys()) - {"version"} + just_a_comment = data_keys == {"comment"} - if (not services.user_has_perm(request.user, self.comment_perm, project) and - "comment" in data_keys): - # User can't comment but there is a comment in the request - #raise exc.PermissionDenied(_("You don't have permissions to comment this.")) - return False + if (just_a_comment and services.user_has_perm(request.user, self.comment_perm, project)): + return True - if (not services.user_has_perm(request.user, self.update_perm, project) and - len(data_keys - "comment")): - # User can't update but there is a change in the request - #raise exc.PermissionDenied(_("You don't have permissions to update this.")) - return False - - return True + return services.user_has_perm(request.user, self.update_perm, project) diff --git a/tests/integration/resources_permissions/test_epics_resources.py b/tests/integration/resources_permissions/test_epics_resources.py index 0becda53..15d9d05b 100644 --- a/tests/integration/resources_permissions/test_epics_resources.py +++ b/tests/integration/resources_permissions/test_epics_resources.py @@ -58,7 +58,7 @@ def data(): m.public_project = f.ProjectFactory(is_private=False, anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), - public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)) + ["comment_epic"], owner=m.project_owner, epics_csv_uuid=uuid.uuid4().hex) m.public_project = attach_project_extra_info(Project.objects.all()).get(id=m.public_project.id) @@ -550,7 +550,7 @@ def test_epic_patch_comment(client, data): with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): patch_data = json.dumps({"comment": "test comment", "version": data.public_epic.version}) results = helper_test_http_method(client, 'patch', public_url, patch_data, users) - assert results == [401, 403, 403, 200, 200] + assert results == [401, 200, 200, 200, 200] patch_data = json.dumps({"comment": "test comment", "version": data.private_epic1.version}) results = helper_test_http_method(client, 'patch', private_url1, patch_data, users) diff --git a/tests/integration/resources_permissions/test_issues_resources.py b/tests/integration/resources_permissions/test_issues_resources.py index 4f93ea0c..b270c126 100644 --- a/tests/integration/resources_permissions/test_issues_resources.py +++ b/tests/integration/resources_permissions/test_issues_resources.py @@ -62,7 +62,7 @@ def data(): m.public_project = f.ProjectFactory(is_private=False, anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), - public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)) + ["comment_issue"], owner=m.project_owner, issues_csv_uuid=uuid.uuid4().hex) m.public_project = attach_project_extra_info(Project.objects.all()).get(id=m.public_project.id) @@ -592,7 +592,7 @@ def test_issue_patch_comment(client, data): with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): patch_data = json.dumps({"comment": "test comment", "version": data.public_issue.version}) results = helper_test_http_method(client, 'patch', public_url, patch_data, users) - assert results == [401, 403, 403, 200, 200] + assert results == [401, 200, 200, 200, 200] patch_data = json.dumps({"comment": "test comment", "version": data.private_issue1.version}) results = helper_test_http_method(client, 'patch', private_url1, patch_data, users) diff --git a/tests/integration/resources_permissions/test_tasks_resources.py b/tests/integration/resources_permissions/test_tasks_resources.py index d2fcc2e3..31e5f34c 100644 --- a/tests/integration/resources_permissions/test_tasks_resources.py +++ b/tests/integration/resources_permissions/test_tasks_resources.py @@ -58,7 +58,7 @@ def data(): m.public_project = f.ProjectFactory(is_private=False, anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), - public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)) + ["comment_task"], owner=m.project_owner, tasks_csv_uuid=uuid.uuid4().hex) m.public_project = attach_project_extra_info(Project.objects.all()).get(id=m.public_project.id) @@ -556,7 +556,7 @@ def test_task_patch_comment(client, data): with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): patch_data = json.dumps({"comment": "test comment", "version": data.public_task.version}) results = helper_test_http_method(client, 'patch', public_url, patch_data, users) - assert results == [401, 403, 403, 200, 200] + assert results == [401, 200, 200, 200, 200] patch_data = json.dumps({"comment": "test comment", "version": data.private_task1.version}) results = helper_test_http_method(client, 'patch', private_url1, patch_data, users) diff --git a/tests/integration/resources_permissions/test_userstories_resources.py b/tests/integration/resources_permissions/test_userstories_resources.py index 3c91bad7..aba70f81 100644 --- a/tests/integration/resources_permissions/test_userstories_resources.py +++ b/tests/integration/resources_permissions/test_userstories_resources.py @@ -64,7 +64,7 @@ def data(): m.public_points = f.PointsFactory() m.public_project = f.ProjectFactory(is_private=False, anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), - public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)) + ["comment_us"], owner=m.project_owner, userstories_csv_uuid=uuid.uuid4().hex, default_points=m.public_points) @@ -544,7 +544,7 @@ def test_user_story_patch_comment(client, data): with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): patch_data = json.dumps({"comment": "test comment", "version": data.public_user_story.version}) results = helper_test_http_method(client, 'patch', public_url, patch_data, users) - assert results == [401, 403, 403, 200, 200] + assert results == [401, 200, 200, 200, 200] patch_data = json.dumps({"comment": "test comment", "version": data.private_user_story1.version}) results = helper_test_http_method(client, 'patch', private_url1, patch_data, users) From ebb52d054355135469dcf1e2d097ac012feb5d8a Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 21 Oct 2016 09:28:02 +0200 Subject: [PATCH 032/144] Fixes CharField behaviour and introduces proper validation for ModelField --- taiga/base/api/fields.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/taiga/base/api/fields.py b/taiga/base/api/fields.py index bab90160..a06a7c60 100644 --- a/taiga/base/api/fields.py +++ b/taiga/base/api/fields.py @@ -467,6 +467,11 @@ class ModelField(WritableField): "type": self.model_field.get_internal_type() } + def validate(self, value): + super(ModelField, self).validate(value) + if value is None and not self.model_field.null: + raise ValidationError(self.error_messages['invalid']) + ##### Typed Fields ##### @@ -512,8 +517,9 @@ class CharField(WritableField): self.validators.append(validators.MaxLengthValidator(max_length)) def from_native(self, value): - if isinstance(value, six.string_types) or value is None: - return value + if value in validators.EMPTY_VALUES: + return "" + return smart_text(value) def to_native(self, value): From 9cd86a369907feb9b34f86bc8ef0c87da14974dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 26 Oct 2016 10:07:12 +0200 Subject: [PATCH 033/144] Fix some flake8 errors --- taiga/base/signals/cleanup_files.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/taiga/base/signals/cleanup_files.py b/taiga/base/signals/cleanup_files.py index e2449ce2..4489b599 100644 --- a/taiga/base/signals/cleanup_files.py +++ b/taiga/base/signals/cleanup_files.py @@ -18,20 +18,18 @@ from django.apps import apps from django.db import models, connection -from django.db.utils import DEFAULT_DB_ALIAS, ConnectionHandler from django.db.models.signals import pre_save, post_delete +from django.dispatch import Signal import logging + logger = logging.getLogger(__name__) -from django.dispatch import Signal - cleanup_pre_delete = Signal(providing_args=["file"]) cleanup_post_delete = Signal(providing_args=["file"]) - def _find_models_with_filefield(): result = [] for model in apps.get_models(): @@ -50,7 +48,7 @@ def _delete_file(file_obj): cleanup_post_delete.send(sender=None, file=file_obj) except Exception: logger.exception("Unexpected exception while attempting " - "to delete old file '%s'".format(file_obj.name)) + "to delete old file '%s'".format(file_obj.name)) storage = file_obj.storage if storage and storage.exists(file_obj.name): @@ -90,9 +88,6 @@ def remove_files_on_delete(sender, instance, **kwargs): def connect_cleanup_files_signals(): - connections = ConnectionHandler() - backend = connections[DEFAULT_DB_ALIAS] - for model in _find_models_with_filefield(): pre_save.connect(remove_files_on_change, sender=model) post_delete.connect(remove_files_on_delete, sender=model) From f22b1288ec4b80afb25ee332fe30ed2c59e45a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 31 Oct 2016 17:50:15 +0100 Subject: [PATCH 034/144] Update TravisCI settings --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac145daa..dfa1521c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,17 @@ language: python python: - "3.4" - "3.5" +addons: + postgresql: "9.4" services: - - rabbitmq # will start rabbitmq-server + - rabbitmq + - postgresql cache: - apt - pip before_install: - sudo apt-get -qq update - sudo /etc/init.d/postgresql stop - - sudo apt-get install -y postgresql-9.4 - sudo apt-get install -y postgresql-plpython-9.4 - sudo /etc/init.d/postgresql start 9.4 - psql -c 'create database taiga;' -U postgres From 32d2d0a07c3057ef11b273d54303015f26108ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 19 Oct 2016 11:32:43 +0200 Subject: [PATCH 035/144] Upgrade requirements annd change json to jsonb --- requirements-devel.txt | 12 +- requirements.txt | 36 +- settings/common.py | 1 + taiga/base/api/serializers.py | 34 +- taiga/base/api/urlpatterns.py | 4 +- taiga/base/db/__init__.py | 0 taiga/base/db/models/__init__.py | 0 taiga/base/db/models/fields/__init__.py | 20 + taiga/base/db/models/fields/json.py | 82 ++ taiga/base/fields.py | 6 +- taiga/base/management/commands/test_emails.py | 53 +- taiga/base/routers.py | 4 +- taiga/export_import/validators/fields.py | 8 +- taiga/export_import/validators/mixins.py | 4 +- taiga/export_import/validators/validators.py | 6 +- ...svalues_userstorycustomattributesvalues.py | 8 +- .../migrations/0005_auto_20150505_1639.py | 8 +- .../migrations/0009_auto_20160728_1002.py | 4 +- .../migrations/0011_json_to_jsonb.py | 90 ++ taiga/projects/custom_attributes/models.py | 4 +- .../projects/custom_attributes/serializers.py | 2 +- .../projects/custom_attributes/validators.py | 4 +- .../fixtures/initial_project_templates.json | 1116 ++++++++++++++++- .../history/migrations/0001_initial.py | 10 +- .../migrations/0003_auto_20140917_1405.py | 4 +- .../0006_fix_json_field_not_null.py | 2 +- .../migrations/0008_auto_20150508_1028.py | 8 +- .../migrations/0009_auto_20160512_1110.py | 4 +- .../0013_historyentry_values_diff_cache.py | 4 +- .../history/migrations/0014_json_to_jsonb.py | 29 + taiga/projects/history/models.py | 16 +- taiga/projects/history/serializers.py | 6 +- .../issues/migrations/0001_initial.py | 4 +- .../0002_issue_external_reference.py | 4 +- taiga/projects/migrations/0001_initial.py | 11 +- .../migrations/0002_auto_20140903_0920.py | 20 +- .../migrations/0010_project_modules_config.py | 4 +- .../migrations/0011_auto_20141028_2057.py | 4 +- .../0016_fix_json_field_not_null.py | 2 +- .../migrations/0019_auto_20150311_0821.py | 4 +- .../migrations/0024_auto_20150810_1247.py | 4 +- .../migrations/0025_auto_20150901_1600.py | 4 +- .../migrations/0041_auto_20160519_1058.py | 7 +- .../migrations/0049_auto_20160629_1443.py | 6 +- .../projects/migrations/0055_json_to_jsonb.py | 39 + taiga/projects/models.py | 24 +- .../projects/tasks/migrations/0001_initial.py | 4 +- .../0003_task_external_reference.py | 4 +- .../userstories/migrations/0001_initial.py | 4 +- .../0007_userstory_external_reference.py | 4 +- taiga/projects/validators.py | 20 +- .../management/commands/rebuild_timeline.py | 49 +- taiga/timeline/migrations/0001_initial.py | 4 +- .../migrations/0002_auto_20150327_1056.py | 4 +- .../timeline/migrations/0006_json_to_jsonb.py | 28 + taiga/timeline/models.py | 4 +- taiga/urls.py | 2 +- taiga/users/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20140903_0916.py | 4 +- .../migrations/0007_auto_20150209_1611.py | 4 +- .../migrations/0012_auto_20150812_1142.py | 5 +- .../migrations/0013_auto_20150901_1600.py | 5 +- .../migrations/0019_auto_20160519_1058.py | 7 +- taiga/users/migrations/0023_json_to_jsonb.py | 28 + taiga/users/models.py | 4 +- taiga/userstorage/migrations/0001_initial.py | 4 +- .../0002_fix_json_field_not_null.py | 2 +- .../migrations/0003_json_to_jsonb.py | 28 + taiga/userstorage/models.py | 4 +- taiga/webhooks/migrations/0001_initial.py | 4 +- .../migrations/0003_auto_20150122_1021.py | 12 +- .../migrations/0005_auto_20150505_1639.py | 8 +- .../webhooks/migrations/0006_json_to_jsonb.py | 25 + taiga/webhooks/models.py | 8 +- .../test_projects_resource.py | 6 + tests/integration/test_history.py | 5 +- tests/integration/test_notifications.py | 7 +- .../integration/test_references_sequences.py | 10 + tests/integration/test_roles.py | 24 - tests/integration/test_timeline.py | 16 +- tests/integration/test_totals_projects.py | 8 +- tests/unit/test_export.py | 4 +- tests/unit/test_mdrender.py | 9 +- 83 files changed, 1780 insertions(+), 315 deletions(-) create mode 100644 taiga/base/db/__init__.py create mode 100644 taiga/base/db/models/__init__.py create mode 100644 taiga/base/db/models/fields/__init__.py create mode 100644 taiga/base/db/models/fields/json.py create mode 100644 taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py create mode 100644 taiga/projects/history/migrations/0014_json_to_jsonb.py create mode 100644 taiga/projects/migrations/0055_json_to_jsonb.py create mode 100644 taiga/timeline/migrations/0006_json_to_jsonb.py create mode 100644 taiga/users/migrations/0023_json_to_jsonb.py create mode 100644 taiga/userstorage/migrations/0003_json_to_jsonb.py create mode 100644 taiga/webhooks/migrations/0006_json_to_jsonb.py diff --git a/requirements-devel.txt b/requirements-devel.txt index e01aa38a..8fd114df 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -1,13 +1,13 @@ -r requirements.txt -factory_boy==2.6.1 +factory_boy==2.7.0 py==1.4.31 -pytest==2.8.7 -pytest-django==2.9.1 -pytest-pythonpath==0.7 +pytest==3.0.3 +pytest-django==3.0.0 +pytest-pythonpath==0.7.1 -coverage==4.0.3 +coverage==4.2 coveralls==1.1 django-slowdown==0.0.1 -transifex-client==0.11.1.beta +transifex-client==0.12.2 diff --git a/requirements.txt b/requirements.txt index 47ad6c46..761b1627 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,37 +1,35 @@ -Django==1.9.2 +Django==1.10.3 #djangorestframework==2.3.13 # It's not necessary since Taiga 1.7 django-picklefield==0.3.2 django-sampledatahelper==0.4.0 -gunicorn==19.4.5 -psycopg2==2.6.1 -Pillow==3.1.1 -pytz==2015.7 +gunicorn==19.6.0 +psycopg2==2.6.2 +Pillow==3.4.2 +pytz==2016.7 six==1.10.0 -amqp==1.4.9 -djmail==0.12.0.post1 -django-pgjson==0.3.1 -djorm-pgarray==1.2 # Use until Taiga 2.1. Keep compatibility with old migrations -django-jinja==2.1.2 +amqp==2.1.1 +djmail==0.13.0 +django-jinja==2.2.1 jinja2==2.8 -pygments==2.0.2 +pygments==2.1.3 django-sites==0.9 -Markdown==2.6.5 +Markdown==2.6.7 fn==0.4.3 diff-match-patch==20121119 requests==2.9.1 django-sr==0.0.4 easy-thumbnails==2.3 -celery==3.1.20 +celery==3.1.24 redis==2.10.5 Unidecode==0.04.19 raven==5.10.2 bleach==1.4.3 -django-ipware==1.1.3 -premailer==2.9.7 +django-ipware==1.1.6 +premailer==3.0.1 cssutils==1.0.1 # Compatible with python 3.5 -lxml==3.5.0 -git+https://github.com/Xof/django-pglocks.git@dbb8d7375066859f897604132bd437832d2014ea -pyjwkest==1.1.5 -python-dateutil==2.4.2 +lxml==3.6.4 +git+https://github.com/Xof/django-pglocks.git +pyjwkest==1.3.1 +python-dateutil==2.5.3 netaddr==0.7.18 serpy==0.1.1 diff --git a/settings/common.py b/settings/common.py index 87d0d904..641d888f 100644 --- a/settings/common.py +++ b/settings/common.py @@ -282,6 +282,7 @@ INSTALLED_APPS = [ "django.contrib.admin", "django.contrib.staticfiles", "django.contrib.sitemaps", + "django.contrib.postgres", "taiga.base", "taiga.base.api", diff --git a/taiga/base/api/serializers.py b/taiga/base/api/serializers.py index 2ee05db8..5de685a6 100644 --- a/taiga/base/api/serializers.py +++ b/taiga/base/api/serializers.py @@ -817,8 +817,18 @@ class ModelSerializer((six.with_metaclass(SerializerMetaclass, BaseSerializer))) else: # Reverse relationships are only included if they are explicitly # present in the `fields` option on the serializer - reverse_rels = opts.get_all_related_objects() - reverse_rels += opts.get_all_related_many_to_many_objects() + + # NOTE: Rewrite after Django 1.10 upgrade. + # See https://docs.djangoproject.com/es/1.10/ref/models/meta/#migrating-from-the-old-api + reverse_rels = [ + f for f in opts.get_fields() + if (f.one_to_many or f.one_to_one) + and f.auto_created and not f.concrete + ] + reverse_rels += [ + f for f in opts.get_fields(include_hidden=True) + if f.many_to_many and f.auto_created + ] for relation in reverse_rels: accessor_name = relation.get_accessor_name() @@ -1024,16 +1034,32 @@ class ModelSerializer((six.with_metaclass(SerializerMetaclass, BaseSerializer))) m2m_data = {} related_data = {} nested_forward_relations = {} + model = self.opts.model meta = self.opts.model._meta # Reverse fk or one-to-one relations - for (obj, model) in meta.get_all_related_objects_with_model(): + # NOTE: Rewrite after Django 1.10 upgrade. + # See https://docs.djangoproject.com/es/1.10/ref/models/meta/#migrating-from-the-old-api + related_objes_with_models = [ + (f, f.model if f.model != model else None) + for f in meta.get_fields() + if (f.one_to_many or f.one_to_one) + and f.auto_created and not f.concrete + ] + for (obj, model) in related_objes_with_models: field_name = obj.get_accessor_name() if field_name in attrs: related_data[field_name] = attrs.pop(field_name) # Reverse m2m relations - for (obj, model) in meta.get_all_related_m2m_objects_with_model(): + # NOTE: Rewrite after Django 1.10 upgrade. + # See https://docs.djangoproject.com/es/1.10/ref/models/meta/#migrating-from-the-old-api + related_m2m_objects_with_model = [ + (f, f.model if f.model != model else None) + for f in meta.get_fields(include_hidden=True) + if f.many_to_many and f.auto_created + ] + for (obj, model) in related_m2m_objects_with_model: field_name = obj.get_accessor_name() if field_name in attrs: m2m_data[field_name] = attrs.pop(field_name) diff --git a/taiga/base/api/urlpatterns.py b/taiga/base/api/urlpatterns.py index 33548a07..c99f5b8d 100644 --- a/taiga/base/api/urlpatterns.py +++ b/taiga/base/api/urlpatterns.py @@ -44,7 +44,7 @@ from django.core.urlresolvers import RegexURLResolver -from django.conf.urls import patterns, url, include +from django.conf.urls import url, include from .settings import api_settings @@ -67,7 +67,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required): else: # Regular URL pattern regex = urlpattern.regex.pattern.rstrip("$") + suffix_pattern - view = urlpattern._callback or urlpattern._callback_str + view = urlpattern.callback kwargs = urlpattern.default_args name = urlpattern.name # Add in both the existing and the new urlpattern diff --git a/taiga/base/db/__init__.py b/taiga/base/db/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/taiga/base/db/models/__init__.py b/taiga/base/db/models/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/taiga/base/db/models/fields/__init__.py b/taiga/base/db/models/fields/__init__.py new file mode 100644 index 00000000..ad16357e --- /dev/null +++ b/taiga/base/db/models/fields/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + + +from .json import JSONField diff --git a/taiga/base/db/models/fields/json.py b/taiga/base/db/models/fields/json.py new file mode 100644 index 00000000..fd1d63a7 --- /dev/null +++ b/taiga/base/db/models/fields/json.py @@ -0,0 +1,82 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + + +from django.core.serializers.json import DjangoJSONEncoder +from django.contrib.postgres.fields import JSONField as DjangoJSONField + +# NOTE: After upgrade Django to the future release (1.11) change +# class JSONField(FutureDjangoJSONField): +# to +# class JSONField(DjangoJSONField): +# and remove the classes JsonAdapter and FutureDjangoJSONField + +import json +from psycopg2.extras import Json +from django.core import exceptions + + +class JsonAdapter(Json): + """ + Customized psycopg2.extras.Json to allow for a custom encoder. + """ + def __init__(self, adapted, dumps=None, encoder=None): + self.encoder = encoder + super().__init__(adapted, dumps=dumps) + + def dumps(self, obj): + options = {'cls': self.encoder} if self.encoder else {} + return json.dumps(obj, **options) + + +class FutureDjangoJSONField(DjangoJSONField): + def __init__(self, verbose_name=None, name=None, encoder=None, **kwargs): + if encoder and not callable(encoder): + raise ValueError("The encoder parameter must be a callable object.") + self.encoder = encoder + super().__init__(verbose_name, name, **kwargs) + + def deconstruct(self): + name, path, args, kwargs = super().deconstruct() + if self.encoder is not None: + kwargs['encoder'] = self.encoder + return name, path, args, kwargs + + def get_prep_value(self, value): + if value is not None: + return JsonAdapter(value, encoder=self.encoder) + return value + + def validate(self, value, model_instance): + super().validate(value, model_instance) + options = {'cls': self.encoder} if self.encoder else {} + try: + json.dumps(value, **options) + except TypeError: + raise exceptions.ValidationError( + self.error_messages['invalid'], + code='invalid', + params={'value': value}, + ) + + +__all__ = ["JSONField"] + +class JSONField(FutureDjangoJSONField): + def __init__(self, verbose_name=None, name=None, encoder=DjangoJSONEncoder, **kwargs): + super().__init__(verbose_name, name, encoder, **kwargs) diff --git a/taiga/base/fields.py b/taiga/base/fields.py index 3b19f15f..8017c10b 100644 --- a/taiga/base/fields.py +++ b/taiga/base/fields.py @@ -30,7 +30,7 @@ import serpy # NOTE: This should be in other place, for example taiga.base.api.serializers -class JsonField(serializers.WritableField): +class JSONField(serializers.WritableField): """ Json objects serializer. """ @@ -95,12 +95,12 @@ class I18NField(Field): return _(ret) -class I18NJsonField(Field): +class I18NJSONField(Field): """ Json objects serializer. """ def __init__(self, i18n_fields=(), *args, **kwargs): - super(I18NJsonField, self).__init__(*args, **kwargs) + super(I18NJSONField, self).__init__(*args, **kwargs) self.i18n_fields = i18n_fields def translate_values(self, d): diff --git a/taiga/base/management/commands/test_emails.py b/taiga/base/management/commands/test_emails.py index 631bcd42..f40dd7db 100644 --- a/taiga/base/management/commands/test_emails.py +++ b/taiga/base/management/commands/test_emails.py @@ -18,8 +18,6 @@ import datetime -from optparse import make_option - from django.apps import apps from django.contrib.auth import get_user_model from django.core.management.base import BaseCommand @@ -33,28 +31,27 @@ from taiga.projects.history.services import get_history_queryset_by_model_instan class Command(BaseCommand): - args = '' - option_list = BaseCommand.option_list + ( - make_option('--locale', '-l', default=None, dest='locale', - help='Send emails in an specific language.'), - ) - help = 'Send an example of all emails' - def handle(self, *args, **options): - if len(args) != 1: - print("Usage: ./manage.py test_emails ") - return + def add_arguments(self, parser): + parser.add_argument('--locale', '-l', + default=None, + dest='locale', + help='Send emails in an specific language.') + parser.add_argument('email', + help='Emeil address to send sample emails.') + + def handle(self, *args, **options): locale = options.get('locale') - test_email = args[0] + email_address = options.get('email') # Register email context = {"lang": locale, "user": get_user_model().objects.all().order_by("?").first(), "cancel_token": "cancel-token"} - email = mail_builder.registered_user(test_email, context) + email = mail_builder.registered_user(email_address, context) email.send() # Membership invitation @@ -63,13 +60,13 @@ class Command(BaseCommand): membership.invitation_extra_text = "Text example, Text example,\nText example,\n\nText example" context = {"lang": locale, "membership": membership} - email = mail_builder.membership_invitation(test_email, context) + email = mail_builder.membership_invitation(email_address, context) email.send() # Membership notification context = {"lang": locale, "membership": Membership.objects.order_by("?").filter(user__isnull=False).first()} - email = mail_builder.membership_notification(test_email, context) + email = mail_builder.membership_notification(email_address, context) email.send() # Feedback @@ -85,17 +82,17 @@ class Command(BaseCommand): "key2": "value2", }, } - email = mail_builder.feedback_notification(test_email, context) + email = mail_builder.feedback_notification(email_address, context) email.send() # Password recovery context = {"lang": locale, "user": get_user_model().objects.all().order_by("?").first()} - email = mail_builder.password_recovery(test_email, context) + email = mail_builder.password_recovery(email_address, context) email.send() # Change email context = {"lang": locale, "user": get_user_model().objects.all().order_by("?").first()} - email = mail_builder.change_email(test_email, context) + email = mail_builder.change_email(email_address, context) email.send() # Export/Import emails @@ -106,7 +103,7 @@ class Command(BaseCommand): "error_subject": "Error generating project dump", "error_message": "Error generating project dump", } - email = mail_builder.export_error(test_email, context) + email = mail_builder.export_error(email_address, context) email.send() context = { "lang": locale, @@ -114,7 +111,7 @@ class Command(BaseCommand): "error_subject": "Error importing project dump", "error_message": "Error importing project dump", } - email = mail_builder.import_error(test_email, context) + email = mail_builder.import_error(email_address, context) email.send() deletion_date = timezone.now() + datetime.timedelta(seconds=60*60*24) @@ -125,7 +122,7 @@ class Command(BaseCommand): "project": Project.objects.all().order_by("?").first(), "deletion_date": deletion_date, } - email = mail_builder.dump_project(test_email, context) + email = mail_builder.dump_project(email_address, context) email.send() context = { @@ -133,7 +130,7 @@ class Command(BaseCommand): "user": get_user_model().objects.all().order_by("?").first(), "project": Project.objects.all().order_by("?").first(), } - email = mail_builder.load_dump(test_email, context) + email = mail_builder.load_dump(email_address, context) email.send() # Notification emails @@ -187,7 +184,7 @@ class Command(BaseCommand): cls = type("InlineCSSTemplateMail", (InlineCSSTemplateMail,), {"name": notification_email[1]}) email = cls() - email.send(test_email, context) + email.send(email_address, context) # Transfer Emails @@ -195,7 +192,7 @@ class Command(BaseCommand): "project": Project.objects.all().order_by("?").first(), "requester": User.objects.all().order_by("?").first(), } - email = mail_builder.transfer_request(test_email, context) + email = mail_builder.transfer_request(email_address, context) email.send() context = { @@ -204,7 +201,7 @@ class Command(BaseCommand): "token": "test-token", "reason": "Test reason" } - email = mail_builder.transfer_start(test_email, context) + email = mail_builder.transfer_start(email_address, context) email.send() context = { @@ -213,7 +210,7 @@ class Command(BaseCommand): "new_owner": User.objects.all().order_by("?").first(), "reason": "Test reason" } - email = mail_builder.transfer_accept(test_email, context) + email = mail_builder.transfer_accept(email_address, context) email.send() context = { @@ -221,5 +218,5 @@ class Command(BaseCommand): "rejecter": User.objects.all().order_by("?").first(), "reason": "Test reason" } - email = mail_builder.transfer_reject(test_email, context) + email = mail_builder.transfer_reject(email_address, context) email.send() diff --git a/taiga/base/routers.py b/taiga/base/routers.py index a7ccbdc4..119375e9 100644 --- a/taiga/base/routers.py +++ b/taiga/base/routers.py @@ -20,7 +20,7 @@ import itertools from collections import namedtuple -from django.conf.urls import patterns, url +from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import NoReverseMatch @@ -79,7 +79,7 @@ class BaseRouter(object): @property def urls(self): if not hasattr(self, '_urls'): - self._urls = patterns('', *self.get_urls()) + self._urls = self.get_urls() return self._urls diff --git a/taiga/export_import/validators/fields.py b/taiga/export_import/validators/fields.py index e3d33c7a..e3644351 100644 --- a/taiga/export_import/validators/fields.py +++ b/taiga/export_import/validators/fields.py @@ -26,7 +26,7 @@ from django.contrib.contenttypes.models import ContentType from taiga.base.api import serializers from taiga.base.exceptions import ValidationError -from taiga.base.fields import JsonField +from taiga.base.fields import JSONField from taiga.mdrender.service import render as mdrender from taiga.users import models as users_models @@ -144,7 +144,7 @@ class ProjectRelatedField(serializers.RelatedField): raise ValidationError(_("{}=\"{}\" not found in this project".format(self.slug_field, data))) -class HistoryUserField(JsonField): +class HistoryUserField(JSONField): def from_native(self, data): if data is None: return {} @@ -162,7 +162,7 @@ class HistoryUserField(JsonField): return {"pk": pk, "name": data[1]} -class HistoryValuesField(JsonField): +class HistoryValuesField(JSONField): def from_native(self, data): if data is None: return [] @@ -171,7 +171,7 @@ class HistoryValuesField(JsonField): return data -class HistoryDiffField(JsonField): +class HistoryDiffField(JSONField): def from_native(self, data): if data is None: return [] diff --git a/taiga/export_import/validators/mixins.py b/taiga/export_import/validators/mixins.py index d07334b6..f43ea5b6 100644 --- a/taiga/export_import/validators/mixins.py +++ b/taiga/export_import/validators/mixins.py @@ -28,13 +28,13 @@ from taiga.projects.notifications import services as notifications_services from taiga.projects.history import services as history_service from .fields import (UserRelatedField, HistoryUserField, HistoryDiffField, - JsonField, HistoryValuesField, CommentField, FileField) + JSONField, HistoryValuesField, CommentField, FileField) class HistoryExportValidator(validators.ModelValidator): user = HistoryUserField() diff = HistoryDiffField(required=False) - snapshot = JsonField(required=False) + snapshot = JSONField(required=False) values = HistoryValuesField(required=False) comment = CommentField(required=False) delete_comment_date = serializers.DateTimeField(required=False) diff --git a/taiga/export_import/validators/validators.py b/taiga/export_import/validators/validators.py index c821b531..4aeb0e1a 100644 --- a/taiga/export_import/validators/validators.py +++ b/taiga/export_import/validators/validators.py @@ -20,7 +20,7 @@ from django.utils.translation import ugettext as _ from taiga.base.api import serializers from taiga.base.api import validators -from taiga.base.fields import JsonField, PgArrayField +from taiga.base.fields import JSONField, PgArrayField from taiga.base.exceptions import ValidationError from taiga.projects import models as projects_models @@ -133,7 +133,7 @@ class IssueCustomAttributeExportValidator(validators.ModelValidator): class BaseCustomAttributesValuesExportValidator(validators.ModelValidator): - attributes_values = JsonField(source="attributes_values", required=True) + attributes_values = JSONField(source="attributes_values", required=True) _custom_attribute_model = None _container_field = None @@ -378,7 +378,7 @@ class ProjectExportValidator(WatcheableObjectModelValidatorMixin): issue_statuses = IssueStatusExportValidator(many=True, required=False) priorities = PriorityExportValidator(many=True, required=False) severities = SeverityExportValidator(many=True, required=False) - tags_colors = JsonField(required=False) + tags_colors = JSONField(required=False) creation_template = serializers.SlugRelatedField(slug_field="slug", required=False) default_points = serializers.SlugRelatedField(slug_field="name", required=False) default_us_status = serializers.SlugRelatedField(slug_field="name", required=False) diff --git a/taiga/projects/custom_attributes/migrations/0002_issuecustomattributesvalues_taskcustomattributesvalues_userstorycustomattributesvalues.py b/taiga/projects/custom_attributes/migrations/0002_issuecustomattributesvalues_taskcustomattributesvalues_userstorycustomattributesvalues.py index 8c1848db..a6c5084e 100644 --- a/taiga/projects/custom_attributes/migrations/0002_issuecustomattributesvalues_taskcustomattributesvalues_userstorycustomattributesvalues.py +++ b/taiga/projects/custom_attributes/migrations/0002_issuecustomattributesvalues_taskcustomattributesvalues_userstorycustomattributesvalues.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -20,7 +20,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)), ('version', models.IntegerField(default=1, verbose_name='version')), - ('attributes_values', django_pgjson.fields.JsonField(default={}, verbose_name='attributes_values')), + ('attributes_values', taiga.base.db.models.fields.JSONField(default={}, verbose_name='attributes_values')), ('issue', models.OneToOneField(verbose_name='issue', to='issues.Issue', related_name='custom_attributes_values')), ], options={ @@ -36,7 +36,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)), ('version', models.IntegerField(default=1, verbose_name='version')), - ('attributes_values', django_pgjson.fields.JsonField(default={}, verbose_name='attributes_values')), + ('attributes_values', taiga.base.db.models.fields.JSONField(default={}, verbose_name='attributes_values')), ('task', models.OneToOneField(verbose_name='task', to='tasks.Task', related_name='custom_attributes_values')), ], options={ @@ -52,7 +52,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)), ('version', models.IntegerField(default=1, verbose_name='version')), - ('attributes_values', django_pgjson.fields.JsonField(default={}, verbose_name='attributes_values')), + ('attributes_values', taiga.base.db.models.fields.JSONField(default={}, verbose_name='attributes_values')), ('user_story', models.OneToOneField(verbose_name='user story', to='userstories.UserStory', related_name='custom_attributes_values')), ], options={ diff --git a/taiga/projects/custom_attributes/migrations/0005_auto_20150505_1639.py b/taiga/projects/custom_attributes/migrations/0005_auto_20150505_1639.py index 4fba06c5..4c6503e0 100644 --- a/taiga/projects/custom_attributes/migrations/0005_auto_20150505_1639.py +++ b/taiga/projects/custom_attributes/migrations/0005_auto_20150505_1639.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -15,19 +15,19 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='issuecustomattributesvalues', name='attributes_values', - field=django_pgjson.fields.JsonField(verbose_name='values', default={}), + field=taiga.base.db.models.fields.JSONField(verbose_name='values', default={}), preserve_default=True, ), migrations.AlterField( model_name='taskcustomattributesvalues', name='attributes_values', - field=django_pgjson.fields.JsonField(verbose_name='values', default={}), + field=taiga.base.db.models.fields.JSONField(verbose_name='values', default={}), preserve_default=True, ), migrations.AlterField( model_name='userstorycustomattributesvalues', name='attributes_values', - field=django_pgjson.fields.JsonField(verbose_name='values', default={}), + field=taiga.base.db.models.fields.JSONField(verbose_name='values', default={}), preserve_default=True, ), ] diff --git a/taiga/projects/custom_attributes/migrations/0009_auto_20160728_1002.py b/taiga/projects/custom_attributes/migrations/0009_auto_20160728_1002.py index 313e22fd..a5e84f6d 100644 --- a/taiga/projects/custom_attributes/migrations/0009_auto_20160728_1002.py +++ b/taiga/projects/custom_attributes/migrations/0009_auto_20160728_1002.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion import django.utils.timezone -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -55,7 +55,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('version', models.IntegerField(default=1, verbose_name='version')), - ('attributes_values', django_pgjson.fields.JsonField(default={}, verbose_name='values')), + ('attributes_values', taiga.base.db.models.fields.JSONField(default={}, verbose_name='values')), ('epic', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='custom_attributes_values', to='epics.Epic', verbose_name='epic')), ], options={ diff --git a/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py b/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py new file mode 100644 index 00000000..e9a17bcc --- /dev/null +++ b/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py @@ -0,0 +1,90 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2016-10-26 11:34 +from __future__ import unicode_literals + +from django.db import migrations +from django.contrib.postgres.fields import JSONField + +class Migration(migrations.Migration): + + dependencies = [ + ('custom_attributes', '0010_auto_20160928_0540'), + ] + + operations = [ + migrations.RunSQL( + """ + ALTER TABLE "{table_name}" + ALTER COLUMN "{column_name}" + TYPE jsonb + USING to_json("{column_name}"::text)::jsonb; + """.format( + table_name="custom_attributes_epiccustomattributesvalues", + column_name="attributes_values", + ), + reverse_sql=migrations.RunSQL.noop + ), + migrations.RunSQL( + """ + ALTER TABLE "{table_name}" + ALTER COLUMN "{column_name}" + TYPE jsonb + USING to_json("{column_name}"::text)::jsonb; + """.format( + table_name="custom_attributes_userstorycustomattributesvalues", + column_name="attributes_values", + ), + reverse_sql=migrations.RunSQL.noop + ), + migrations.RunSQL( + """ + ALTER TABLE "{table_name}" + ALTER COLUMN "{column_name}" + TYPE jsonb + USING to_json("{column_name}"::text)::jsonb; + """.format( + table_name="custom_attributes_taskcustomattributesvalues", + column_name="attributes_values", + ), + reverse_sql=migrations.RunSQL.noop + ), + migrations.RunSQL( + """ + ALTER TABLE "{table_name}" + ALTER COLUMN "{column_name}" + TYPE jsonb + USING to_json("{column_name}"::text)::jsonb; + """.format( + table_name="custom_attributes_issuecustomattributesvalues", + column_name="attributes_values", + ), + reverse_sql=migrations.RunSQL.noop + ), + + # Function: Remove a key in a json field + migrations.RunSQL( + """ + CREATE OR REPLACE FUNCTION "json_object_delete_keys"("json" jsonb, VARIADIC "keys_to_delete" text[]) + RETURNS jsonb + LANGUAGE sql + IMMUTABLE + STRICT + AS $function$ + SELECT COALESCE ((SELECT ('{' || string_agg(to_json("key") || ':' || "value", ',') || '}') + FROM jsonb_each("json") + WHERE "key" <> ALL ("keys_to_delete")), + '{}')::text::jsonb $function$; + """, + reverse_sql=""" + CREATE OR REPLACE FUNCTION "json_object_delete_keys"("json" json, VARIADIC "keys_to_delete" text[]) + RETURNS json + LANGUAGE sql + IMMUTABLE + STRICT + AS $function$ + SELECT COALESCE ((SELECT ('{' || string_agg(to_json("key") || ':' || "value", ',') || '}') + FROM json_each("json") + WHERE "key" <> ALL ("keys_to_delete")), + '{}')::json $function$;""" + ), + ] diff --git a/taiga/projects/custom_attributes/models.py b/taiga/projects/custom_attributes/models.py index 6467f97e..45269051 100644 --- a/taiga/projects/custom_attributes/models.py +++ b/taiga/projects/custom_attributes/models.py @@ -20,7 +20,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ from django.utils import timezone -from django_pgjson.fields import JsonField +from taiga.base.db.models.fields import JSONField from taiga.base.utils.time import timestamp_ms from taiga.projects.occ.mixins import OCCModelMixin @@ -92,7 +92,7 @@ class IssueCustomAttribute(AbstractCustomAttribute): ####################################################### class AbstractCustomAttributesValues(OCCModelMixin, models.Model): - attributes_values = JsonField(null=False, blank=False, default={}, verbose_name=_("values")) + attributes_values = JSONField(null=False, blank=False, default={}, verbose_name=_("values")) class Meta: abstract = True diff --git a/taiga/projects/custom_attributes/serializers.py b/taiga/projects/custom_attributes/serializers.py index 10e9c756..bf31792a 100644 --- a/taiga/projects/custom_attributes/serializers.py +++ b/taiga/projects/custom_attributes/serializers.py @@ -17,7 +17,7 @@ # along with this program. If not, see . -from taiga.base.fields import JsonField, Field +from taiga.base.fields import JSONField, Field from taiga.base.api import serializers diff --git a/taiga/projects/custom_attributes/validators.py b/taiga/projects/custom_attributes/validators.py index 4169eee6..98fd494b 100644 --- a/taiga/projects/custom_attributes/validators.py +++ b/taiga/projects/custom_attributes/validators.py @@ -19,7 +19,7 @@ from django.utils.translation import ugettext_lazy as _ -from taiga.base.fields import JsonField +from taiga.base.fields import JSONField from taiga.base.exceptions import ValidationError from taiga.base.api.validators import ModelValidator @@ -92,7 +92,7 @@ class IssueCustomAttributeValidator(BaseCustomAttributeValidator): class BaseCustomAttributesValuesValidator(ModelValidator): - attributes_values = JsonField(source="attributes_values", label="attributes values") + attributes_values = JSONField(source="attributes_values", label="attributes values") _custom_attribute_model = None _container_field = None diff --git a/taiga/projects/fixtures/initial_project_templates.json b/taiga/projects/fixtures/initial_project_templates.json index 6137792f..e4c92cd0 100644 --- a/taiga/projects/fixtures/initial_project_templates.json +++ b/taiga/projects/fixtures/initial_project_templates.json @@ -17,16 +17,554 @@ "is_issues_activated": true, "videoconferences": null, "videoconferences_extra_data": "", - "default_options": "{\"epic_status\": \"New\", \"issue_status\": \"New\", \"task_status\": \"New\", \"points\": \"?\", \"issue_type\": \"Bug\", \"severity\": \"Normal\", \"priority\": \"Normal\", \"us_status\": \"New\"}", - "epic_statuses": "[{\"is_closed\": false, \"name\": \"New\", \"color\": \"#999999\", \"slug\": \"new\", \"order\": 1}, {\"is_closed\": false, \"name\": \"Ready\", \"color\": \"#ff8a84\", \"slug\": \"ready\", \"order\": 2}, {\"is_closed\": false, \"name\": \"In progress\", \"color\": \"#ff9900\", \"slug\": \"in-progress\", \"order\": 3}, {\"is_closed\": false, \"name\": \"Ready for test\", \"color\": \"#fcc000\", \"slug\": \"ready-for-test\", \"order\": 4}, {\"is_closed\": true, \"name\": \"Done\", \"color\": \"#669900\", \"slug\": \"done\", \"order\": 5}]", - "us_statuses": "[{\"is_archived\": false, \"name\": \"New\", \"slug\": \"new\", \"order\": 1, \"color\": \"#999999\", \"wip_limit\": null, \"is_closed\": false}, {\"is_archived\": false, \"name\": \"Ready\", \"slug\": \"ready\", \"order\": 2, \"color\": \"#ff8a84\", \"wip_limit\": null, \"is_closed\": false}, {\"is_archived\": false, \"name\": \"In progress\", \"slug\": \"in-progress\", \"order\": 3, \"color\": \"#ff9900\", \"wip_limit\": null, \"is_closed\": false}, {\"is_archived\": false, \"name\": \"Ready for test\", \"slug\": \"ready-for-test\", \"order\": 4, \"color\": \"#fcc000\", \"wip_limit\": null, \"is_closed\": false}, {\"is_archived\": false, \"name\": \"Done\", \"slug\": \"done\", \"order\": 5, \"color\": \"#669900\", \"wip_limit\": null, \"is_closed\": true}, {\"is_archived\": true, \"name\": \"Archived\", \"slug\": \"archived\", \"order\": 6, \"color\": \"#5c3566\", \"wip_limit\": null, \"is_closed\": true}]", - "points": "[{\"value\": null, \"name\": \"?\", \"order\": 1}, {\"value\": 0.0, \"name\": \"0\", \"order\": 2}, {\"value\": 0.5, \"name\": \"1/2\", \"order\": 3}, {\"value\": 1.0, \"name\": \"1\", \"order\": 4}, {\"value\": 2.0, \"name\": \"2\", \"order\": 5}, {\"value\": 3.0, \"name\": \"3\", \"order\": 6}, {\"value\": 5.0, \"name\": \"5\", \"order\": 7}, {\"value\": 8.0, \"name\": \"8\", \"order\": 8}, {\"value\": 10.0, \"name\": \"10\", \"order\": 9}, {\"value\": 13.0, \"name\": \"13\", \"order\": 10}, {\"value\": 20.0, \"name\": \"20\", \"order\": 11}, {\"value\": 40.0, \"name\": \"40\", \"order\": 12}]", - "task_statuses": "[{\"is_closed\": false, \"name\": \"New\", \"color\": \"#999999\", \"slug\": \"new\", \"order\": 1}, {\"is_closed\": false, \"name\": \"In progress\", \"color\": \"#ff9900\", \"slug\": \"in-progress\", \"order\": 2}, {\"is_closed\": true, \"name\": \"Ready for test\", \"color\": \"#ffcc00\", \"slug\": \"ready-for-test\", \"order\": 3}, {\"is_closed\": true, \"name\": \"Closed\", \"color\": \"#669900\", \"slug\": \"closed\", \"order\": 4}, {\"is_closed\": false, \"name\": \"Needs Info\", \"color\": \"#999999\", \"slug\": \"needs-info\", \"order\": 5}]", - "issue_statuses": "[{\"is_closed\": false, \"name\": \"New\", \"color\": \"#8C2318\", \"slug\": \"new\", \"order\": 1}, {\"is_closed\": false, \"name\": \"In progress\", \"color\": \"#5E8C6A\", \"slug\": \"in-progress\", \"order\": 2}, {\"is_closed\": true, \"name\": \"Ready for test\", \"color\": \"#88A65E\", \"slug\": \"ready-for-test\", \"order\": 3}, {\"is_closed\": true, \"name\": \"Closed\", \"color\": \"#BFB35A\", \"slug\": \"closed\", \"order\": 4}, {\"is_closed\": false, \"name\": \"Needs Info\", \"color\": \"#89BAB4\", \"slug\": \"needs-info\", \"order\": 5}, {\"is_closed\": true, \"name\": \"Rejected\", \"color\": \"#CC0000\", \"slug\": \"rejected\", \"order\": 6}, {\"is_closed\": false, \"name\": \"Postponed\", \"color\": \"#666666\", \"slug\": \"posponed\", \"order\": 7}]", - "issue_types": "[{\"name\": \"Bug\", \"color\": \"#89BAB4\", \"order\": 1}, {\"name\": \"Question\", \"color\": \"#ba89a8\", \"order\": 2}, {\"name\": \"Enhancement\", \"color\": \"#89a8ba\", \"order\": 3}]", - "priorities": "[{\"name\": \"Low\", \"color\": \"#666666\", \"order\": 1}, {\"name\": \"Normal\", \"color\": \"#669933\", \"order\": 3}, {\"name\": \"High\", \"color\": \"#CC0000\", \"order\": 5}]", - "severities": "[{\"name\": \"Wishlist\", \"color\": \"#666666\", \"order\": 1}, {\"name\": \"Minor\", \"color\": \"#669933\", \"order\": 2}, {\"name\": \"Normal\", \"color\": \"#0000FF\", \"order\": 3}, {\"name\": \"Important\", \"color\": \"#FFA500\", \"order\": 4}, {\"name\": \"Critical\", \"color\": \"#CC0000\", \"order\": 5}]", - "roles": "[{\"name\": \"UX\", \"computable\": true, \"slug\": \"ux\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"add_milestone\", \"modify_milestone\", \"delete_milestone\", \"view_milestones\", \"view_project\", \"add_task\", \"modify_task\", \"delete_task\", \"view_tasks\", \"add_us\", \"modify_us\", \"delete_us\", \"view_us\", \"add_wiki_page\", \"modify_wiki_page\", \"delete_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"add_epic\", \"modify_epic\", \"delete_epic\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 10}, {\"name\": \"Design\", \"computable\": true, \"slug\": \"design\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"add_milestone\", \"modify_milestone\", \"delete_milestone\", \"view_milestones\", \"view_project\", \"add_task\", \"modify_task\", \"delete_task\", \"view_tasks\", \"add_us\", \"modify_us\", \"delete_us\", \"view_us\", \"add_wiki_page\", \"modify_wiki_page\", \"delete_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"add_epic\", \"modify_epic\", \"delete_epic\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 20}, {\"name\": \"Front\", \"computable\": true, \"slug\": \"front\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"add_milestone\", \"modify_milestone\", \"delete_milestone\", \"view_milestones\", \"view_project\", \"add_task\", \"modify_task\", \"delete_task\", \"view_tasks\", \"add_us\", \"modify_us\", \"delete_us\", \"view_us\", \"add_wiki_page\", \"modify_wiki_page\", \"delete_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"add_epic\", \"modify_epic\", \"delete_epic\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 30}, {\"name\": \"Back\", \"computable\": true, \"slug\": \"back\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"add_milestone\", \"modify_milestone\", \"delete_milestone\", \"view_milestones\", \"view_project\", \"add_task\", \"modify_task\", \"delete_task\", \"view_tasks\", \"add_us\", \"modify_us\", \"delete_us\", \"view_us\", \"add_wiki_page\", \"modify_wiki_page\", \"delete_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"add_epic\", \"modify_epic\", \"delete_epic\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 40}, {\"name\": \"Product Owner\", \"computable\": false, \"slug\": \"product-owner\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"add_milestone\", \"modify_milestone\", \"delete_milestone\", \"view_milestones\", \"view_project\", \"add_task\", \"modify_task\", \"delete_task\", \"view_tasks\", \"add_us\", \"modify_us\", \"delete_us\", \"view_us\", \"add_wiki_page\", \"modify_wiki_page\", \"delete_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"add_epic\", \"modify_epic\", \"delete_epic\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 50}, {\"name\": \"Stakeholder\", \"computable\": false, \"slug\": \"stakeholder\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"view_milestones\", \"view_project\", \"view_tasks\", \"view_us\", \"modify_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 60}]" + "default_options": { + "points": "?", + "priority": "Normal", + "us_status": "New", + "issue_type": "Bug", + "epic_status": "New", + "severity": "Normal", + "task_status": "New", + "issue_status": "New" + }, + "epic_statuses": [ + { + "slug": "new", + "color": "#999999", + "name": "New", + "order": 1, + "is_closed": false + }, + { + "slug": "ready", + "color": "#ff8a84", + "name": "Ready", + "order": 2, + "is_closed": false + }, + { + "slug": "in-progress", + "color": "#ff9900", + "name": "In progress", + "order": 3, + "is_closed": false + }, + { + "slug": "ready-for-test", + "color": "#fcc000", + "name": "Ready for test", + "order": 4, + "is_closed": false + }, + { + "slug": "done", + "color": "#669900", + "name": "Done", + "order": 5, + "is_closed": true + } + ], + "us_statuses": [ + { + "slug": "new", + "name": "New", + "order": 1, + "is_archived": false, + "color": "#999999", + "is_closed": false, + "wip_limit": null + }, + { + "slug": "ready", + "name": "Ready", + "order": 2, + "is_archived": false, + "color": "#ff8a84", + "is_closed": false, + "wip_limit": null + }, + { + "slug": "in-progress", + "name": "In progress", + "order": 3, + "is_archived": false, + "color": "#ff9900", + "is_closed": false, + "wip_limit": null + }, + { + "slug": "ready-for-test", + "name": "Ready for test", + "order": 4, + "is_archived": false, + "color": "#fcc000", + "is_closed": false, + "wip_limit": null + }, + { + "slug": "done", + "name": "Done", + "order": 5, + "is_archived": false, + "color": "#669900", + "is_closed": true, + "wip_limit": null + }, + { + "slug": "archived", + "name": "Archived", + "order": 6, + "is_archived": true, + "color": "#5c3566", + "is_closed": true, + "wip_limit": null + } + ], + "points": [ + { + "name": "?", + "order": 1, + "value": null + }, + { + "name": "0", + "order": 2, + "value": 0.0 + }, + { + "name": "1/2", + "order": 3, + "value": 0.5 + }, + { + "name": "1", + "order": 4, + "value": 1.0 + }, + { + "name": "2", + "order": 5, + "value": 2.0 + }, + { + "name": "3", + "order": 6, + "value": 3.0 + }, + { + "name": "5", + "order": 7, + "value": 5.0 + }, + { + "name": "8", + "order": 8, + "value": 8.0 + }, + { + "name": "10", + "order": 9, + "value": 10.0 + }, + { + "name": "13", + "order": 10, + "value": 13.0 + }, + { + "name": "20", + "order": 11, + "value": 20.0 + }, + { + "name": "40", + "order": 12, + "value": 40.0 + } + ], + "task_statuses": [ + { + "slug": "new", + "color": "#999999", + "name": "New", + "order": 1, + "is_closed": false + }, + { + "slug": "in-progress", + "color": "#ff9900", + "name": "In progress", + "order": 2, + "is_closed": false + }, + { + "slug": "ready-for-test", + "color": "#ffcc00", + "name": "Ready for test", + "order": 3, + "is_closed": true + }, + { + "slug": "closed", + "color": "#669900", + "name": "Closed", + "order": 4, + "is_closed": true + }, + { + "slug": "needs-info", + "color": "#999999", + "name": "Needs Info", + "order": 5, + "is_closed": false + } + ], + "issue_statuses": [ + { + "slug": "new", + "color": "#8C2318", + "name": "New", + "order": 1, + "is_closed": false + }, + { + "slug": "in-progress", + "color": "#5E8C6A", + "name": "In progress", + "order": 2, + "is_closed": false + }, + { + "slug": "ready-for-test", + "color": "#88A65E", + "name": "Ready for test", + "order": 3, + "is_closed": true + }, + { + "slug": "closed", + "color": "#BFB35A", + "name": "Closed", + "order": 4, + "is_closed": true + }, + { + "slug": "needs-info", + "color": "#89BAB4", + "name": "Needs Info", + "order": 5, + "is_closed": false + }, + { + "slug": "rejected", + "color": "#CC0000", + "name": "Rejected", + "order": 6, + "is_closed": true + }, + { + "slug": "posponed", + "color": "#666666", + "name": "Postponed", + "order": 7, + "is_closed": false + } + ], + "issue_types": [ + { + "color": "#89BAB4", + "name": "Bug", + "order": 1 + }, + { + "color": "#ba89a8", + "name": "Question", + "order": 2 + }, + { + "color": "#89a8ba", + "name": "Enhancement", + "order": 3 + } + ], + "priorities": [ + { + "color": "#666666", + "name": "Low", + "order": 1 + }, + { + "color": "#669933", + "name": "Normal", + "order": 3 + }, + { + "color": "#CC0000", + "name": "High", + "order": 5 + } + ], + "severities": [ + { + "color": "#666666", + "name": "Wishlist", + "order": 1 + }, + { + "color": "#669933", + "name": "Minor", + "order": 2 + }, + { + "color": "#0000FF", + "name": "Normal", + "order": 3 + }, + { + "color": "#FFA500", + "name": "Important", + "order": 4 + }, + { + "color": "#CC0000", + "name": "Critical", + "order": 5 + } + ], + "roles": [ + { + "slug": "ux", + "computable": true, + "name": "UX", + "order": 10, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "add_milestone", + "modify_milestone", + "delete_milestone", + "view_milestones", + "view_project", + "add_task", + "modify_task", + "delete_task", + "view_tasks", + "add_us", + "modify_us", + "delete_us", + "view_us", + "add_wiki_page", + "modify_wiki_page", + "delete_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "add_epic", + "modify_epic", + "delete_epic", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + }, + { + "slug": "design", + "computable": true, + "name": "Design", + "order": 20, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "add_milestone", + "modify_milestone", + "delete_milestone", + "view_milestones", + "view_project", + "add_task", + "modify_task", + "delete_task", + "view_tasks", + "add_us", + "modify_us", + "delete_us", + "view_us", + "add_wiki_page", + "modify_wiki_page", + "delete_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "add_epic", + "modify_epic", + "delete_epic", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + }, + { + "slug": "front", + "computable": true, + "name": "Front", + "order": 30, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "add_milestone", + "modify_milestone", + "delete_milestone", + "view_milestones", + "view_project", + "add_task", + "modify_task", + "delete_task", + "view_tasks", + "add_us", + "modify_us", + "delete_us", + "view_us", + "add_wiki_page", + "modify_wiki_page", + "delete_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "add_epic", + "modify_epic", + "delete_epic", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + }, + { + "slug": "back", + "computable": true, + "name": "Back", + "order": 40, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "add_milestone", + "modify_milestone", + "delete_milestone", + "view_milestones", + "view_project", + "add_task", + "modify_task", + "delete_task", + "view_tasks", + "add_us", + "modify_us", + "delete_us", + "view_us", + "add_wiki_page", + "modify_wiki_page", + "delete_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "add_epic", + "modify_epic", + "delete_epic", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + }, + { + "slug": "product-owner", + "computable": false, + "name": "Product Owner", + "order": 50, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "add_milestone", + "modify_milestone", + "delete_milestone", + "view_milestones", + "view_project", + "add_task", + "modify_task", + "delete_task", + "view_tasks", + "add_us", + "modify_us", + "delete_us", + "view_us", + "add_wiki_page", + "modify_wiki_page", + "delete_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "add_epic", + "modify_epic", + "delete_epic", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + }, + { + "slug": "stakeholder", + "computable": false, + "name": "Stakeholder", + "order": 60, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "view_milestones", + "view_project", + "view_tasks", + "view_us", + "modify_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + } + ] } }, { @@ -47,16 +585,554 @@ "is_issues_activated": false, "videoconferences": null, "videoconferences_extra_data": "", - "default_options": "{\"epic_status\": \"New\", \"issue_status\": \"New\", \"task_status\": \"New\", \"points\": \"?\", \"issue_type\": \"Bug\", \"severity\": \"Normal\", \"priority\": \"Normal\", \"us_status\": \"New\"}", - "epic_statuses": "[{\"is_closed\": false, \"name\": \"New\", \"color\": \"#999999\", \"slug\": \"new\", \"order\": 1}, {\"is_closed\": false, \"name\": \"Ready\", \"color\": \"#ff8a84\", \"slug\": \"ready\", \"order\": 2}, {\"is_closed\": false, \"name\": \"In progress\", \"color\": \"#ff9900\", \"slug\": \"in-progress\", \"order\": 3}, {\"is_closed\": false, \"name\": \"Ready for test\", \"color\": \"#fcc000\", \"slug\": \"ready-for-test\", \"order\": 4}, {\"is_closed\": true, \"name\": \"Done\", \"color\": \"#669900\", \"slug\": \"done\", \"order\": 5}]", - "us_statuses": "[{\"is_archived\": false, \"name\": \"New\", \"slug\": \"new\", \"order\": 1, \"color\": \"#999999\", \"wip_limit\": null, \"is_closed\": false}, {\"is_archived\": false, \"name\": \"Ready\", \"slug\": \"ready\", \"order\": 2, \"color\": \"#f57900\", \"wip_limit\": null, \"is_closed\": false}, {\"is_archived\": false, \"name\": \"In progress\", \"slug\": \"in-progress\", \"order\": 3, \"color\": \"#729fcf\", \"wip_limit\": null, \"is_closed\": false}, {\"is_archived\": false, \"name\": \"Ready for test\", \"slug\": \"ready-for-test\", \"order\": 4, \"color\": \"#4e9a06\", \"wip_limit\": null, \"is_closed\": false}, {\"is_archived\": false, \"name\": \"Done\", \"slug\": \"done\", \"order\": 5, \"color\": \"#cc0000\", \"wip_limit\": null, \"is_closed\": true}, {\"is_archived\": true, \"name\": \"Archived\", \"slug\": \"archived\", \"order\": 6, \"color\": \"#5c3566\", \"wip_limit\": null, \"is_closed\": true}]", - "points": "[{\"value\": null, \"name\": \"?\", \"order\": 1}, {\"value\": 0.0, \"name\": \"0\", \"order\": 2}, {\"value\": 0.5, \"name\": \"1/2\", \"order\": 3}, {\"value\": 1.0, \"name\": \"1\", \"order\": 4}, {\"value\": 2.0, \"name\": \"2\", \"order\": 5}, {\"value\": 3.0, \"name\": \"3\", \"order\": 6}, {\"value\": 5.0, \"name\": \"5\", \"order\": 7}, {\"value\": 8.0, \"name\": \"8\", \"order\": 8}, {\"value\": 10.0, \"name\": \"10\", \"order\": 9}, {\"value\": 13.0, \"name\": \"13\", \"order\": 10}, {\"value\": 20.0, \"name\": \"20\", \"order\": 11}, {\"value\": 40.0, \"name\": \"40\", \"order\": 12}]", - "task_statuses": "[{\"is_closed\": false, \"name\": \"New\", \"color\": \"#999999\", \"slug\": \"new\", \"order\": 1}, {\"is_closed\": false, \"name\": \"In progress\", \"color\": \"#729fcf\", \"slug\": \"in-progress\", \"order\": 2}, {\"is_closed\": true, \"name\": \"Ready for test\", \"color\": \"#f57900\", \"slug\": \"ready-for-test\", \"order\": 3}, {\"is_closed\": true, \"name\": \"Closed\", \"color\": \"#4e9a06\", \"slug\": \"closed\", \"order\": 4}, {\"is_closed\": false, \"name\": \"Needs Info\", \"color\": \"#cc0000\", \"slug\": \"needs-info\", \"order\": 5}]", - "issue_statuses": "[{\"is_closed\": false, \"name\": \"New\", \"color\": \"#999999\", \"slug\": \"new\", \"order\": 1}, {\"is_closed\": false, \"name\": \"In progress\", \"color\": \"#729fcf\", \"slug\": \"in-progress\", \"order\": 2}, {\"is_closed\": true, \"name\": \"Ready for test\", \"color\": \"#f57900\", \"slug\": \"ready-for-test\", \"order\": 3}, {\"is_closed\": true, \"name\": \"Closed\", \"color\": \"#4e9a06\", \"slug\": \"closed\", \"order\": 4}, {\"is_closed\": false, \"name\": \"Needs Info\", \"color\": \"#cc0000\", \"slug\": \"needs-info\", \"order\": 5}, {\"is_closed\": true, \"name\": \"Rejected\", \"color\": \"#d3d7cf\", \"slug\": \"rejected\", \"order\": 6}, {\"is_closed\": false, \"name\": \"Postponed\", \"color\": \"#75507b\", \"slug\": \"posponed\", \"order\": 7}]", - "issue_types": "[{\"name\": \"Bug\", \"color\": \"#cc0000\", \"order\": 1}, {\"name\": \"Question\", \"color\": \"#729fcf\", \"order\": 2}, {\"name\": \"Enhancement\", \"color\": \"#4e9a06\", \"order\": 3}]", - "priorities": "[{\"name\": \"Low\", \"color\": \"#999999\", \"order\": 1}, {\"name\": \"Normal\", \"color\": \"#4e9a06\", \"order\": 3}, {\"name\": \"High\", \"color\": \"#CC0000\", \"order\": 5}]", - "severities": "[{\"name\": \"Wishlist\", \"color\": \"#999999\", \"order\": 1}, {\"name\": \"Minor\", \"color\": \"#729fcf\", \"order\": 2}, {\"name\": \"Normal\", \"color\": \"#4e9a06\", \"order\": 3}, {\"name\": \"Important\", \"color\": \"#f57900\", \"order\": 4}, {\"name\": \"Critical\", \"color\": \"#CC0000\", \"order\": 5}]", - "roles": "[{\"name\": \"UX\", \"computable\": true, \"slug\": \"ux\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"add_milestone\", \"modify_milestone\", \"delete_milestone\", \"view_milestones\", \"view_project\", \"add_task\", \"modify_task\", \"delete_task\", \"view_tasks\", \"add_us\", \"modify_us\", \"delete_us\", \"view_us\", \"add_wiki_page\", \"modify_wiki_page\", \"delete_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"add_epic\", \"modify_epic\", \"delete_epic\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 10}, {\"name\": \"Design\", \"computable\": true, \"slug\": \"design\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"add_milestone\", \"modify_milestone\", \"delete_milestone\", \"view_milestones\", \"view_project\", \"add_task\", \"modify_task\", \"delete_task\", \"view_tasks\", \"add_us\", \"modify_us\", \"delete_us\", \"view_us\", \"add_wiki_page\", \"modify_wiki_page\", \"delete_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"add_epic\", \"modify_epic\", \"delete_epic\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 20}, {\"name\": \"Front\", \"computable\": true, \"slug\": \"front\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"add_milestone\", \"modify_milestone\", \"delete_milestone\", \"view_milestones\", \"view_project\", \"add_task\", \"modify_task\", \"delete_task\", \"view_tasks\", \"add_us\", \"modify_us\", \"delete_us\", \"view_us\", \"add_wiki_page\", \"modify_wiki_page\", \"delete_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"add_epic\", \"modify_epic\", \"delete_epic\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 30}, {\"name\": \"Back\", \"computable\": true, \"slug\": \"back\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"add_milestone\", \"modify_milestone\", \"delete_milestone\", \"view_milestones\", \"view_project\", \"add_task\", \"modify_task\", \"delete_task\", \"view_tasks\", \"add_us\", \"modify_us\", \"delete_us\", \"view_us\", \"add_wiki_page\", \"modify_wiki_page\", \"delete_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"add_epic\", \"modify_epic\", \"delete_epic\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 40}, {\"name\": \"Product Owner\", \"computable\": false, \"slug\": \"product-owner\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"add_milestone\", \"modify_milestone\", \"delete_milestone\", \"view_milestones\", \"view_project\", \"add_task\", \"modify_task\", \"delete_task\", \"view_tasks\", \"add_us\", \"modify_us\", \"delete_us\", \"view_us\", \"add_wiki_page\", \"modify_wiki_page\", \"delete_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"add_epic\", \"modify_epic\", \"delete_epic\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 50}, {\"name\": \"Stakeholder\", \"computable\": false, \"slug\": \"stakeholder\", \"permissions\": [\"add_issue\", \"modify_issue\", \"delete_issue\", \"view_issues\", \"view_milestones\", \"view_project\", \"view_tasks\", \"view_us\", \"modify_wiki_page\", \"view_wiki_pages\", \"add_wiki_link\", \"delete_wiki_link\", \"view_wiki_links\", \"view_epics\", \"comment_epic\", \"comment_us\", \"comment_task\", \"comment_issue\", \"comment_wiki_page\"], \"order\": 60}]" + "default_options": { + "points": "?", + "priority": "Normal", + "us_status": "New", + "issue_type": "Bug", + "epic_status": "New", + "severity": "Normal", + "task_status": "New", + "issue_status": "New" + }, + "epic_statuses": [ + { + "slug": "new", + "color": "#999999", + "name": "New", + "order": 1, + "is_closed": false + }, + { + "slug": "ready", + "color": "#ff8a84", + "name": "Ready", + "order": 2, + "is_closed": false + }, + { + "slug": "in-progress", + "color": "#ff9900", + "name": "In progress", + "order": 3, + "is_closed": false + }, + { + "slug": "ready-for-test", + "color": "#fcc000", + "name": "Ready for test", + "order": 4, + "is_closed": false + }, + { + "slug": "done", + "color": "#669900", + "name": "Done", + "order": 5, + "is_closed": true + } + ], + "us_statuses": [ + { + "slug": "new", + "name": "New", + "order": 1, + "is_archived": false, + "color": "#999999", + "is_closed": false, + "wip_limit": null + }, + { + "slug": "ready", + "name": "Ready", + "order": 2, + "is_archived": false, + "color": "#f57900", + "is_closed": false, + "wip_limit": null + }, + { + "slug": "in-progress", + "name": "In progress", + "order": 3, + "is_archived": false, + "color": "#729fcf", + "is_closed": false, + "wip_limit": null + }, + { + "slug": "ready-for-test", + "name": "Ready for test", + "order": 4, + "is_archived": false, + "color": "#4e9a06", + "is_closed": false, + "wip_limit": null + }, + { + "slug": "done", + "name": "Done", + "order": 5, + "is_archived": false, + "color": "#cc0000", + "is_closed": true, + "wip_limit": null + }, + { + "slug": "archived", + "name": "Archived", + "order": 6, + "is_archived": true, + "color": "#5c3566", + "is_closed": true, + "wip_limit": null + } + ], + "points": [ + { + "name": "?", + "order": 1, + "value": null + }, + { + "name": "0", + "order": 2, + "value": 0.0 + }, + { + "name": "1/2", + "order": 3, + "value": 0.5 + }, + { + "name": "1", + "order": 4, + "value": 1.0 + }, + { + "name": "2", + "order": 5, + "value": 2.0 + }, + { + "name": "3", + "order": 6, + "value": 3.0 + }, + { + "name": "5", + "order": 7, + "value": 5.0 + }, + { + "name": "8", + "order": 8, + "value": 8.0 + }, + { + "name": "10", + "order": 9, + "value": 10.0 + }, + { + "name": "13", + "order": 10, + "value": 13.0 + }, + { + "name": "20", + "order": 11, + "value": 20.0 + }, + { + "name": "40", + "order": 12, + "value": 40.0 + } + ], + "task_statuses": [ + { + "slug": "new", + "color": "#999999", + "name": "New", + "order": 1, + "is_closed": false + }, + { + "slug": "in-progress", + "color": "#729fcf", + "name": "In progress", + "order": 2, + "is_closed": false + }, + { + "slug": "ready-for-test", + "color": "#f57900", + "name": "Ready for test", + "order": 3, + "is_closed": true + }, + { + "slug": "closed", + "color": "#4e9a06", + "name": "Closed", + "order": 4, + "is_closed": true + }, + { + "slug": "needs-info", + "color": "#cc0000", + "name": "Needs Info", + "order": 5, + "is_closed": false + } + ], + "issue_statuses": [ + { + "slug": "new", + "color": "#999999", + "name": "New", + "order": 1, + "is_closed": false + }, + { + "slug": "in-progress", + "color": "#729fcf", + "name": "In progress", + "order": 2, + "is_closed": false + }, + { + "slug": "ready-for-test", + "color": "#f57900", + "name": "Ready for test", + "order": 3, + "is_closed": true + }, + { + "slug": "closed", + "color": "#4e9a06", + "name": "Closed", + "order": 4, + "is_closed": true + }, + { + "slug": "needs-info", + "color": "#cc0000", + "name": "Needs Info", + "order": 5, + "is_closed": false + }, + { + "slug": "rejected", + "color": "#d3d7cf", + "name": "Rejected", + "order": 6, + "is_closed": true + }, + { + "slug": "posponed", + "color": "#75507b", + "name": "Postponed", + "order": 7, + "is_closed": false + } + ], + "issue_types": [ + { + "color": "#cc0000", + "name": "Bug", + "order": 1 + }, + { + "color": "#729fcf", + "name": "Question", + "order": 2 + }, + { + "color": "#4e9a06", + "name": "Enhancement", + "order": 3 + } + ], + "priorities": [ + { + "color": "#999999", + "name": "Low", + "order": 1 + }, + { + "color": "#4e9a06", + "name": "Normal", + "order": 3 + }, + { + "color": "#CC0000", + "name": "High", + "order": 5 + } + ], + "severities": [ + { + "color": "#999999", + "name": "Wishlist", + "order": 1 + }, + { + "color": "#729fcf", + "name": "Minor", + "order": 2 + }, + { + "color": "#4e9a06", + "name": "Normal", + "order": 3 + }, + { + "color": "#f57900", + "name": "Important", + "order": 4 + }, + { + "color": "#CC0000", + "name": "Critical", + "order": 5 + } + ], + "roles": [ + { + "slug": "ux", + "computable": true, + "name": "UX", + "order": 10, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "add_milestone", + "modify_milestone", + "delete_milestone", + "view_milestones", + "view_project", + "add_task", + "modify_task", + "delete_task", + "view_tasks", + "add_us", + "modify_us", + "delete_us", + "view_us", + "add_wiki_page", + "modify_wiki_page", + "delete_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "add_epic", + "modify_epic", + "delete_epic", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + }, + { + "slug": "design", + "computable": true, + "name": "Design", + "order": 20, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "add_milestone", + "modify_milestone", + "delete_milestone", + "view_milestones", + "view_project", + "add_task", + "modify_task", + "delete_task", + "view_tasks", + "add_us", + "modify_us", + "delete_us", + "view_us", + "add_wiki_page", + "modify_wiki_page", + "delete_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "add_epic", + "modify_epic", + "delete_epic", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + }, + { + "slug": "front", + "computable": true, + "name": "Front", + "order": 30, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "add_milestone", + "modify_milestone", + "delete_milestone", + "view_milestones", + "view_project", + "add_task", + "modify_task", + "delete_task", + "view_tasks", + "add_us", + "modify_us", + "delete_us", + "view_us", + "add_wiki_page", + "modify_wiki_page", + "delete_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "add_epic", + "modify_epic", + "delete_epic", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + }, + { + "slug": "back", + "computable": true, + "name": "Back", + "order": 40, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "add_milestone", + "modify_milestone", + "delete_milestone", + "view_milestones", + "view_project", + "add_task", + "modify_task", + "delete_task", + "view_tasks", + "add_us", + "modify_us", + "delete_us", + "view_us", + "add_wiki_page", + "modify_wiki_page", + "delete_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "add_epic", + "modify_epic", + "delete_epic", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + }, + { + "slug": "product-owner", + "computable": false, + "name": "Product Owner", + "order": 50, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "add_milestone", + "modify_milestone", + "delete_milestone", + "view_milestones", + "view_project", + "add_task", + "modify_task", + "delete_task", + "view_tasks", + "add_us", + "modify_us", + "delete_us", + "view_us", + "add_wiki_page", + "modify_wiki_page", + "delete_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "add_epic", + "modify_epic", + "delete_epic", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + }, + { + "slug": "stakeholder", + "computable": false, + "name": "Stakeholder", + "order": 60, + "permissions": [ + "add_issue", + "modify_issue", + "delete_issue", + "view_issues", + "view_milestones", + "view_project", + "view_tasks", + "view_us", + "modify_wiki_page", + "view_wiki_pages", + "add_wiki_link", + "delete_wiki_link", + "view_wiki_links", + "view_epics", + "comment_epic", + "comment_us", + "comment_task", + "comment_issue", + "comment_wiki_page" + ] + } + ] } } ] diff --git a/taiga/projects/history/migrations/0001_initial.py b/taiga/projects/history/migrations/0001_initial.py index 053149d7..5113e110 100644 --- a/taiga/projects/history/migrations/0001_initial.py +++ b/taiga/projects/history/migrations/0001_initial.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.db import models, migrations import taiga.projects.history.models import django.utils.timezone -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -17,14 +17,14 @@ class Migration(migrations.Migration): name='HistoryEntry', fields=[ ('id', models.CharField(primary_key=True, unique=True, max_length=255, serialize=False, default=taiga.projects.history.models._generate_uuid, editable=False)), - ('user', django_pgjson.fields.JsonField(default=None, blank=True, null=True)), + ('user', taiga.base.db.models.fields.JSONField(default=None, blank=True, null=True)), ('created_at', models.DateTimeField(default=django.utils.timezone.now)), ('type', models.SmallIntegerField(choices=[(1, 'Change'), (2, 'Create'), (3, 'Delete')])), ('is_snapshot', models.BooleanField(default=False)), ('key', models.CharField(max_length=255, default=None, blank=True, null=True)), - ('diff', django_pgjson.fields.JsonField(default=None, null=True)), - ('snapshot', django_pgjson.fields.JsonField(default=None, null=True)), - ('values', django_pgjson.fields.JsonField(default=None, null=True)), + ('diff', taiga.base.db.models.fields.JSONField(default=None, null=True)), + ('snapshot', taiga.base.db.models.fields.JSONField(default=None, null=True)), + ('values', taiga.base.db.models.fields.JSONField(default=None, null=True)), ('comment', models.TextField(blank=True)), ('comment_html', models.TextField(blank=True)), ], diff --git a/taiga/projects/history/migrations/0003_auto_20140917_1405.py b/taiga/projects/history/migrations/0003_auto_20140917_1405.py index bb4378fa..13d22518 100644 --- a/taiga/projects/history/migrations/0003_auto_20140917_1405.py +++ b/taiga/projects/history/migrations/0003_auto_20140917_1405.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import models, migrations from django.conf import settings -import django_pgjson.fields +import taiga.base.db.models.fields def change_fk_with_tuple_pk_and_name(apps, schema_editor): HistoryEntry = apps.get_model("history", "HistoryEntry") @@ -31,7 +31,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='historyentry', name='delete_comment_user', - field=django_pgjson.fields.JsonField(null=True, blank=True, default=None), + field=taiga.base.db.models.fields.JSONField(null=True, blank=True, default=None), preserve_default=True, ), diff --git a/taiga/projects/history/migrations/0006_fix_json_field_not_null.py b/taiga/projects/history/migrations/0006_fix_json_field_not_null.py index 8c8ae187..a72d1cce 100644 --- a/taiga/projects/history/migrations/0006_fix_json_field_not_null.py +++ b/taiga/projects/history/migrations/0006_fix_json_field_not_null.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django_pgjson.fields import JsonField +from taiga.base.db.models.fields import JSONField from django.db import models, migrations diff --git a/taiga/projects/history/migrations/0008_auto_20150508_1028.py b/taiga/projects/history/migrations/0008_auto_20150508_1028.py index bf82d6b3..5b4b07fa 100644 --- a/taiga/projects/history/migrations/0008_auto_20150508_1028.py +++ b/taiga/projects/history/migrations/0008_auto_20150508_1028.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -15,19 +15,19 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='historyentry', name='diff', - field=django_pgjson.fields.JsonField(null=True, default=None, blank=True), + field=taiga.base.db.models.fields.JSONField(null=True, default=None, blank=True), preserve_default=True, ), migrations.AlterField( model_name='historyentry', name='snapshot', - field=django_pgjson.fields.JsonField(null=True, default=None, blank=True), + field=taiga.base.db.models.fields.JSONField(null=True, default=None, blank=True), preserve_default=True, ), migrations.AlterField( model_name='historyentry', name='values', - field=django_pgjson.fields.JsonField(null=True, default=None, blank=True), + field=taiga.base.db.models.fields.JSONField(null=True, default=None, blank=True), preserve_default=True, ), ] diff --git a/taiga/projects/history/migrations/0009_auto_20160512_1110.py b/taiga/projects/history/migrations/0009_auto_20160512_1110.py index 0cf39023..0e293806 100644 --- a/taiga/projects/history/migrations/0009_auto_20160512_1110.py +++ b/taiga/projects/history/migrations/0009_auto_20160512_1110.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations, models -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -16,7 +16,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='historyentry', name='comment_versions', - field=django_pgjson.fields.JsonField(blank=True, default=None, null=True), + field=taiga.base.db.models.fields.JSONField(blank=True, default=None, null=True), ), migrations.AddField( model_name='historyentry', diff --git a/taiga/projects/history/migrations/0013_historyentry_values_diff_cache.py b/taiga/projects/history/migrations/0013_historyentry_values_diff_cache.py index 1fe73a96..625d2343 100644 --- a/taiga/projects/history/migrations/0013_historyentry_values_diff_cache.py +++ b/taiga/projects/history/migrations/0013_historyentry_values_diff_cache.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='historyentry', name='values_diff_cache', - field=django_pgjson.fields.JsonField(blank=True, default=None, null=True), + field=taiga.base.db.models.fields.JSONField(blank=True, default=None, null=True), ), ] diff --git a/taiga/projects/history/migrations/0014_json_to_jsonb.py b/taiga/projects/history/migrations/0014_json_to_jsonb.py new file mode 100644 index 00000000..7906f0ac --- /dev/null +++ b/taiga/projects/history/migrations/0014_json_to_jsonb.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2016-10-26 11:34 +from __future__ import unicode_literals + +from django.db import migrations +from django.contrib.postgres.fields import JSONField + + +class Migration(migrations.Migration): + + dependencies = [ + ('history', '0013_historyentry_values_diff_cache'), + ] + + operations = [ + migrations.RunSQL( + """ + ALTER TABLE "history_historyentry" + ALTER COLUMN "delete_comment_user" TYPE jsonb USING to_json("delete_comment_user"::text)::jsonb, + ALTER COLUMN "comment_versions" TYPE jsonb USING to_json("comment_versions"::text)::jsonb, + ALTER COLUMN "values_diff_cache" TYPE jsonb USING to_json("values_diff_cache"::text)::jsonb, + ALTER COLUMN "user" TYPE jsonb USING to_json("user"::text)::jsonb, + ALTER COLUMN "diff" TYPE jsonb USING to_json("diff"::text)::jsonb, + ALTER COLUMN "snapshot" TYPE jsonb USING to_json("snapshot"::text)::jsonb, + ALTER COLUMN "values" TYPE jsonb USING to_json("values"::text)::jsonb; + """, + reverse_sql=migrations.RunSQL.noop + ), + ] diff --git a/taiga/projects/history/models.py b/taiga/projects/history/models.py index c4155eee..9f60b0ab 100644 --- a/taiga/projects/history/models.py +++ b/taiga/projects/history/models.py @@ -22,7 +22,7 @@ from django.utils import timezone from django.db import models from django.contrib.auth import get_user_model from django.utils.functional import cached_property -from django_pgjson.fields import JsonField +from taiga.base.db.models.fields import JSONField from taiga.mdrender.service import get_diff_of_htmls @@ -52,32 +52,32 @@ class HistoryEntry(models.Model): editable=False, default=_generate_uuid) project = models.ForeignKey("projects.Project") - user = JsonField(null=True, blank=True, default=None) + user = JSONField(null=True, blank=True, default=None) created_at = models.DateTimeField(default=timezone.now) type = models.SmallIntegerField(choices=HISTORY_TYPE_CHOICES) key = models.CharField(max_length=255, null=True, default=None, blank=True, db_index=True) # Stores the last diff - diff = JsonField(null=True, blank=True, default=None) + diff = JSONField(null=True, blank=True, default=None) # Stores the values_diff cache - values_diff_cache = JsonField(null=True, blank=True, default=None) + values_diff_cache = JSONField(null=True, blank=True, default=None) # Stores the last complete frozen object snapshot - snapshot = JsonField(null=True, blank=True, default=None) + snapshot = JSONField(null=True, blank=True, default=None) # Stores a values of all identifiers used in - values = JsonField(null=True, blank=True, default=None) + values = JSONField(null=True, blank=True, default=None) # Stores a comment comment = models.TextField(blank=True) comment_html = models.TextField(blank=True) delete_comment_date = models.DateTimeField(null=True, blank=True, default=None) - delete_comment_user = JsonField(null=True, blank=True, default=None) + delete_comment_user = JSONField(null=True, blank=True, default=None) # Historic version of comments - comment_versions = JsonField(null=True, blank=True, default=None) + comment_versions = JSONField(null=True, blank=True, default=None) edit_comment_date = models.DateTimeField(null=True, blank=True, default=None) # Flag for mark some history entries as diff --git a/taiga/projects/history/serializers.py b/taiga/projects/history/serializers.py index 0f2dc658..3bacd6dd 100644 --- a/taiga/projects/history/serializers.py +++ b/taiga/projects/history/serializers.py @@ -17,7 +17,7 @@ # along with this program. If not, see . from taiga.base.api import serializers -from taiga.base.fields import I18NJsonField, Field, MethodField +from taiga.base.fields import I18NJSONField, Field, MethodField from taiga.users.services import get_user_photo_url from taiga.users.gravatar import get_user_gravatar_id @@ -35,8 +35,8 @@ class HistoryEntrySerializer(serializers.LightSerializer): diff = Field() snapshot = Field() values = Field() - values_diff = I18NJsonField() - comment = I18NJsonField() + values_diff = I18NJSONField() + comment = I18NJSONField() comment_html = Field() delete_comment_date = Field() delete_comment_user = Field() diff --git a/taiga/projects/issues/migrations/0001_initial.py b/taiga/projects/issues/migrations/0001_initial.py index ba8814ff..afb9cca2 100644 --- a/taiga/projects/issues/migrations/0001_initial.py +++ b/taiga/projects/issues/migrations/0001_initial.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.db import models, migrations from django.conf import settings import django.utils.timezone -import djorm_pgarray.fields +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -20,7 +20,7 @@ class Migration(migrations.Migration): name='Issue', fields=[ ('id', models.AutoField(auto_created=True, serialize=False, verbose_name='ID', primary_key=True)), - ('tags', djorm_pgarray.fields.TextArrayField(dbtype='text', verbose_name='tags')), + ('tags', django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), blank=True, default=[], null=True, size=None, verbose_name='tags')), ('version', models.IntegerField(default=1, verbose_name='version')), ('is_blocked', models.BooleanField(default=False, verbose_name='is blocked')), ('blocked_note', models.TextField(blank=True, default='', verbose_name='blocked note')), diff --git a/taiga/projects/issues/migrations/0002_issue_external_reference.py b/taiga/projects/issues/migrations/0002_issue_external_reference.py index e88ddab2..60b8845c 100644 --- a/taiga/projects/issues/migrations/0002_issue_external_reference.py +++ b/taiga/projects/issues/migrations/0002_issue_external_reference.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='issue', name='external_reference', - field=djorm_pgarray.fields.TextArrayField(dbtype='text', verbose_name='external reference'), + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(blank=False, null=False), blank=True, default=None, null=True, size=None, verbose_name='external reference'), preserve_default=True, ), ] diff --git a/taiga/projects/migrations/0001_initial.py b/taiga/projects/migrations/0001_initial.py index 5a64c370..deee3a62 100644 --- a/taiga/projects/migrations/0001_initial.py +++ b/taiga/projects/migrations/0001_initial.py @@ -3,10 +3,9 @@ from __future__ import unicode_literals from django.db import models, migrations from django.conf import settings -import django_pgjson.fields +import django.contrib.postgres.fields import django.utils.timezone import django.db.models.deletion -import djorm_pgarray.fields import taiga.projects.history.models @@ -40,7 +39,7 @@ class Migration(migrations.Migration): name='Project', fields=[ ('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')), - ('tags', djorm_pgarray.fields.TextArrayField(dbtype='text', verbose_name='tags')), + ('tags', django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), blank=True, default=[], null=True, size=None, verbose_name='tags')), ('name', models.CharField(max_length=250, unique=True, verbose_name='name')), ('slug', models.SlugField(max_length=250, unique=True, verbose_name='slug', blank=True)), ('description', models.TextField(verbose_name='description')), @@ -54,10 +53,10 @@ class Migration(migrations.Migration): ('is_issues_activated', models.BooleanField(default=True, verbose_name='active issues panel')), ('videoconferences', models.CharField(max_length=250, null=True, choices=[('appear-in', 'AppearIn'), ('talky', 'Talky')], verbose_name='videoconference system', blank=True)), ('videoconferences_salt', models.CharField(max_length=250, null=True, verbose_name='videoconference room salt', blank=True)), - ('anon_permissions', djorm_pgarray.fields.TextArrayField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('view_us', 'View user stories'), ('view_tasks', 'View tasks'), ('view_issues', 'View issues'), ('view_wiki_pages', 'View wiki pages'), ('view_wiki_links', 'View wiki links')], dbtype='text', default=[], verbose_name='anonymous permissions')), - ('public_permissions', djorm_pgarray.fields.TextArrayField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('view_us', 'View user stories'), ('view_issues', 'View issues'), ('vote_issues', 'Vote issues'), ('view_tasks', 'View tasks'), ('view_wiki_pages', 'View wiki pages'), ('view_wiki_links', 'View wiki links'), ('request_membership', 'Request membership'), ('add_us_to_project', 'Add user story to project'), ('add_comments_to_us', 'Add comments to user stories'), ('add_comments_to_task', 'Add comments to tasks'), ('add_issue', 'Add issues'), ('add_comments_issue', 'Add comments to issues'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link')], dbtype='text', default=[], verbose_name='user permissions')), + ('anon_permissions', django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('view_us', 'View user stories'), ('view_tasks', 'View tasks'), ('view_issues', 'View issues'), ('view_wiki_pages', 'View wiki pages'), ('view_wiki_links', 'View wiki links')]), blank=True, default=[], null=True, size=None, verbose_name='anonymous permissions')), + ('public_permissions', django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('view_us', 'View user stories'), ('view_issues', 'View issues'), ('vote_issues', 'Vote issues'), ('view_tasks', 'View tasks'), ('view_wiki_pages', 'View wiki pages'), ('view_wiki_links', 'View wiki links'), ('request_membership', 'Request membership'), ('add_us_to_project', 'Add user story to project'), ('add_comments_to_us', 'Add comments to user stories'), ('add_comments_to_task', 'Add comments to tasks'), ('add_issue', 'Add issues'), ('add_comments_issue', 'Add comments to issues'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link')]), blank=True, default=[], null=True, size=None, verbose_name='user permissions')), ('is_private', models.BooleanField(default=False, verbose_name='is private')), - ('tags_colors', djorm_pgarray.fields.TextArrayField(dbtype='text', dimension=2, default=[], null=False, verbose_name='tags colors')), + ('tags_colors', django.contrib.postgres.fields.ArrayField(base_field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(blank=True, null=True), size=2), blank=True, default=[], null=True, size=None, verbose_name='tags colors')), ], options={ 'ordering': ['name'], diff --git a/taiga/projects/migrations/0002_auto_20140903_0920.py b/taiga/projects/migrations/0002_auto_20140903_0920.py index d9868ec7..93cf59da 100644 --- a/taiga/projects/migrations/0002_auto_20140903_0920.py +++ b/taiga/projects/migrations/0002_auto_20140903_0920.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import models, migrations import django.utils.timezone -import django_pgjson.fields +import taiga.base.db.models.fields import django.db.models.deletion import taiga.projects.history.models @@ -100,15 +100,15 @@ class Migration(migrations.Migration): ('is_issues_activated', models.BooleanField(verbose_name='active issues panel', default=True)), ('videoconferences', models.CharField(max_length=250, null=True, choices=[('appear-in', 'AppearIn'), ('talky', 'Talky')], verbose_name='videoconference system', blank=True)), ('videoconferences_salt', models.CharField(max_length=250, null=True, verbose_name='videoconference room salt', blank=True)), - ('default_options', django_pgjson.fields.JsonField(null=True, verbose_name='default options', blank=True)), - ('us_statuses', django_pgjson.fields.JsonField(null=True, verbose_name='us statuses', blank=True)), - ('points', django_pgjson.fields.JsonField(null=True, verbose_name='points', blank=True)), - ('task_statuses', django_pgjson.fields.JsonField(null=True, verbose_name='task statuses', blank=True)), - ('issue_statuses', django_pgjson.fields.JsonField(null=True, verbose_name='issue statuses', blank=True)), - ('issue_types', django_pgjson.fields.JsonField(null=True, verbose_name='issue types', blank=True)), - ('priorities', django_pgjson.fields.JsonField(null=True, verbose_name='priorities', blank=True)), - ('severities', django_pgjson.fields.JsonField(null=True, verbose_name='severities', blank=True)), - ('roles', django_pgjson.fields.JsonField(null=True, verbose_name='roles', blank=True)), + ('default_options', taiga.base.db.models.fields.JSONField(null=True, verbose_name='default options', blank=True)), + ('us_statuses', taiga.base.db.models.fields.JSONField(null=True, verbose_name='us statuses', blank=True)), + ('points', taiga.base.db.models.fields.JSONField(null=True, verbose_name='points', blank=True)), + ('task_statuses', taiga.base.db.models.fields.JSONField(null=True, verbose_name='task statuses', blank=True)), + ('issue_statuses', taiga.base.db.models.fields.JSONField(null=True, verbose_name='issue statuses', blank=True)), + ('issue_types', taiga.base.db.models.fields.JSONField(null=True, verbose_name='issue types', blank=True)), + ('priorities', taiga.base.db.models.fields.JSONField(null=True, verbose_name='priorities', blank=True)), + ('severities', taiga.base.db.models.fields.JSONField(null=True, verbose_name='severities', blank=True)), + ('roles', taiga.base.db.models.fields.JSONField(null=True, verbose_name='roles', blank=True)), ], options={ 'verbose_name_plural': 'project templates', diff --git a/taiga/projects/migrations/0010_project_modules_config.py b/taiga/projects/migrations/0010_project_modules_config.py index 49eaedb7..b2f14201 100644 --- a/taiga/projects/migrations/0010_project_modules_config.py +++ b/taiga/projects/migrations/0010_project_modules_config.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='project', name='modules_config', - field=django_pgjson.fields.JsonField(blank=True, null=True, verbose_name='modules config'), + field=taiga.base.db.models.fields.JSONField(blank=True, null=True, verbose_name='modules config'), preserve_default=True, ), ] diff --git a/taiga/projects/migrations/0011_auto_20141028_2057.py b/taiga/projects/migrations/0011_auto_20141028_2057.py index fd9a0a33..037b6b9c 100644 --- a/taiga/projects/migrations/0011_auto_20141028_2057.py +++ b/taiga/projects/migrations/0011_auto_20141028_2057.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -16,7 +16,7 @@ class Migration(migrations.Migration): name='ProjectModulesConfig', fields=[ ('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)), - ('config', django_pgjson.fields.JsonField(null=True, verbose_name='modules config', blank=True)), + ('config', taiga.base.db.models.fields.JSONField(null=True, verbose_name='modules config', blank=True)), ('project', models.OneToOneField(to='projects.Project', verbose_name='project', related_name='modules_config')), ], options={ diff --git a/taiga/projects/migrations/0016_fix_json_field_not_null.py b/taiga/projects/migrations/0016_fix_json_field_not_null.py index aaa04543..4c280951 100644 --- a/taiga/projects/migrations/0016_fix_json_field_not_null.py +++ b/taiga/projects/migrations/0016_fix_json_field_not_null.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django_pgjson.fields import JsonField +from taiga.base.db.models.fields import JSONField from django.db import models, migrations diff --git a/taiga/projects/migrations/0019_auto_20150311_0821.py b/taiga/projects/migrations/0019_auto_20150311_0821.py index 034bd3ff..2b5c42ac 100644 --- a/taiga/projects/migrations/0019_auto_20150311_0821.py +++ b/taiga/projects/migrations/0019_auto_20150311_0821.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='project', name='public_permissions', - field=djorm_pgarray.fields.TextArrayField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('vote_issues', 'Vote issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')], verbose_name='user permissions', dbtype='text', default=[]), + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('vote_issues', 'Vote issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')]), blank=True, default=[], null=True, size=None, verbose_name='user permissions'), preserve_default=True, ), ] diff --git a/taiga/projects/migrations/0024_auto_20150810_1247.py b/taiga/projects/migrations/0024_auto_20150810_1247.py index f057816b..5eef1454 100644 --- a/taiga/projects/migrations/0024_auto_20150810_1247.py +++ b/taiga/projects/migrations/0024_auto_20150810_1247.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields from django.conf import settings +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -17,7 +17,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='project', name='public_permissions', - field=djorm_pgarray.fields.TextArrayField(default=[], dbtype='text', choices=[('view_project', 'View project'), ('star_project', 'Star project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('vote_us', 'Vote user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('vote_task', 'Vote task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('vote_issue', 'Vote issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')], verbose_name='user permissions'), + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('view_project', 'View project'), ('star_project', 'Star project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('vote_us', 'Vote user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('vote_task', 'Vote task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('vote_issue', 'Vote issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')]), blank=True, default=[], null=True, size=None, verbose_name='user permissions'), preserve_default=True, ), ] diff --git a/taiga/projects/migrations/0025_auto_20150901_1600.py b/taiga/projects/migrations/0025_auto_20150901_1600.py index 8859b14e..ec02ef9b 100644 --- a/taiga/projects/migrations/0025_auto_20150901_1600.py +++ b/taiga/projects/migrations/0025_auto_20150901_1600.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='project', name='public_permissions', - field=djorm_pgarray.fields.TextArrayField(default=[], choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')], dbtype='text', verbose_name='user permissions'), + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')]), blank=True, default=[], null=True, size=None, verbose_name='user permissions'), preserve_default=True, ), ] diff --git a/taiga/projects/migrations/0041_auto_20160519_1058.py b/taiga/projects/migrations/0041_auto_20160519_1058.py index c4b0a2fd..cffe98d5 100644 --- a/taiga/projects/migrations/0041_auto_20160519_1058.py +++ b/taiga/projects/migrations/0041_auto_20160519_1058.py @@ -2,8 +2,8 @@ # Generated by Django 1.9.2 on 2016-05-19 10:58 from __future__ import unicode_literals -from django.db import migrations -import djorm_pgarray.fields +from django.db import migrations, models +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -16,6 +16,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='project', name='public_permissions', - field=djorm_pgarray.fields.TextArrayField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('comment_us', 'Comment user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('comment_task', 'Comment task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('comment_issue', 'Comment issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('comment_wiki_page', 'Comment wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')], dbtype='text', default=[], verbose_name='user permissions'), + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('comment_us', 'Comment user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('comment_task', 'Comment task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('comment_issue', 'Comment issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('comment_wiki_page', 'Comment wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')]), blank=True, default=[], null=True, size=None, verbose_name='user permissions'), + ), ] diff --git a/taiga/projects/migrations/0049_auto_20160629_1443.py b/taiga/projects/migrations/0049_auto_20160629_1443.py index 8c2117b0..724cb1a9 100644 --- a/taiga/projects/migrations/0049_auto_20160629_1443.py +++ b/taiga/projects/migrations/0049_auto_20160629_1443.py @@ -2,10 +2,10 @@ # Generated by Django 1.9.2 on 2016-06-29 14:43 from __future__ import unicode_literals -import django.contrib.postgres.fields +import taiga.base.db.models.fields from django.db import migrations, models import django.db.models.deletion -import django_pgjson.fields +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -71,7 +71,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='projecttemplate', name='epic_statuses', - field=django_pgjson.fields.JsonField(blank=True, null=True, verbose_name='epic statuses'), + field=taiga.base.db.models.fields.JSONField(blank=True, null=True, verbose_name='epic statuses'), ), migrations.AddField( model_name='projecttemplate', diff --git a/taiga/projects/migrations/0055_json_to_jsonb.py b/taiga/projects/migrations/0055_json_to_jsonb.py new file mode 100644 index 00000000..5b9a0b8e --- /dev/null +++ b/taiga/projects/migrations/0055_json_to_jsonb.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2016-10-26 11:34 +from __future__ import unicode_literals + +from django.db import migrations +from django.contrib.postgres.fields import JSONField + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0054_auto_20160928_0540'), + ] + + operations = [ + migrations.RunSQL( + """ + ALTER TABLE "projects_projectmodulesconfig" + ALTER COLUMN "config" TYPE jsonb USING to_json("config"::text)::jsonb; + """, + reverse_sql=migrations.RunSQL.noop + ), + migrations.RunSQL( + """ + ALTER TABLE "projects_projecttemplate" + ALTER COLUMN "roles" TYPE jsonb USING to_json("roles"::text)::jsonb, + ALTER COLUMN "default_options" TYPE jsonb USING to_json("default_options"::text)::jsonb, + ALTER COLUMN "epic_statuses" TYPE jsonb USING to_json("epic_statuses"::text)::jsonb, + ALTER COLUMN "us_statuses" TYPE jsonb USING to_json("us_statuses"::text)::jsonb, + ALTER COLUMN "points" TYPE jsonb USING to_json("points"::text)::jsonb, + ALTER COLUMN "task_statuses" TYPE jsonb USING to_json("task_statuses"::text)::jsonb, + ALTER COLUMN "issue_statuses" TYPE jsonb USING to_json("issue_statuses"::text)::jsonb, + ALTER COLUMN "issue_types" TYPE jsonb USING to_json("issue_types"::text)::jsonb, + ALTER COLUMN "priorities" TYPE jsonb USING to_json("priorities"::text)::jsonb, + ALTER COLUMN "severities" TYPE jsonb USING to_json("severities"::text)::jsonb; + """, + reverse_sql=migrations.RunSQL.noop + ), + ] diff --git a/taiga/projects/models.py b/taiga/projects/models.py index c23fcc4b..67f9e50f 100644 --- a/taiga/projects/models.py +++ b/taiga/projects/models.py @@ -29,7 +29,7 @@ from django.utils.functional import cached_property from django_pglocks import advisory_lock -from django_pgjson.fields import JsonField +from taiga.base.db.models.fields import JSONField from taiga.base.utils.time import timestamp_ms from taiga.projects.tagging.models import TaggedMixin @@ -491,7 +491,7 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): class ProjectModulesConfig(models.Model): project = models.OneToOneField("Project", null=False, blank=False, related_name="modules_config", verbose_name=_("project")) - config = JsonField(null=True, blank=True, verbose_name=_("modules config")) + config = JSONField(null=True, blank=True, verbose_name=_("modules config")) class Meta: verbose_name = "project modules config" @@ -751,16 +751,16 @@ class ProjectTemplate(models.Model): videoconferences_extra_data = models.CharField(max_length=250, null=True, blank=True, verbose_name=_("videoconference extra data")) - default_options = JsonField(null=True, blank=True, verbose_name=_("default options")) - epic_statuses = JsonField(null=True, blank=True, verbose_name=_("epic statuses")) - us_statuses = JsonField(null=True, blank=True, verbose_name=_("us statuses")) - points = JsonField(null=True, blank=True, verbose_name=_("points")) - task_statuses = JsonField(null=True, blank=True, verbose_name=_("task statuses")) - issue_statuses = JsonField(null=True, blank=True, verbose_name=_("issue statuses")) - issue_types = JsonField(null=True, blank=True, verbose_name=_("issue types")) - priorities = JsonField(null=True, blank=True, verbose_name=_("priorities")) - severities = JsonField(null=True, blank=True, verbose_name=_("severities")) - roles = JsonField(null=True, blank=True, verbose_name=_("roles")) + default_options = JSONField(null=True, blank=True, verbose_name=_("default options")) + epic_statuses = JSONField(null=True, blank=True, verbose_name=_("epic statuses")) + us_statuses = JSONField(null=True, blank=True, verbose_name=_("us statuses")) + points = JSONField(null=True, blank=True, verbose_name=_("points")) + task_statuses = JSONField(null=True, blank=True, verbose_name=_("task statuses")) + issue_statuses = JSONField(null=True, blank=True, verbose_name=_("issue statuses")) + issue_types = JSONField(null=True, blank=True, verbose_name=_("issue types")) + priorities = JSONField(null=True, blank=True, verbose_name=_("priorities")) + severities = JSONField(null=True, blank=True, verbose_name=_("severities")) + roles = JSONField(null=True, blank=True, verbose_name=_("roles")) _importing = None class Meta: diff --git a/taiga/projects/tasks/migrations/0001_initial.py b/taiga/projects/tasks/migrations/0001_initial.py index 99537a7c..b07ae15f 100644 --- a/taiga/projects/tasks/migrations/0001_initial.py +++ b/taiga/projects/tasks/migrations/0001_initial.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields +import django.contrib.postgres.fields from django.conf import settings import django.utils.timezone @@ -21,7 +21,7 @@ class Migration(migrations.Migration): name='Task', fields=[ ('id', models.AutoField(serialize=False, verbose_name='ID', primary_key=True, auto_created=True)), - ('tags', djorm_pgarray.fields.TextArrayField(dbtype='text', verbose_name='tags')), + ('tags', django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), blank=True, default=[], null=True, size=None, verbose_name='tags')), ('version', models.IntegerField(default=1, verbose_name='version')), ('is_blocked', models.BooleanField(verbose_name='is blocked', default=False)), ('blocked_note', models.TextField(blank=True, verbose_name='blocked note', default='')), diff --git a/taiga/projects/tasks/migrations/0003_task_external_reference.py b/taiga/projects/tasks/migrations/0003_task_external_reference.py index 8222116e..9de35ca6 100644 --- a/taiga/projects/tasks/migrations/0003_task_external_reference.py +++ b/taiga/projects/tasks/migrations/0003_task_external_reference.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='task', name='external_reference', - field=djorm_pgarray.fields.TextArrayField(dbtype='text', verbose_name='external reference'), + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(blank=False, null=False), blank=True, default=None, null=True, size=None, verbose_name='external reference'), preserve_default=True, ), ] diff --git a/taiga/projects/userstories/migrations/0001_initial.py b/taiga/projects/userstories/migrations/0001_initial.py index 688a9050..3672aca5 100644 --- a/taiga/projects/userstories/migrations/0001_initial.py +++ b/taiga/projects/userstories/migrations/0001_initial.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.db import models, migrations from django.conf import settings import django.utils.timezone -import djorm_pgarray.fields +import django.contrib.postgres.fields import django.db.models.deletion @@ -38,7 +38,7 @@ class Migration(migrations.Migration): name='UserStory', fields=[ ('id', models.AutoField(primary_key=True, auto_created=True, serialize=False, verbose_name='ID')), - ('tags', djorm_pgarray.fields.TextArrayField(dbtype='text', verbose_name='tags')), + ('tags', django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), blank=True, default=[], null=True, size=None, verbose_name='tags')), ('version', models.IntegerField(default=1, verbose_name='version')), ('is_blocked', models.BooleanField(default=False, verbose_name='is blocked')), ('blocked_note', models.TextField(default='', blank=True, verbose_name='blocked note')), diff --git a/taiga/projects/userstories/migrations/0007_userstory_external_reference.py b/taiga/projects/userstories/migrations/0007_userstory_external_reference.py index 3cbbceeb..fbfd1f3f 100644 --- a/taiga/projects/userstories/migrations/0007_userstory_external_reference.py +++ b/taiga/projects/userstories/migrations/0007_userstory_external_reference.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='userstory', name='external_reference', - field=djorm_pgarray.fields.TextArrayField(dbtype='text', verbose_name='external reference'), + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(blank=False, null=False), blank=True, default=None, null=True, size=None, verbose_name='external reference'), preserve_default=True, ), ] diff --git a/taiga/projects/validators.py b/taiga/projects/validators.py index 54a43178..ec97aadd 100644 --- a/taiga/projects/validators.py +++ b/taiga/projects/validators.py @@ -22,7 +22,7 @@ from django.utils.translation import ugettext as _ from taiga.base.api import serializers from taiga.base.api import validators from taiga.base.exceptions import ValidationError -from taiga.base.fields import JsonField +from taiga.base.fields import JSONField from taiga.base.fields import PgArrayField from taiga.users.models import Role @@ -222,15 +222,15 @@ class ProjectValidator(validators.ModelValidator): ###################################################### class ProjectTemplateValidator(validators.ModelValidator): - default_options = JsonField(required=False, label=_("Default options")) - us_statuses = JsonField(required=False, label=_("User story's statuses")) - points = JsonField(required=False, label=_("Points")) - task_statuses = JsonField(required=False, label=_("Task's statuses")) - issue_statuses = JsonField(required=False, label=_("Issue's statuses")) - issue_types = JsonField(required=False, label=_("Issue's types")) - priorities = JsonField(required=False, label=_("Priorities")) - severities = JsonField(required=False, label=_("Severities")) - roles = JsonField(required=False, label=_("Roles")) + default_options = JSONField(required=False, label=_("Default options")) + us_statuses = JSONField(required=False, label=_("User story's statuses")) + points = JSONField(required=False, label=_("Points")) + task_statuses = JSONField(required=False, label=_("Task's statuses")) + issue_statuses = JSONField(required=False, label=_("Issue's statuses")) + issue_types = JSONField(required=False, label=_("Issue's types")) + priorities = JSONField(required=False, label=_("Priorities")) + severities = JSONField(required=False, label=_("Severities")) + roles = JSONField(required=False, label=_("Roles")) class Meta: model = models.ProjectTemplate diff --git a/taiga/timeline/management/commands/rebuild_timeline.py b/taiga/timeline/management/commands/rebuild_timeline.py index 674f6b9d..cd14795a 100644 --- a/taiga/timeline/management/commands/rebuild_timeline.py +++ b/taiga/timeline/management/commands/rebuild_timeline.py @@ -46,7 +46,7 @@ class BulkCreator(object): def create_element(self, element): self.timeline_objects.append(element) - if len(self.timeline_objects) > 1000: + if len(self.timeline_objects) > 999: self.flush() def flush(self): @@ -140,31 +140,28 @@ def generate_timeline(initial_date, final_date, project_id): class Command(BaseCommand): help = 'Regenerate project timeline' - option_list = BaseCommand.option_list + ( - make_option('--purge', - action='store_true', - dest='purge', - default=False, - help='Purge existing timelines'), - ) + ( - make_option('--initial_date', - action='store', - dest='initial_date', - default=None, - help='Initial date for timeline generation'), - ) + ( - make_option('--final_date', - action='store', - dest='final_date', - default=None, - help='Final date for timeline generation'), - ) + ( - make_option('--project', - action='store', - dest='project', - default=None, - help='Selected project id for timeline generation'), - ) + + def add_arguments(self, parser): + parser.add_argument('--purge', + action='store_true', + dest='purge', + default=False, + help='Purge existing timelines') + parser.add_argument('--initial_date', + action='store', + dest='initial_date', + default=None, + help='Initial date for timeline generation') + parser.add_argument('--final_date', + action='store', + dest='final_date', + default=None, + help='Final date for timeline generation') + parser.add_argument('--project', + action='store', + dest='project', + default=None, + help='Selected project id for timeline generation') @override_settings(DEBUG=False) def handle(self, *args, **options): diff --git a/taiga/timeline/migrations/0001_initial.py b/taiga/timeline/migrations/0001_initial.py index 5a2a5fb6..2f6fa746 100644 --- a/taiga/timeline/migrations/0001_initial.py +++ b/taiga/timeline/migrations/0001_initial.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import django_pgjson.fields +import taiga.base.db.models.fields import django.utils.timezone @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('object_id', models.PositiveIntegerField()), ('namespace', models.SlugField(default='default')), ('event_type', models.SlugField()), - ('data', django_pgjson.fields.JsonField()), + ('data', taiga.base.db.models.fields.JSONField()), ('created', models.DateTimeField(default=django.utils.timezone.now)), ('content_type', models.ForeignKey(to='contenttypes.ContentType')), ], diff --git a/taiga/timeline/migrations/0002_auto_20150327_1056.py b/taiga/timeline/migrations/0002_auto_20150327_1056.py index 6c8a2066..ee6f2199 100644 --- a/taiga/timeline/migrations/0002_auto_20150327_1056.py +++ b/taiga/timeline/migrations/0002_auto_20150327_1056.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import django_pgjson.fields +import taiga.base.db.models.fields from django.utils import timezone class Migration(migrations.Migration): @@ -27,7 +27,7 @@ class Migration(migrations.Migration): ('namespace', models.SlugField(default='default')), ('event_type', models.SlugField()), ('project', models.ForeignKey(to='projects.Project')), - ('data', django_pgjson.fields.JsonField()), + ('data', taiga.base.db.models.fields.JSONField()), ('data_content_type', models.ForeignKey(to='contenttypes.ContentType', related_name='data_timelines')), ('created', models.DateTimeField(default=timezone.now)), ('content_type', models.ForeignKey(to='contenttypes.ContentType', related_name='content_type_timelines')), diff --git a/taiga/timeline/migrations/0006_json_to_jsonb.py b/taiga/timeline/migrations/0006_json_to_jsonb.py new file mode 100644 index 00000000..72a63968 --- /dev/null +++ b/taiga/timeline/migrations/0006_json_to_jsonb.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2016-10-26 11:35 +from __future__ import unicode_literals + +from django.db import migrations +from django.contrib.postgres.fields import JSONField + + +class Migration(migrations.Migration): + + dependencies = [ + ('timeline', '0005_auto_20160706_0723'), + ] + + operations = [ + migrations.RunSQL( + """ + ALTER TABLE "{table_name}" + ALTER COLUMN "{column_name}" + TYPE jsonb + USING to_json("{column_name}"::text)::jsonb; + """.format( + table_name="timeline_timeline", + column_name="data", + ), + reverse_sql=migrations.RunSQL.noop + ), + ] diff --git a/taiga/timeline/models.py b/taiga/timeline/models.py index ebee7da5..52fe5aca 100644 --- a/taiga/timeline/models.py +++ b/taiga/timeline/models.py @@ -17,7 +17,7 @@ # along with this program. If not, see . from django.db import models -from django_pgjson.fields import JsonField +from taiga.base.db.models.fields import JSONField from django.utils import timezone from django.contrib.contenttypes.models import ContentType @@ -33,7 +33,7 @@ class Timeline(models.Model): namespace = models.CharField(max_length=250, default="default", db_index=True) event_type = models.CharField(max_length=250, db_index=True) project = models.ForeignKey(Project, null=True) - data = JsonField() + data = JSONField() data_content_type = models.ForeignKey(ContentType, related_name="data_timelines") created = models.DateTimeField(default=timezone.now, db_index=True) diff --git a/taiga/urls.py b/taiga/urls.py index 95b27ce8..46735e60 100644 --- a/taiga/urls.py +++ b/taiga/urls.py @@ -17,7 +17,7 @@ # along with this program. If not, see . from django.conf import settings -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.contrib import admin from .routers import router diff --git a/taiga/users/migrations/0001_initial.py b/taiga/users/migrations/0001_initial.py index ad8d2071..d81f77fa 100644 --- a/taiga/users/migrations/0001_initial.py +++ b/taiga/users/migrations/0001_initial.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields import django.utils.timezone import re import django.core.validators diff --git a/taiga/users/migrations/0002_auto_20140903_0916.py b/taiga/users/migrations/0002_auto_20140903_0916.py index 40dd3086..fd663d44 100644 --- a/taiga/users/migrations/0002_auto_20140903_0916.py +++ b/taiga/users/migrations/0002_auto_20140903_0916.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)), ('name', models.CharField(verbose_name='name', max_length=200)), ('slug', models.SlugField(verbose_name='slug', max_length=250, blank=True)), - ('permissions', djorm_pgarray.fields.TextArrayField(dbtype='text', verbose_name='permissions', choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('vote_issues', 'Vote issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')], default=[])), + ('permissions', django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('vote_issues', 'Vote issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')]), blank=True, default=[], null=True, size=None, verbose_name='permissions')), ('order', models.IntegerField(verbose_name='order', default=10)), ('computable', models.BooleanField(default=True)), ], diff --git a/taiga/users/migrations/0007_auto_20150209_1611.py b/taiga/users/migrations/0007_auto_20150209_1611.py index 4f1bc2ca..27f1cd3d 100644 --- a/taiga/users/migrations/0007_auto_20150209_1611.py +++ b/taiga/users/migrations/0007_auto_20150209_1611.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import models, migrations from django.conf import settings -import django_pgjson.fields +import taiga.base.db.models.fields def migrate_github_id(apps, schema_editor): @@ -27,7 +27,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)), ('key', models.SlugField()), ('value', models.CharField(max_length=300)), - ('extra', django_pgjson.fields.JsonField()), + ('extra', taiga.base.db.models.fields.JSONField()), ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)), ], options={ diff --git a/taiga/users/migrations/0012_auto_20150812_1142.py b/taiga/users/migrations/0012_auto_20150812_1142.py index fff8c17b..8d5354b0 100644 --- a/taiga/users/migrations/0012_auto_20150812_1142.py +++ b/taiga/users/migrations/0012_auto_20150812_1142.py @@ -2,8 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields - +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -15,7 +14,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='role', name='permissions', - field=djorm_pgarray.fields.TextArrayField(choices=[('view_project', 'View project'), ('star_project', 'Star project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('vote_us', 'Vote user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('vote_task', 'Vote task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('vote_issue', 'Vote issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')], verbose_name='permissions', default=[], dbtype='text'), + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('view_project', 'View project'), ('star_project', 'Star project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('vote_us', 'Vote user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('vote_task', 'Vote task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('vote_issue', 'Vote issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')]), blank=True, default=[], null=True, size=None, verbose_name='permissions'), preserve_default=True, ), ] diff --git a/taiga/users/migrations/0013_auto_20150901_1600.py b/taiga/users/migrations/0013_auto_20150901_1600.py index 8d2e4143..15492e03 100644 --- a/taiga/users/migrations/0013_auto_20150901_1600.py +++ b/taiga/users/migrations/0013_auto_20150901_1600.py @@ -2,8 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import djorm_pgarray.fields - +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -15,7 +14,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='role', name='permissions', - field=djorm_pgarray.fields.TextArrayField(default=[], choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')], dbtype='text', verbose_name='permissions'), + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')]), blank=True, default=[], null=True, size=None, verbose_name='permissions'), preserve_default=True, ), ] diff --git a/taiga/users/migrations/0019_auto_20160519_1058.py b/taiga/users/migrations/0019_auto_20160519_1058.py index 69780084..a83dbcea 100644 --- a/taiga/users/migrations/0019_auto_20160519_1058.py +++ b/taiga/users/migrations/0019_auto_20160519_1058.py @@ -2,9 +2,8 @@ # Generated by Django 1.9.2 on 2016-05-19 10:58 from __future__ import unicode_literals -from django.db import migrations -import djorm_pgarray.fields - +from django.db import models, migrations +import django.contrib.postgres.fields class Migration(migrations.Migration): @@ -16,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='role', name='permissions', - field=djorm_pgarray.fields.TextArrayField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('comment_us', 'Comment user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('comment_task', 'Comment task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('comment_issue', 'Comment issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('comment_wiki_page', 'Comment wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')], dbtype='text', default=[], verbose_name='permissions'), + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('view_project', 'View project'), ('view_milestones', 'View milestones'), ('add_milestone', 'Add milestone'), ('modify_milestone', 'Modify milestone'), ('delete_milestone', 'Delete milestone'), ('view_us', 'View user story'), ('add_us', 'Add user story'), ('modify_us', 'Modify user story'), ('comment_us', 'Comment user story'), ('delete_us', 'Delete user story'), ('view_tasks', 'View tasks'), ('add_task', 'Add task'), ('modify_task', 'Modify task'), ('comment_task', 'Comment task'), ('delete_task', 'Delete task'), ('view_issues', 'View issues'), ('add_issue', 'Add issue'), ('modify_issue', 'Modify issue'), ('comment_issue', 'Comment issue'), ('delete_issue', 'Delete issue'), ('view_wiki_pages', 'View wiki pages'), ('add_wiki_page', 'Add wiki page'), ('modify_wiki_page', 'Modify wiki page'), ('comment_wiki_page', 'Comment wiki page'), ('delete_wiki_page', 'Delete wiki page'), ('view_wiki_links', 'View wiki links'), ('add_wiki_link', 'Add wiki link'), ('modify_wiki_link', 'Modify wiki link'), ('delete_wiki_link', 'Delete wiki link')]), blank=True, default=[], null=True, size=None, verbose_name='permissions'), ), ] diff --git a/taiga/users/migrations/0023_json_to_jsonb.py b/taiga/users/migrations/0023_json_to_jsonb.py new file mode 100644 index 00000000..34782897 --- /dev/null +++ b/taiga/users/migrations/0023_json_to_jsonb.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2016-10-26 11:35 +from __future__ import unicode_literals + +from django.db import migrations +from django.contrib.postgres.fields import JSONField + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0022_auto_20160629_1443'), + ] + + operations = [ + migrations.RunSQL( + """ + ALTER TABLE "{table_name}" + ALTER COLUMN "{column_name}" + TYPE jsonb + USING to_json("{column_name}"::text)::jsonb; + """.format( + table_name="users_authdata", + column_name="extra", + ), + reverse_sql=migrations.RunSQL.noop + ), + ] diff --git a/taiga/users/models.py b/taiga/users/models.py index 45908a10..e0f6a8c9 100644 --- a/taiga/users/models.py +++ b/taiga/users/models.py @@ -34,7 +34,7 @@ from django.dispatch import receiver from django.utils import timezone from django.utils.translation import ugettext_lazy as _ -from django_pgjson.fields import JsonField +from taiga.base.db.models.fields import JSONField from django_pglocks import advisory_lock from taiga.auth.tokens import get_token_for_user @@ -323,7 +323,7 @@ class AuthData(models.Model): user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name="auth_data") key = models.SlugField(max_length=50) value = models.CharField(max_length=300) - extra = JsonField() + extra = JSONField() class Meta: unique_together = ["key", "value"] diff --git a/taiga/userstorage/migrations/0001_initial.py b/taiga/userstorage/migrations/0001_initial.py index 1857d669..1776be95 100644 --- a/taiga/userstorage/migrations/0001_initial.py +++ b/taiga/userstorage/migrations/0001_initial.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import django_pgjson.fields +import taiga.base.db.models.fields from django.conf import settings @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='created date')), ('modified_date', models.DateTimeField(verbose_name='modified date', auto_now=True)), ('key', models.CharField(max_length=255, verbose_name='key')), - ('value', django_pgjson.fields.JsonField(verbose_name='value', blank=True, default=None, null=True)), + ('value', taiga.base.db.models.fields.JSONField(verbose_name='value', blank=True, default=None, null=True)), ('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name='owner', related_name='storage_entries')), ], options={ diff --git a/taiga/userstorage/migrations/0002_fix_json_field_not_null.py b/taiga/userstorage/migrations/0002_fix_json_field_not_null.py index f993919a..1aa5c568 100644 --- a/taiga/userstorage/migrations/0002_fix_json_field_not_null.py +++ b/taiga/userstorage/migrations/0002_fix_json_field_not_null.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django_pgjson.fields import JsonField +from taiga.base.db.models.fields import JSONField from django.db import models, migrations diff --git a/taiga/userstorage/migrations/0003_json_to_jsonb.py b/taiga/userstorage/migrations/0003_json_to_jsonb.py new file mode 100644 index 00000000..9e1f5243 --- /dev/null +++ b/taiga/userstorage/migrations/0003_json_to_jsonb.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2016-10-26 11:35 +from __future__ import unicode_literals + +from django.db import migrations +from django.contrib.postgres.fields import JSONField + + +class Migration(migrations.Migration): + + dependencies = [ + ('userstorage', '0002_fix_json_field_not_null'), + ] + + operations = [ + migrations.RunSQL( + """ + ALTER TABLE "{table_name}" + ALTER COLUMN "{column_name}" + TYPE jsonb + USING to_json("{column_name}"::text)::jsonb; + """.format( + table_name="userstorage_storageentry", + column_name="value", + ), + reverse_sql=migrations.RunSQL.noop + ), + ] diff --git a/taiga/userstorage/models.py b/taiga/userstorage/models.py index 9888ea7f..c1e94960 100644 --- a/taiga/userstorage/models.py +++ b/taiga/userstorage/models.py @@ -19,7 +19,7 @@ from django.db import models from django.conf import settings from django.utils.translation import ugettext_lazy as _ -from django_pgjson.fields import JsonField +from taiga.base.db.models.fields import JSONField class StorageEntry(models.Model): @@ -30,7 +30,7 @@ class StorageEntry(models.Model): modified_date = models.DateTimeField(auto_now=True, null=False, blank=False, verbose_name=_("modified date")) key = models.CharField(max_length=255, null=False, blank=False, verbose_name=_("key")) - value = JsonField(blank=True, default=None, null=True, verbose_name=_("value")) + value = JSONField(blank=True, default=None, null=True, verbose_name=_("value")) class Meta: verbose_name = "storage entry" diff --git a/taiga/webhooks/migrations/0001_initial.py b/taiga/webhooks/migrations/0001_initial.py index 79ec8ba9..366bf848 100644 --- a/taiga/webhooks/migrations/0001_initial.py +++ b/taiga/webhooks/migrations/0001_initial.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -30,7 +30,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), ('url', models.URLField(verbose_name='URL')), ('status', models.IntegerField(verbose_name='Status code')), - ('request_data', django_pgjson.fields.JsonField(verbose_name='Request data')), + ('request_data', taiga.base.db.models.fields.JSONField(verbose_name='Request data')), ('response_data', models.TextField(verbose_name='Response data')), ('webhook', models.ForeignKey(related_name='logs', to='webhooks.Webhook')), ], diff --git a/taiga/webhooks/migrations/0003_auto_20150122_1021.py b/taiga/webhooks/migrations/0003_auto_20150122_1021.py index fa565ba3..a1f7a34d 100644 --- a/taiga/webhooks/migrations/0003_auto_20150122_1021.py +++ b/taiga/webhooks/migrations/0003_auto_20150122_1021.py @@ -3,7 +3,9 @@ from __future__ import unicode_literals from django.db import models, migrations import datetime -import django_pgjson.fields +import taiga.base.db.models.fields + +from django.utils import timezone class Migration(migrations.Migration): @@ -16,7 +18,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='webhooklog', name='created', - field=models.DateTimeField(default=datetime.datetime(2015, 1, 22, 10, 21, 17, 188643), auto_now_add=True), + field=models.DateTimeField( + default=datetime.datetime(2015, 1, 22, 10, 21, 17, 188643, timezone.get_default_timezone()), + auto_now_add=True), preserve_default=False, ), migrations.AddField( @@ -28,13 +32,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='webhooklog', name='request_headers', - field=django_pgjson.fields.JsonField(default={}, verbose_name='Request headers'), + field=taiga.base.db.models.fields.JSONField(default={}, verbose_name='Request headers'), preserve_default=True, ), migrations.AddField( model_name='webhooklog', name='response_headers', - field=django_pgjson.fields.JsonField(default={}, verbose_name='Response headers'), + field=taiga.base.db.models.fields.JSONField(default={}, verbose_name='Response headers'), preserve_default=True, ), ] diff --git a/taiga/webhooks/migrations/0005_auto_20150505_1639.py b/taiga/webhooks/migrations/0005_auto_20150505_1639.py index 2e8df5e4..8f143b4a 100644 --- a/taiga/webhooks/migrations/0005_auto_20150505_1639.py +++ b/taiga/webhooks/migrations/0005_auto_20150505_1639.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import django_pgjson.fields +import taiga.base.db.models.fields class Migration(migrations.Migration): @@ -21,13 +21,13 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='webhooklog', name='request_data', - field=django_pgjson.fields.JsonField(verbose_name='request data'), + field=taiga.base.db.models.fields.JSONField(verbose_name='request data'), preserve_default=True, ), migrations.AlterField( model_name='webhooklog', name='request_headers', - field=django_pgjson.fields.JsonField(verbose_name='request headers', default={}), + field=taiga.base.db.models.fields.JSONField(verbose_name='request headers', default={}), preserve_default=True, ), migrations.AlterField( @@ -39,7 +39,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='webhooklog', name='response_headers', - field=django_pgjson.fields.JsonField(verbose_name='response headers', default={}), + field=taiga.base.db.models.fields.JSONField(verbose_name='response headers', default={}), preserve_default=True, ), migrations.AlterField( diff --git a/taiga/webhooks/migrations/0006_json_to_jsonb.py b/taiga/webhooks/migrations/0006_json_to_jsonb.py new file mode 100644 index 00000000..9f40b860 --- /dev/null +++ b/taiga/webhooks/migrations/0006_json_to_jsonb.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2016-10-26 11:35 +from __future__ import unicode_literals + +from django.db import migrations +from django.contrib.postgres.fields import JSONField + + +class Migration(migrations.Migration): + + dependencies = [ + ('webhooks', '0005_auto_20150505_1639'), + ] + + operations = [ + migrations.RunSQL( + """ + ALTER TABLE "webhooks_webhooklog" + ALTER COLUMN "request_headers" TYPE jsonb USING to_json("request_headers"::text)::jsonb, + ALTER COLUMN "request_data" TYPE jsonb USING to_json("request_data"::text)::jsonb, + ALTER COLUMN "response_headers" TYPE jsonb USING to_json("response_headers"::text)::jsonb; + """, + reverse_sql=migrations.RunSQL.noop + ), + ] diff --git a/taiga/webhooks/models.py b/taiga/webhooks/models.py index 53969525..b73d26d6 100644 --- a/taiga/webhooks/models.py +++ b/taiga/webhooks/models.py @@ -19,7 +19,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -from django_pgjson.fields import JsonField +from taiga.base.db.models.fields import JSONField class Webhook(models.Model): @@ -39,10 +39,10 @@ class WebhookLog(models.Model): related_name="logs") url = models.URLField(null=False, blank=False, verbose_name=_("URL")) status = models.IntegerField(null=False, blank=False, verbose_name=_("status code")) - request_data = JsonField(null=False, blank=False, verbose_name=_("request data")) - request_headers = JsonField(null=False, blank=False, verbose_name=_("request headers"), default={}) + request_data = JSONField(null=False, blank=False, verbose_name=_("request data")) + request_headers = JSONField(null=False, blank=False, verbose_name=_("request headers"), default={}) response_data = models.TextField(null=False, blank=False, verbose_name=_("response data")) - response_headers = JsonField(null=False, blank=False, verbose_name=_("response headers"), default={}) + response_headers = JSONField(null=False, blank=False, verbose_name=_("response headers"), default={}) duration = models.FloatField(null=False, blank=False, verbose_name=_("duration"), default=0) created = models.DateTimeField(auto_now_add=True) diff --git a/tests/integration/resources_permissions/test_projects_resource.py b/tests/integration/resources_permissions/test_projects_resource.py index 3d62dc6e..46059004 100644 --- a/tests/integration/resources_permissions/test_projects_resource.py +++ b/tests/integration/resources_permissions/test_projects_resource.py @@ -163,12 +163,18 @@ def test_project_update(client, data): ] project_data = ProjectSerializer(data.private_project2).data + # Because in serializer is a dict anin model is a list of lists + project_data["tags_colors"] = list(map(list, project_data["tags_colors"].items())) project_data["is_private"] = False + results = helper_test_http_method(client, 'put', url, json.dumps(project_data), users) assert results == [401, 403, 403, 200] project_data = ProjectSerializer(data.blocked_project).data + # Because in serializer is a dict anin model is a list of lists + project_data["tags_colors"] = list(map(list, project_data["tags_colors"].items())) project_data["is_private"] = False + results = helper_test_http_method(client, 'put', blocked_url, json.dumps(project_data), users) assert results == [401, 403, 403, 451] diff --git a/tests/integration/test_history.py b/tests/integration/test_history.py index cc6d8d43..c34d9092 100644 --- a/tests/integration/test_history.py +++ b/tests/integration/test_history.py @@ -18,11 +18,12 @@ # along with this program. If not, see . import pytest -import datetime from unittest.mock import patch from django.core.urlresolvers import reverse +from django.utils import timezone + from .. import factories as f from taiga.base.utils import json @@ -286,7 +287,7 @@ def test_get_comment_versions(client): key=key, diff={}, user={"pk": project.owner.id}, - edit_comment_date=datetime.datetime.now(), + edit_comment_date=timezone.now(), comment_versions = [{ "comment_html": "

    test

    ", "date": "2016-05-09T09:34:27.221Z", diff --git a/tests/integration/test_notifications.py b/tests/integration/test_notifications.py index d8943e71..fd8f3aa8 100644 --- a/tests/integration/test_notifications.py +++ b/tests/integration/test_notifications.py @@ -25,10 +25,13 @@ import datetime import hashlib import binascii import struct +import pytz from unittest.mock import MagicMock, patch from django.core.urlresolvers import reverse +from django.utils import timezone + from django.apps import apps from .. import factories as f @@ -931,7 +934,7 @@ def test_retrieve_notify_policies_by_anonymous_user(client): def test_ms_thread_id(): id = '' - now = datetime.datetime.now() + now = timezone.now() index = services.make_ms_thread_index(id, now) parsed = parse_ms_thread_index(index) @@ -953,7 +956,7 @@ def parse_ms_thread_index(index): # guid = '%08X-%04X-%04X-%04X-%12X' % (guid[0], guid[1], guid[2], (guid[3] >> 48) & 0xFFFF, guid[3] & 0xFFFFFFFFFFFF) f = struct.unpack('>Q', s[:6] + b'\0\0')[0] - ts = [datetime.datetime(1601, 1, 1) + datetime.timedelta(microseconds=f//10)] + ts = [datetime.datetime(1601, 1, 1, tzinfo=pytz.utc) + datetime.timedelta(microseconds=f//10)] # for the 5 byte appendixes that we won't use for n in range(22, len(s), 5): diff --git a/tests/integration/test_references_sequences.py b/tests/integration/test_references_sequences.py index 2c38900e..b0084604 100644 --- a/tests/integration/test_references_sequences.py +++ b/tests/integration/test_references_sequences.py @@ -67,6 +67,8 @@ def test_sequences(seq): @pytest.mark.django_db def test_unique_reference_per_project(seq, refmodels): + refmodels.Reference.objects.all().delete() + project = factories.ProjectFactory.create() seqname = refmodels.make_sequence_name(project) @@ -82,6 +84,8 @@ def test_unique_reference_per_project(seq, refmodels): @pytest.mark.django_db def test_regenerate_us_reference_on_project_change(seq, refmodels): + refmodels.Reference.objects.all().delete() + project1 = factories.ProjectFactory.create() seqname1 = refmodels.make_sequence_name(project1) project2 = factories.ProjectFactory.create() @@ -104,6 +108,8 @@ def test_regenerate_us_reference_on_project_change(seq, refmodels): @pytest.mark.django_db def test_regenerate_task_reference_on_project_change(seq, refmodels): + refmodels.Reference.objects.all().delete() + project1 = factories.ProjectFactory.create() seqname1 = refmodels.make_sequence_name(project1) project2 = factories.ProjectFactory.create() @@ -126,6 +132,8 @@ def test_regenerate_task_reference_on_project_change(seq, refmodels): @pytest.mark.django_db def test_regenerate_issue_reference_on_project_change(seq, refmodels): + refmodels.Reference.objects.all().delete() + project1 = factories.ProjectFactory.create() seqname1 = refmodels.make_sequence_name(project1) project2 = factories.ProjectFactory.create() @@ -149,6 +157,8 @@ def test_regenerate_issue_reference_on_project_change(seq, refmodels): @pytest.mark.django_db def test_params_validation_in_api_request(client, refmodels): + refmodels.Reference.objects.all().delete() + user = factories.UserFactory.create() project = factories.ProjectFactory.create(owner=user) seqname1 = refmodels.make_sequence_name(project) diff --git a/tests/integration/test_roles.py b/tests/integration/test_roles.py index e3b47f7d..7ad000ef 100644 --- a/tests/integration/test_roles.py +++ b/tests/integration/test_roles.py @@ -55,27 +55,3 @@ def test_destroy_role_and_reassign_members(client): qs = Membership.objects.filter(project=project, role_id=role1.pk) assert qs.count() == 2 - - -def test_destroy_role_and_reassign_members_with_deleted_project(client): - """ - Regression test, that fixes some 500 errors on production - """ - - user1 = f.UserFactory.create() - user2 = f.UserFactory.create() - project = f.ProjectFactory.create(owner=user1) - role1 = f.RoleFactory.create(project=project) - role2 = f.RoleFactory.create(project=project) - f.MembershipFactory.create(project=project, user=user1, role=role1) - f.MembershipFactory.create(project=project, user=user2, role=role2) - - Project.objects.filter(pk=project.id).delete() - - url = reverse("roles-detail", args=[role2.pk]) + "?moveTo={}".format(role1.pk) - client.login(user1) - - response = client.delete(url) - - # FIXME: really should return 403? I think it should be 404 - assert response.status_code == 403, response.content diff --git a/tests/integration/test_timeline.py b/tests/integration/test_timeline.py index e0353d15..e898a1fa 100644 --- a/tests/integration/test_timeline.py +++ b/tests/integration/test_timeline.py @@ -35,7 +35,7 @@ def test_add_to_object_timeline(): user1 = factories.UserFactory() task = factories.TaskFactory() - service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: str(id(x))) + service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: id(x)) service._add_to_object_timeline(user1, task, "test", task.created_date) @@ -54,7 +54,7 @@ def test_get_timeline(): task3= factories.TaskFactory() task4= factories.TaskFactory() - service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: str(id(x))) + service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: id(x)) service._add_to_object_timeline(user1, task1, "test", task1.created_date) service._add_to_object_timeline(user1, task2, "test", task2.created_date) @@ -73,7 +73,7 @@ def test_filter_timeline_no_privileges(): user2 = factories.UserFactory() task1= factories.TaskFactory() - service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: str(id(x))) + service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: id(x)) service._add_to_object_timeline(user1, task1, "test", task1.created_date) timeline = Timeline.objects.exclude(event_type="users.user.create") timeline = service.filter_timeline_for_user(timeline, user2) @@ -88,7 +88,7 @@ def test_filter_timeline_public_project(): task1= factories.TaskFactory() task2= factories.TaskFactory.create(project=project) - service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: str(id(x))) + service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: id(x)) service._add_to_object_timeline(user1, task1, "test", task1.created_date) service._add_to_object_timeline(user1, task2, "test", task2.created_date) timeline = Timeline.objects.exclude(event_type="users.user.create") @@ -104,7 +104,7 @@ def test_filter_timeline_private_project_anon_permissions(): task1= factories.TaskFactory() task2= factories.TaskFactory.create(project=project) - service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: str(id(x))) + service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: id(x)) service._add_to_object_timeline(user1, task1, "test", task1.created_date) service._add_to_object_timeline(user1, task2, "test", task2.created_date) timeline = Timeline.objects.exclude(event_type="users.user.create") @@ -123,7 +123,7 @@ def test_filter_timeline_private_project_member_permissions(): task1= factories.TaskFactory() task2= factories.TaskFactory.create(project=project) - service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: str(id(x))) + service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: id(x)) service._add_to_object_timeline(user1, task1, "test", task1.created_date) service._add_to_object_timeline(user1, task2, "test", task2.created_date) timeline = Timeline.objects.exclude(event_type="users.user.create") @@ -140,7 +140,7 @@ def test_filter_timeline_private_project_member_admin(): task1= factories.TaskFactory() task2= factories.TaskFactory.create(project=project) - service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: str(id(x))) + service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: id(x)) service._add_to_object_timeline(user1, task1, "test", task1.created_date) service._add_to_object_timeline(user1, task2, "test", task2.created_date) timeline = Timeline.objects.exclude(event_type="users.user.create") @@ -157,7 +157,7 @@ def test_filter_timeline_private_project_member_superuser(): task1= factories.TaskFactory() task2= factories.TaskFactory.create(project=project) - service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: str(id(x))) + service.register_timeline_implementation("tasks.task", "test", lambda x, extra_data=None: id(x)) service._add_to_object_timeline(user1, task1, "test", task1.created_date) service._add_to_object_timeline(user1, task2, "test", task2.created_date) timeline = Timeline.objects.exclude(event_type="users.user.create") diff --git a/tests/integration/test_totals_projects.py b/tests/integration/test_totals_projects.py index 8d29d950..fb7f1e58 100644 --- a/tests/integration/test_totals_projects.py +++ b/tests/integration/test_totals_projects.py @@ -27,13 +27,15 @@ from taiga.projects.history.choices import HistoryType from taiga.projects.models import Project from django.core.urlresolvers import reverse +from django.utils import timezone pytestmark = pytest.mark.django_db + def test_project_totals_updated_on_activity(client): project = f.create_project() totals_updated_datetime = project.totals_updated_datetime - now = datetime.datetime.now() + now = timezone.now() assert project.total_activity == 0 totals_updated_datetime = project.totals_updated_datetime @@ -120,10 +122,10 @@ def test_project_totals_updated_on_like(client): f.MembershipFactory.create(project=project, user=project.owner, is_admin=True) totals_updated_datetime = project.totals_updated_datetime - now = datetime.datetime.now() + now = timezone.now() assert project.total_activity == 0 - now = datetime.datetime.now() + now = timezone.now() totals_updated_datetime = project.totals_updated_datetime us = f.UserStoryFactory.create(project=project, owner=project.owner) diff --git a/tests/unit/test_export.py b/tests/unit/test_export.py index 1088550f..18ae7d90 100644 --- a/tests/unit/test_export.py +++ b/tests/unit/test_export.py @@ -27,7 +27,7 @@ pytestmark = pytest.mark.django_db def test_export_issue_finish_date(client): - issue = f.IssueFactory.create(finished_date="2014-10-22") + issue = f.IssueFactory.create(finished_date="2014-10-22T00:00:00+0000") output = io.BytesIO() render_project(issue.project, output) project_data = json.loads(output.getvalue()) @@ -36,7 +36,7 @@ def test_export_issue_finish_date(client): def test_export_user_story_finish_date(client): - user_story = f.UserStoryFactory.create(finish_date="2014-10-22") + user_story = f.UserStoryFactory.create(finish_date="2014-10-22T00:00:00+0000") output = io.BytesIO() render_project(user_story.project, output) project_data = json.loads(output.getvalue()) diff --git a/tests/unit/test_mdrender.py b/tests/unit/test_mdrender.py index 90bbe001..08fb9009 100644 --- a/tests/unit/test_mdrender.py +++ b/tests/unit/test_mdrender.py @@ -23,6 +23,7 @@ from taiga.mdrender.extensions import emojify from taiga.mdrender.service import render, cache_by_sha, get_diff_of_htmls, render_and_extract from datetime import datetime +import pytz dummy_project = MagicMock() dummy_project.id = 1 @@ -206,19 +207,21 @@ def test_render_relative_image(): def test_render_triple_quote_code(): - expected_result = "
    print(\"test\")\n
    " + expected_result = '
    print("test")\n
    ' + assert render(dummy_project, "```python\nprint(\"test\")\n```") == expected_result def test_render_triple_quote_and_lang_code(): - expected_result = "
    print(\"test\")\n
    " + expected_result = '
    print("test")\n
    ' + assert render(dummy_project, "```python\nprint(\"test\")\n```") == expected_result def test_cache_by_sha(): @cache_by_sha def test_cache(project, text): - return datetime.now() + return datetime.now(pytz.utc) result1 = test_cache(dummy_project, "test") result2 = test_cache(dummy_project, "test2") From 0ff9aeb119b37612abd172edd6acc9ac4ad9436b Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 18 Oct 2016 12:05:56 +0200 Subject: [PATCH 036/144] Improving contacts endpoints from users API --- taiga/base/api/fields.py | 15 +- taiga/projects/api.py | 12 +- taiga/projects/services/members.py | 18 +- taiga/projects/validators.py | 104 ++++++--- taiga/users/api.py | 12 +- taiga/users/filters.py | 19 +- taiga/users/models.py | 9 + taiga/users/serializers.py | 18 +- taiga/users/utils.py | 44 ++++ .../test_projects_choices_resources.py | 40 ++-- tests/integration/test_memberships.py | 213 +++++++++++++----- 11 files changed, 365 insertions(+), 139 deletions(-) create mode 100644 taiga/users/utils.py diff --git a/taiga/base/api/fields.py b/taiga/base/api/fields.py index a06a7c60..e528a2b6 100644 --- a/taiga/base/api/fields.py +++ b/taiga/base/api/fields.py @@ -618,13 +618,24 @@ class ChoiceField(WritableField): return value +class InvalidEmailValidationError(ValidationError): + pass + + +class InvalidDomainValidationError(ValidationError): + pass + + def validate_user_email_allowed_domains(value): - validators.validate_email(value) + try: + validators.validate_email(value) + except ValidationError as e: + raise InvalidEmailValidationError(e) domain_name = value.split("@")[1] if settings.USER_EMAIL_ALLOWED_DOMAINS and domain_name not in settings.USER_EMAIL_ALLOWED_DOMAINS: - raise ValidationError(_("You email domain is not allowed")) + raise InvalidDomainValidationError(_("You email domain is not allowed")) class EmailField(CharField): diff --git a/taiga/projects/api.py b/taiga/projects/api.py index 31a6cf84..cbe4a897 100644 --- a/taiga/projects/api.py +++ b/taiga/projects/api.py @@ -653,7 +653,6 @@ class ProjectTemplateViewSet(ModelCrudViewSet): class MembershipViewSet(BlockedByProjectMixin, ModelCrudViewSet): model = models.Membership admin_serializer_class = serializers.MembershipAdminSerializer - admin_validator_class = validators.MembershipAdminValidator serializer_class = serializers.MembershipSerializer validator_class = validators.MembershipValidator permission_classes = (permissions.MembershipPermission,) @@ -680,12 +679,6 @@ class MembershipViewSet(BlockedByProjectMixin, ModelCrudViewSet): else: return self.serializer_class - def get_validator_class(self): - if self.action == "create": - return self.admin_validator_class - - return self.validator_class - def _check_if_project_can_have_more_memberships(self, project, total_new_memberships): (can_add_memberships, error_type) = services.check_if_project_can_have_more_memberships( project, @@ -700,7 +693,10 @@ class MembershipViewSet(BlockedByProjectMixin, ModelCrudViewSet): @list_route(methods=["POST"]) def bulk_create(self, request, **kwargs): - validator = validators.MembersBulkValidator(data=request.DATA) + context = { + "request": request + } + validator = validators.MembersBulkValidator(data=request.DATA, context=context) if not validator.is_valid(): return response.BadRequest(validator.errors) diff --git a/taiga/projects/services/members.py b/taiga/projects/services/members.py index 8c9bf265..3cd9b514 100644 --- a/taiga/projects/services/members.py +++ b/taiga/projects/services/members.py @@ -16,11 +16,16 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +from taiga.base.exceptions import ValidationError from taiga.base.utils import db, text +from taiga.users.models import User + +from django.core.validators import validate_email from django.utils.translation import ugettext as _ from .. import models + def get_members_from_bulk(bulk_data, **additional_fields): """Convert `bulk_data` into a list of members. @@ -32,6 +37,15 @@ def get_members_from_bulk(bulk_data, **additional_fields): members = [] for data in bulk_data: data_copy = data.copy() + username = data_copy.pop("username") + try: + validate_email(username) + data_copy["email"] = username + + except ValidationError: + user = User.objects.filter(username=username).first() + data_copy["user_id"] = user.id + data_copy.update(additional_fields) members.append(models.Membership(**data_copy)) return members @@ -40,7 +54,7 @@ def get_members_from_bulk(bulk_data, **additional_fields): def create_members_in_bulk(bulk_data, callback=None, precall=None, **additional_fields): """Create members from `bulk_data`. - :param bulk_data: List of dicts `{"project_id": <>, "role_id": <>, "email": <>}`. + :param bulk_data: List of dicts `{"project_id": <>, "role_id": <>, "username": <>}`. :param callback: Callback to execute after each task save. :param additional_fields: Additional fields when instantiating each task. @@ -116,7 +130,7 @@ def check_if_project_can_have_more_memberships(project, total_new_memberships): """ if project.owner is None: return False, _("Project without owner") - + if project.is_private: total_memberships = project.memberships.count() + total_new_memberships max_memberships = project.owner.max_memberships_private_projects diff --git a/taiga/projects/validators.py b/taiga/projects/validators.py index ec97aadd..18fb95c0 100644 --- a/taiga/projects/validators.py +++ b/taiga/projects/validators.py @@ -16,15 +16,19 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +from django.core.validators import validate_email from django.db.models import Q from django.utils.translation import ugettext as _ from taiga.base.api import serializers from taiga.base.api import validators +from taiga.base.api.fields import validate_user_email_allowed_domains, InvalidEmailValidationError from taiga.base.exceptions import ValidationError from taiga.base.fields import JSONField from taiga.base.fields import PgArrayField -from taiga.users.models import Role +from taiga.users.models import User, Role +from taiga.users import filters as user_filters + from .tagging.fields import TagsField @@ -112,21 +116,24 @@ class IssueTypeValidator(DuplicatedNameInProjectValidator, validators.ModelValid ###################################################### class MembershipValidator(validators.ModelValidator): - email = serializers.EmailField(required=True) + username = serializers.CharField(required=True) + # email = serializers.EmailField(required=False) + # user = serializers.PrimaryKeyRelatedField(required=False) class Meta: model = models.Membership - # IMPORTANT: Maintain the MembershipAdminSerializer Meta up to date - # with this info (excluding here user_email and email) - read_only_fields = ("user",) - exclude = ("token", "email") + read_only_fields = ("user", "email") - def validate_email(self, attrs, source): - project = attrs.get("project", None) + def restore_object(self, attrs, instance=None): + username = attrs.pop("username", None) + obj = super(MembershipValidator, self).restore_object(attrs, instance=instance) + obj.username = username + return obj + + def _validate_member_doesnt_exist(self, attrs, email): + project = attrs.get("project", None if self.object is None else self.object.project) if project is None: - project = self.object.project - - email = attrs[source] + return attrs qs = models.Membership.objects.all() @@ -139,14 +146,12 @@ class MembershipValidator(validators.ModelValidator): Q(project_id=project.id, email=email)) if qs.count() > 0: - raise ValidationError(_("Email address is already taken")) - - return attrs + raise ValidationError(_("The user yet exists in the project")) def validate_role(self, attrs, source): - project = attrs.get("project", None) + project = attrs.get("project", None if self.object is None else self.object.project) if project is None: - project = self.object.project + return attrs role = attrs[source] @@ -155,10 +160,35 @@ class MembershipValidator(validators.ModelValidator): return attrs + def validate_username(self, attrs, source): + username = attrs.get(source, None) + try: + validate_user_email_allowed_domains(username) + + except ValidationError: + # If the validation comes from a request let's check the user is a valid contact + request = self.context.get("request", None) + if request is not None and request.user.is_authenticated(): + valid_usernames = request.user.contacts_visible_by_user(request.user).values_list("username", flat=True) + if username not in valid_usernames: + raise ValidationError(_("The user must be a valid contact")) + + user = User.objects.filter(Q(username=username) | Q(email=username)).first() + if user is not None: + email = user.email + self.user = user + + else: + email = username + + self.email = email + self._validate_member_doesnt_exist(attrs, email) + return attrs + def validate_is_admin(self, attrs, source): - project = attrs.get("project", None) + project = attrs.get("project", None if self.object is None else self.object.project) if project is None: - project = self.object.project + return attrs if (self.object and self.object.user): if self.object.user.id == project.owner_id and not attrs[source]: @@ -171,20 +201,34 @@ class MembershipValidator(validators.ModelValidator): return attrs + def is_valid(self): + errors = super().is_valid() + if hasattr(self, "email") and self.object is not None: + self.object.email = self.email -class MembershipAdminValidator(MembershipValidator): - class Meta: - model = models.Membership - # IMPORTANT: Maintain the MembershipSerializer Meta up to date - # with this info (excluding there user_email and email) - read_only_fields = ("user",) - exclude = ("token",) + if hasattr(self, "user") and self.object is not None: + self.object.user = self.user + + return errors class _MemberBulkValidator(validators.Validator): - email = serializers.EmailField() + username = serializers.CharField() role_id = serializers.IntegerField() + def validate_username(self, attrs, source): + username = attrs.get(source) + try: + validate_user_email_allowed_domains(username) + except InvalidEmailValidationError: + # If the validation comes from a request let's check the user is a valid contact + request = self.context.get("request", None) + if request is not None and request.user.is_authenticated(): + valid_usernames = set(request.user.contacts_visible_by_user(request.user).values_list("username", flat=True)) + if username not in valid_usernames: + raise ValidationError(_("The user must be a valid contact")) + + return attrs class MembersBulkValidator(ProjectExistsValidator, validators.Validator): project_id = serializers.IntegerField() @@ -192,12 +236,10 @@ class MembersBulkValidator(ProjectExistsValidator, validators.Validator): invitation_extra_text = serializers.CharField(required=False, max_length=255) def validate_bulk_memberships(self, attrs, source): - filters = { - "project__id": attrs["project_id"], - "id__in": [r["role_id"] for r in attrs["bulk_memberships"]] - } + project_id = attrs["project_id"] + role_ids = [r["role_id"] for r in attrs["bulk_memberships"]] - if Role.objects.filter(**filters).count() != len(set(filters["id__in"])): + if Role.objects.filter(project_id=project_id, id__in=role_ids).count() != len(set(role_ids)): raise ValidationError(_("Invalid role ids. All roles must belong to the same project.")) return attrs diff --git a/taiga/users/api.py b/taiga/users/api.py index a9f1c957..b67882d6 100644 --- a/taiga/users/api.py +++ b/taiga/users/api.py @@ -46,17 +46,17 @@ from . import validators from . import permissions from . import filters as user_filters from . import services +from . import utils as user_utils from .signals import user_cancel_account as user_cancel_account_signal - class UsersViewSet(ModelCrudViewSet): permission_classes = (permissions.UserPermission,) admin_serializer_class = serializers.UserAdminSerializer serializer_class = serializers.UserSerializer admin_validator_class = validators.UserAdminValidator validator_class = validators.UserValidator - queryset = models.User.objects.all().prefetch_related("memberships") filter_backends = (MembersFilterBackend,) + model = models.User def get_serializer_class(self): if self.action in ["partial_update", "update", "retrieve", "by_username"]: @@ -74,6 +74,12 @@ class UsersViewSet(ModelCrudViewSet): return self.validator_class + def get_queryset(self): + qs = super().get_queryset() + qs = qs.prefetch_related("memberships") + qs = user_utils.attach_extra_info(qs, user=self.request.user) + return qs + def create(self, *args, **kwargs): raise exc.NotSupported() @@ -91,7 +97,7 @@ class UsersViewSet(ModelCrudViewSet): return response.Ok(serializer.data) def retrieve(self, request, *args, **kwargs): - self.object = get_object_or_404(models.User, **kwargs) + self.object = get_object_or_404(self.get_queryset(), **kwargs) self.check_permissions(request, 'retrieve', self.object) serializer = self.get_serializer(self.object) return response.Ok(serializer.data) diff --git a/taiga/users/filters.py b/taiga/users/filters.py index 46dd88ac..03f7b10e 100644 --- a/taiga/users/filters.py +++ b/taiga/users/filters.py @@ -17,13 +17,24 @@ # along with this program. If not, see . from taiga.base.filters import PermissionBasedFilterBackend +from taiga.base.utils.db import to_tsquery + from . import services class ContactsFilterBackend(PermissionBasedFilterBackend): def filter_queryset(self, user, request, queryset, view): - qs = queryset.filter(is_active=True) - project_ids = services.get_visible_project_ids(user, request.user) - qs = qs.filter(memberships__project_id__in=project_ids) - qs = qs.exclude(id=user.id) + qs = user.contacts_visible_by_user(request.user) + q = request.QUERY_PARAMS.get('q', None) + if q: + table = qs.model._meta.db_table + where_clause = (""" + to_tsvector('english_nostop', + coalesce({table}.username, '') || ' ' || + coalesce({table}.full_name) || ' ' || + coalesce({table}.email, '')) @@ to_tsquery('english_nostop', %s) + """.format(table=table)) + + qs = qs.extra(where=[where_clause], params=[to_tsquery(q)]) + return qs.distinct() diff --git a/taiga/users/models.py b/taiga/users/models.py index e0f6a8c9..499b094c 100644 --- a/taiga/users/models.py +++ b/taiga/users/models.py @@ -45,6 +45,8 @@ from taiga.permissions.choices import MEMBERS_PERMISSIONS from taiga.projects.choices import BLOCKED_BY_OWNER_LEAVING from taiga.projects.notifications.choices import NotifyLevel +from . import services + def get_user_model_safe(): """ @@ -258,6 +260,13 @@ class User(AbstractBaseUser, PermissionsMixin): def get_full_name(self): return self.full_name or self.username or self.email + def contacts_visible_by_user(self, user): + qs = User.objects.filter(is_active=True) + project_ids = services.get_visible_project_ids(self, user) + qs = qs.filter(memberships__project_id__in=project_ids) + qs = qs.exclude(id=self.id) + return qs + def save(self, *args, **kwargs): get_token_for_user(self, "cancel_account") super().save(*args, **kwargs) diff --git a/taiga/users/serializers.py b/taiga/users/serializers.py index a720e46e..1f6e0835 100644 --- a/taiga/users/serializers.py +++ b/taiga/users/serializers.py @@ -54,7 +54,6 @@ class UserSerializer(serializers.LightSerializer): big_photo = MethodField() gravatar_id = MethodField() roles = MethodField() - projects_with_me = MethodField() def get_full_name_display(self, obj): return obj.get_full_name() if obj else "" @@ -69,21 +68,10 @@ class UserSerializer(serializers.LightSerializer): return get_user_gravatar_id(user) def get_roles(self, user): - return user.memberships. order_by("role__name").values_list("role__name", flat=True).distinct() + if hasattr(user, "roles_attr"): + return user.roles_attr - def get_projects_with_me(self, user): - request = self.context.get("request", None) - requesting_user = request and request.user or None - - if not requesting_user or not requesting_user.is_authenticated(): - return [] - - else: - project_ids = requesting_user.memberships.values_list("project__id", flat=True) - memberships = user.memberships.filter(project__id__in=project_ids) - project_ids = memberships.values_list("project__id", flat=True) - projects = Project.objects.filter(id__in=project_ids) - return ContactProjectDetailSerializer(projects, many=True).data + return user.memberships.order_by("role__name").values_list("role__name", flat=True).distinct() class UserAdminSerializer(UserSerializer): diff --git a/taiga/users/utils.py b/taiga/users/utils.py new file mode 100644 index 00000000..9101a63c --- /dev/null +++ b/taiga/users/utils.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2016 Anler Hernández +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + + +def attach_roles(queryset, as_field="roles_attr"): + """Attach roles to each object of the queryset. + + :param queryset: A Django user stories queryset object. + :param as_field: Attach the roles as an attribute with this name. + + :return: Queryset object with the additional `as_field` field. + """ + model = queryset.model + sql = """SELECT ARRAY( + SELECT DISTINCT(users_role.name) + FROM projects_membership + INNER JOIN users_role ON users_role.id = projects_membership.role_id + WHERE projects_membership.user_id = {tbl}.id + ORDER BY users_role.name) + """ + sql = sql.format(tbl=model._meta.db_table) + queryset = queryset.extra(select={as_field: sql}) + return queryset + + +def attach_extra_info(queryset, user=None): + queryset = attach_roles(queryset) + return queryset diff --git a/tests/integration/resources_permissions/test_projects_choices_resources.py b/tests/integration/resources_permissions/test_projects_choices_resources.py index 504b6a6f..5399e354 100644 --- a/tests/integration/resources_permissions/test_projects_choices_resources.py +++ b/tests/integration/resources_permissions/test_projects_choices_resources.py @@ -1856,24 +1856,28 @@ def test_membership_update(client, data): membership_data = serializers.MembershipSerializer(data.public_membership).data membership_data["token"] = "test" + membership_data["username"] = data.public_membership.user.email membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'put', public_url, membership_data, users) assert results == [401, 403, 403, 403, 200] membership_data = serializers.MembershipSerializer(data.private_membership1).data membership_data["token"] = "test" + membership_data["username"] = data.private_membership1.user.email membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'put', private1_url, membership_data, users) assert results == [401, 403, 403, 403, 200] membership_data = serializers.MembershipSerializer(data.private_membership2).data membership_data["token"] = "test" + membership_data["username"] = data.private_membership2.user.email membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'put', private2_url, membership_data, users) assert results == [401, 403, 403, 403, 200] membership_data = serializers.MembershipSerializer(data.blocked_membership).data membership_data["token"] = "test" + membership_data["username"] = data.blocked_membership.user.email membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'put', blocked_url, membership_data, users) assert results == [401, 403, 403, 403, 451] @@ -1972,29 +1976,33 @@ def test_membership_create(client, data): ] membership_data = serializers.MembershipSerializer(data.public_membership).data - membership_data["id"] = None - membership_data["email"] = "test1@test.com" + del(membership_data["id"]) + del(membership_data["user"]) + membership_data["username"] = "test1@test.com" membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'post', url, membership_data, users) assert results == [401, 403, 403, 403, 201] membership_data = serializers.MembershipSerializer(data.private_membership1).data - membership_data["id"] = None - membership_data["email"] = "test2@test.com" + del(membership_data["id"]) + del(membership_data["user"]) + membership_data["username"] = "test2@test.com" membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'post', url, membership_data, users) assert results == [401, 403, 403, 403, 201] membership_data = serializers.MembershipSerializer(data.private_membership2).data - membership_data["id"] = None - membership_data["email"] = "test3@test.com" + del(membership_data["id"]) + del(membership_data["user"]) + membership_data["username"] = "test3@test.com" membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'post', url, membership_data, users) assert results == [401, 403, 403, 403, 201] membership_data = serializers.MembershipSerializer(data.blocked_membership).data - membership_data["id"] = None - membership_data["email"] = "test4@test.com" + del(membership_data["id"]) + del(membership_data["user"]) + membership_data["username"] = "test4@test.com" membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'post', url, membership_data, users) assert results == [401, 403, 403, 403, 451] @@ -2014,8 +2022,8 @@ def test_membership_action_bulk_create(client, data): bulk_data = { "project_id": data.public_project.id, "bulk_memberships": [ - {"role_id": data.public_membership.role.pk, "email": "test1@test.com"}, - {"role_id": data.public_membership.role.pk, "email": "test2@test.com"}, + {"role_id": data.public_membership.role.pk, "username": "test1@test.com"}, + {"role_id": data.public_membership.role.pk, "username": "test2@test.com"}, ] } bulk_data = json.dumps(bulk_data) @@ -2025,8 +2033,8 @@ def test_membership_action_bulk_create(client, data): bulk_data = { "project_id": data.private_project1.id, "bulk_memberships": [ - {"role_id": data.private_membership1.role.pk, "email": "test1@test.com"}, - {"role_id": data.private_membership1.role.pk, "email": "test2@test.com"}, + {"role_id": data.private_membership1.role.pk, "username": "test1@test.com"}, + {"role_id": data.private_membership1.role.pk, "username": "test2@test.com"}, ] } bulk_data = json.dumps(bulk_data) @@ -2036,8 +2044,8 @@ def test_membership_action_bulk_create(client, data): bulk_data = { "project_id": data.private_project2.id, "bulk_memberships": [ - {"role_id": data.private_membership2.role.pk, "email": "test1@test.com"}, - {"role_id": data.private_membership2.role.pk, "email": "test2@test.com"}, + {"role_id": data.private_membership2.role.pk, "username": "test1@test.com"}, + {"role_id": data.private_membership2.role.pk, "username": "test2@test.com"}, ] } bulk_data = json.dumps(bulk_data) @@ -2047,8 +2055,8 @@ def test_membership_action_bulk_create(client, data): bulk_data = { "project_id": data.blocked_project.id, "bulk_memberships": [ - {"role_id": data.blocked_membership.role.pk, "email": "test1@test.com"}, - {"role_id": data.blocked_membership.role.pk, "email": "test2@test.com"}, + {"role_id": data.blocked_membership.role.pk, "username": "test1@test.com"}, + {"role_id": data.blocked_membership.role.pk, "username": "test2@test.com"}, ] } bulk_data = json.dumps(bulk_data) diff --git a/tests/integration/test_memberships.py b/tests/integration/test_memberships.py index 70d3d198..b9c3dc95 100644 --- a/tests/integration/test_memberships.py +++ b/tests/integration/test_memberships.py @@ -30,8 +30,8 @@ pytestmark = pytest.mark.django_db def test_get_members_from_bulk(): - data = [{"role_id": "1", "email": "member1@email.com"}, - {"role_id": "1", "email": "member2@email.com"}] + data = [{"role_id": "1", "username": "member1@email.com"}, + {"role_id": "1", "username": "member2@email.com"}] members = services.get_members_from_bulk(data, project_id=1) assert len(members) == 2 @@ -39,10 +39,65 @@ def test_get_members_from_bulk(): assert members[1].email == "member2@email.com" +def test_create_member_using_email(client): + project = f.ProjectFactory() + john = f.UserFactory.create() + joseph = f.UserFactory.create() + tester = f.RoleFactory(project=project, name="Tester") + f.MembershipFactory(project=project, user=john, is_admin=True) + url = reverse("memberships-list") + + data = {"project": project.id, "role": tester.pk, "username": joseph.email} + client.login(john) + response = client.json.post(url, json.dumps(data)) + + assert response.status_code == 201 + assert response.data["email"] == joseph.email + + +def test_create_member_using_username_without_being_contacts(client): + project = f.ProjectFactory() + john = f.UserFactory.create() + joseph = f.UserFactory.create() + tester = f.RoleFactory(project=project, name="Tester") + f.MembershipFactory(project=project, user=john, is_admin=True) + url = reverse("memberships-list") + + data = {"project": project.id, "role": tester.pk, "username": joseph.username} + client.login(john) + response = client.json.post(url, json.dumps(data)) + + assert response.status_code == 400 + assert "The user must be a valid contact" in response.data["username"][0] + + +def test_create_member_using_username_being_contacts(client): + project = f.ProjectFactory() + john = f.UserFactory.create() + joseph = f.UserFactory.create() + tester = f.RoleFactory(project=project, name="Tester", permissions=["view_project"]) + f.MembershipFactory(project=project, user=john, role=tester, is_admin=True) + + # They are members from another project + project2 = f.ProjectFactory() + gamer = f.RoleFactory(project=project2, name="Gamer", permissions=["view_project"]) + f.MembershipFactory(project=project2, user=john, role=gamer, is_admin=True) + f.MembershipFactory(project=project2, user=joseph, role=gamer) + + url = reverse("memberships-list") + + data = {"project": project.id, "role": tester.pk, "username": joseph.username} + client.login(john) + response = client.json.post(url, json.dumps(data)) + + assert response.status_code == 201 + assert response.data["user"] == joseph.id + + def test_create_members_in_bulk(): with mock.patch("taiga.projects.services.members.db") as db: - data = [{"role_id": "1", "email": "member1@email.com"}, - {"role_id": "1", "email": "member2@email.com"}] + data = [{"role_id": "1", "username": "member1@email.com"}, + {"role_id": "1", "username": "member2@email.com"}] members = services.create_members_in_bulk(data, project_id=1) db.save_in_bulk.assert_called_once_with(members, None, None) @@ -51,25 +106,57 @@ def test_api_create_bulk_members(client): project = f.ProjectFactory() john = f.UserFactory.create() joseph = f.UserFactory.create() - tester = f.RoleFactory(project=project, name="Tester") - gamer = f.RoleFactory(project=project, name="Gamer") - f.MembershipFactory(project=project, user=project.owner, is_admin=True) + other = f.UserFactory.create() + tester = f.RoleFactory(project=project, name="Tester", permissions=["view_project"]) + gamer = f.RoleFactory(project=project, name="Gamer", permissions=["view_project"]) + f.MembershipFactory(project=project, user=john, role=tester, is_admin=True) + + # John and Other are members from another project + project2 = f.ProjectFactory() + f.MembershipFactory(project=project2, user=john, role=gamer, is_admin=True) + f.MembershipFactory(project=project2, user=other, role=gamer) url = reverse("memberships-bulk-create") data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": tester.pk, "email": john.email}, - {"role_id": gamer.pk, "email": joseph.email}, + {"role_id": gamer.pk, "username": joseph.email}, + {"role_id": gamer.pk, "username": other.username}, ] } - client.login(project.owner) + client.login(john) response = client.json.post(url, json.dumps(data)) assert response.status_code == 200 - assert response.data[0]["email"] == john.email - assert response.data[1]["email"] == joseph.email + response_user_ids = set([u["user"] for u in response.data]) + user_ids = {other.id, joseph.id} + assert(user_ids.issubset(response_user_ids)) + + +def test_api_create_bulk_members_invalid_user_id(client): + project = f.ProjectFactory() + john = f.UserFactory.create() + joseph = f.UserFactory.create() + other = f.UserFactory.create() + tester = f.RoleFactory(project=project, name="Tester", permissions=["view_project"]) + gamer = f.RoleFactory(project=project, name="Gamer", permissions=["view_project"]) + f.MembershipFactory(project=project, user=john, role=tester, is_admin=True) + + url = reverse("memberships-bulk-create") + + data = { + "project_id": project.id, + "bulk_memberships": [ + {"role_id": gamer.pk, "username": joseph.email}, + {"role_id": gamer.pk, "username": other.username}, + ] + } + client.login(john) + response = client.json.post(url, json.dumps(data)) + + assert response.status_code == 400 + test_api_create_bulk_members_invalid_user_id def test_api_create_bulk_members_with_invalid_roles(client): @@ -85,8 +172,8 @@ def test_api_create_bulk_members_with_invalid_roles(client): data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": tester.pk, "email": john.email}, - {"role_id": gamer.pk, "email": joseph.email}, + {"role_id": tester.pk, "username": john.email}, + {"role_id": gamer.pk, "username": joseph.email}, ] } client.login(project.owner) @@ -109,8 +196,8 @@ def test_api_create_bulk_members_with_allowed_domain(client): data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": tester.pk, "email": "test1@email.com"}, - {"role_id": gamer.pk, "email": "test2@email.com"}, + {"role_id": tester.pk, "username": "test1@email.com"}, + {"role_id": gamer.pk, "username": "test2@email.com"}, ] } client.login(project.owner) @@ -133,16 +220,17 @@ def test_api_create_bulk_members_with_allowed_and_unallowed_domain(client, setti data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": tester.pk, "email": "test@invalid-domain.com"}, - {"role_id": gamer.pk, "email": "test@email.com"}, + {"role_id": tester.pk, "username": "test@invalid-domain.com"}, + {"role_id": gamer.pk, "username": "test@email.com"}, ] } client.login(project.owner) response = client.json.post(url, json.dumps(data)) + print(response.data) assert response.status_code == 400 - assert "email" in response.data["bulk_memberships"][0] - assert "email" not in response.data["bulk_memberships"][1] + assert "username" in response.data["bulk_memberships"][0] + assert "username" not in response.data["bulk_memberships"][1] def test_api_create_bulk_members_with_unallowed_domains(client, settings): @@ -157,16 +245,16 @@ def test_api_create_bulk_members_with_unallowed_domains(client, settings): data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": tester.pk, "email": "test1@invalid-domain.com"}, - {"role_id": gamer.pk, "email": "test2@invalid-domain.com"}, + {"role_id": tester.pk, "username": "test1@invalid-domain.com"}, + {"role_id": gamer.pk, "username": "test2@invalid-domain.com"}, ] } client.login(project.owner) response = client.json.post(url, json.dumps(data)) assert response.status_code == 400 - assert "email" in response.data["bulk_memberships"][0] - assert "email" in response.data["bulk_memberships"][1] + assert "username" in response.data["bulk_memberships"][0] + assert "username" in response.data["bulk_memberships"][1] def test_api_create_bulk_members_without_enough_memberships_private_project_slots_one_project(client): @@ -180,10 +268,10 @@ def test_api_create_bulk_members_without_enough_memberships_private_project_slot data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": role.pk, "email": "test1@test.com"}, - {"role_id": role.pk, "email": "test2@test.com"}, - {"role_id": role.pk, "email": "test3@test.com"}, - {"role_id": role.pk, "email": "test4@test.com"}, + {"role_id": role.pk, "username": "test1@test.com"}, + {"role_id": role.pk, "username": "test2@test.com"}, + {"role_id": role.pk, "username": "test3@test.com"}, + {"role_id": role.pk, "username": "test4@test.com"}, ] } client.login(user) @@ -206,10 +294,10 @@ def test_api_create_bulk_members_for_admin_without_enough_memberships_private_pr data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": role.pk, "email": "test1@test.com"}, - {"role_id": role.pk, "email": "test2@test.com"}, - {"role_id": role.pk, "email": "test3@test.com"}, - {"role_id": role.pk, "email": "test4@test.com"}, + {"role_id": role.pk, "username": "test1@test.com"}, + {"role_id": role.pk, "username": "test2@test.com"}, + {"role_id": role.pk, "username": "test3@test.com"}, + {"role_id": role.pk, "username": "test4@test.com"}, ] } client.login(user) @@ -237,10 +325,10 @@ def test_api_create_bulk_members_with_enough_memberships_private_project_slots_m data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": role.pk, "email": "test1@test.com"}, - {"role_id": role.pk, "email": "test2@test.com"}, - {"role_id": role.pk, "email": "test3@test.com"}, - {"role_id": role.pk, "email": "test4@test.com"}, + {"role_id": role.pk, "username": "test1@test.com"}, + {"role_id": role.pk, "username": "test2@test.com"}, + {"role_id": role.pk, "username": "test3@test.com"}, + {"role_id": role.pk, "username": "test4@test.com"}, ] } client.login(user) @@ -260,10 +348,10 @@ def test_api_create_bulk_members_without_enough_memberships_public_project_slots data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": role.pk, "email": "test1@test.com"}, - {"role_id": role.pk, "email": "test2@test.com"}, - {"role_id": role.pk, "email": "test3@test.com"}, - {"role_id": role.pk, "email": "test4@test.com"}, + {"role_id": role.pk, "username": "test1@test.com"}, + {"role_id": role.pk, "username": "test2@test.com"}, + {"role_id": role.pk, "username": "test3@test.com"}, + {"role_id": role.pk, "username": "test4@test.com"}, ] } client.login(user) @@ -290,10 +378,10 @@ def test_api_create_bulk_members_with_enough_memberships_public_project_slots_mu data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": role.pk, "email": "test1@test.com"}, - {"role_id": role.pk, "email": "test2@test.com"}, - {"role_id": role.pk, "email": "test3@test.com"}, - {"role_id": role.pk, "email": "test4@test.com"}, + {"role_id": role.pk, "username": "test1@test.com"}, + {"role_id": role.pk, "username": "test2@test.com"}, + {"role_id": role.pk, "username": "test3@test.com"}, + {"role_id": role.pk, "username": "test4@test.com"}, ] } client.login(user) @@ -312,7 +400,7 @@ def test_api_create_bulk_members_with_extra_text(client, outbox): data = { "project_id": project.id, "bulk_memberships": [ - {"role_id": tester.pk, "email": "john@email.com"}, + {"role_id": tester.pk, "username": "john@email.com"}, ], "invitation_extra_text": invitation_extra_text } @@ -350,7 +438,7 @@ def test_api_invite_existing_user(client, outbox): client.login(role.project.owner) url = reverse("memberships-list") - data = {"role": role.pk, "project": role.project.pk, "email": user.email} + data = {"role": role.pk, "project": role.project.pk, "username": user.email} response = client.json.post(url, json.dumps(data)) @@ -364,7 +452,7 @@ def test_api_invite_existing_user(client, outbox): assert "Added to the project" in message.subject -def test_api_create_invalid_membership_email_failing(client): +def test_api_create_invalid_membership_no_email_no_user(client): "Should not create the invitation linked to that user" user = f.UserFactory.create() role = f.RoleFactory.create() @@ -388,7 +476,7 @@ def test_api_create_invalid_membership_role_doesnt_exist_in_the_project(client): client.login(project.owner) url = reverse("memberships-list") - data = {"role": role.pk, "project": project.pk, "email": user.email} + data = {"role": role.pk, "project": project.pk, "username": user.email} response = client.json.post(url, json.dumps(data)) @@ -404,7 +492,7 @@ def test_api_create_membership(client): client.login(membership.user) url = reverse("memberships-list") - data = {"role": role.pk, "project": role.project.pk, "email": user.email} + data = {"role": role.pk, "project": role.project.pk, "username": user.email} response = client.json.post(url, json.dumps(data)) assert response.status_code == 201 @@ -419,11 +507,11 @@ def test_api_create_membership_with_unallowed_domain(client, settings): client.login(membership.user) url = reverse("memberships-list") - data = {"role": role.pk, "project": role.project.pk, "email": "test@invalid-email.com"} + data = {"role": role.pk, "project": role.project.pk, "username": "test@invalid-email.com"} response = client.json.post(url, json.dumps(data)) assert response.status_code == 400 - assert "email" in response.data + assert "username" in response.data def test_api_create_membership_with_allowed_domain(client, settings): @@ -434,7 +522,7 @@ def test_api_create_membership_with_allowed_domain(client, settings): client.login(membership.user) url = reverse("memberships-list") - data = {"role": role.pk, "project": role.project.pk, "email": "test@email.com"} + data = {"role": role.pk, "project": role.project.pk, "username": "test@email.com"} response = client.json.post(url, json.dumps(data)) assert response.status_code == 201 @@ -449,7 +537,7 @@ def test_api_create_membership_without_enough_memberships_private_project_slots_ client.login(user) url = reverse("memberships-list") - data = {"role": role.pk, "project": project.pk, "email": "test@test.com"} + data = {"role": role.pk, "project": project.pk, "username": "test@test.com"} response = client.json.post(url, json.dumps(data)) assert response.status_code == 400 @@ -470,7 +558,7 @@ def test_api_create_membership_with_enough_memberships_private_project_slots_mul client.login(user) url = reverse("memberships-list") - data = {"role": role.pk, "project": project.pk, "email": "test@test.com"} + data = {"role": role.pk, "project": project.pk, "username": "test@test.com"} response = client.json.post(url, json.dumps(data)) assert response.status_code == 201 @@ -484,7 +572,7 @@ def test_api_create_membership_without_enough_memberships_public_project_slots_o client.login(user) url = reverse("memberships-list") - data = {"role": role.pk, "project": project.pk, "email": "test@test.com"} + data = {"role": role.pk, "project": project.pk, "username": "test@test.com"} response = client.json.post(url, json.dumps(data)) assert response.status_code == 400 @@ -505,7 +593,7 @@ def test_api_create_membership_with_enough_memberships_public_project_slots_mult client.login(user) url = reverse("memberships-list") - data = {"role": role.pk, "project": project.pk, "email": "test@test.com"} + data = {"role": role.pk, "project": project.pk, "username": "test@test.com"} response = client.json.post(url, json.dumps(data)) assert response.status_code == 201 @@ -515,11 +603,20 @@ def test_api_edit_membership(client): membership = f.MembershipFactory(is_admin=True) client.login(membership.user) url = reverse("memberships-detail", args=[membership.id]) - data = {"email": "new@email.com"} + data = {"username": "new@email.com"} response = client.json.patch(url, json.dumps(data)) - assert response.status_code == 200 + +def test_api_edit_membership(client): + membership = f.MembershipFactory(is_admin=True) + client.login(membership.user) + url = reverse("memberships-detail", args=[membership.id]) + data = {"username": "new@email.com"} + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 200 + + def test_api_change_owner_membership_to_no_admin_return_error(client): project = f.ProjectFactory() membership_owner = f.MembershipFactory(project=project, user=project.owner, is_admin=True) From ec2d11c71aa5bb70373ff70ac9fa2f1b1a3f0877 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 24 Oct 2016 14:43:14 +0200 Subject: [PATCH 037/144] US 2219: Get in touch with the project admins --- CHANGELOG.md | 4 ++ settings/common.py | 1 + .../templates/emails/base-body-html.jinja | 33 ++++++--- taiga/projects/contact/admin.py | 32 +++++++++ taiga/projects/contact/api.py | 49 +++++++++++++ .../contact/migrations/0001_initial.py | 35 ++++++++++ taiga/projects/contact/migrations/__init__.py | 0 taiga/projects/contact/models.py | 39 +++++++++++ taiga/projects/contact/permissions.py | 29 ++++++++ taiga/projects/contact/services.py | 45 ++++++++++++ .../contact_notification-body-html.jinja | 24 +++++++ .../contact_notification-body-text.jinja | 9 +++ .../emails/contact_notification-subject.jinja | 3 + taiga/projects/contact/validators.py | 28 ++++++++ .../migrations/0056_auto_20161110_1518.py | 25 +++++++ taiga/projects/models.py | 8 ++- taiga/projects/serializers.py | 2 + taiga/routers.py | 4 ++ .../resources_permissions/test_contact.py | 50 +++++++++++++ tests/integration/test_contact.py | 70 +++++++++++++++++++ 20 files changed, 479 insertions(+), 11 deletions(-) create mode 100644 taiga/projects/contact/admin.py create mode 100644 taiga/projects/contact/api.py create mode 100644 taiga/projects/contact/migrations/0001_initial.py create mode 100644 taiga/projects/contact/migrations/__init__.py create mode 100644 taiga/projects/contact/models.py create mode 100644 taiga/projects/contact/permissions.py create mode 100644 taiga/projects/contact/services.py create mode 100644 taiga/projects/contact/templates/emails/contact_notification-body-html.jinja create mode 100644 taiga/projects/contact/templates/emails/contact_notification-body-text.jinja create mode 100644 taiga/projects/contact/templates/emails/contact_notification-subject.jinja create mode 100644 taiga/projects/contact/validators.py create mode 100644 taiga/projects/migrations/0056_auto_20161110_1518.py create mode 100644 tests/integration/resources_permissions/test_contact.py create mode 100644 tests/integration/test_contact.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 108833e9..e206529d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog # +## 3.1.0 ¿¿?? (¿¿??) + +### Features +- Contact with the project: if the projects have this module enabled Taiga users can contact them. ## 3.0.0 Stellaria Borealis (2016-10-02) diff --git a/settings/common.py b/settings/common.py index 641d888f..747141ec 100644 --- a/settings/common.py +++ b/settings/common.py @@ -306,6 +306,7 @@ INSTALLED_APPS = [ "taiga.projects.tasks", "taiga.projects.issues", "taiga.projects.wiki", + "taiga.projects.contact", "taiga.searches", "taiga.timeline", "taiga.mdrender", diff --git a/taiga/base/templates/emails/base-body-html.jinja b/taiga/base/templates/emails/base-body-html.jinja index ba857bb7..c566f25a 100644 --- a/taiga/base/templates/emails/base-body-html.jinja +++ b/taiga/base/templates/emails/base-body-html.jinja @@ -157,7 +157,6 @@ padding-bottom:20px; padding-left:20px; padding-top:20px; - text-align:center; } /** @@ -188,6 +187,13 @@ background: #aad400; } + hr { + width: 90%; + margin: 0 auto; + border-bottom: 1px solid #e1e1e1; + border-top: 0; + } + .bodyContent img{ display:inline; height:auto; @@ -392,20 +398,29 @@
    + +
    - - - Taiga logo + + + Taiga logo - {% block body %} - {% endblock %} +
    + + + + + + + {% block social %} {% endblock %} diff --git a/taiga/projects/contact/admin.py b/taiga/projects/contact/admin.py new file mode 100644 index 00000000..89450c82 --- /dev/null +++ b/taiga/projects/contact/admin.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.contrib import admin + +from . import models + + +class ContactEntryAdmin(admin.ModelAdmin): + list_display = ["created_date", "project", "user"] + list_display_links = list_display + list_filter = ["created_date", ] + date_hierarchy = "created_date" + ordering = ("-created_date", "id") + search_fields = ("project__name", "project__slug", "user__username", "user__email", "user__full_name") + +admin.site.register(models.ContactEntry, ContactEntryAdmin) diff --git a/taiga/projects/contact/api.py b/taiga/projects/contact/api.py new file mode 100644 index 00000000..9f5c532a --- /dev/null +++ b/taiga/projects/contact/api.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from taiga.base import status +from taiga.base.api.mixins import CreateModelMixin, BlockedByProjectMixin +from taiga.base.api.viewsets import GenericViewSet + +from . import models +from . import permissions +from . import services +from . import validators + +from django.conf import settings + + +class ContactViewSet(BlockedByProjectMixin, CreateModelMixin, GenericViewSet): + permission_classes = (permissions.ContactPermission,) + validator_class = validators.ContactEntryValidator + model = models.ContactEntry + + def create(self, *args, **kwargs): + response = super().create(*args, **kwargs) + + if response.status_code == status.HTTP_201_CREATED: + if settings.CELERY_ENABLED: + services.send_contact_email.delay(self.object.id) + else: + services.send_contact_email(self.object.id) + + return response + + def pre_save(self, obj): + obj.user = self.request.user + super().pre_save(obj) diff --git a/taiga/projects/contact/migrations/0001_initial.py b/taiga/projects/contact/migrations/0001_initial.py new file mode 100644 index 00000000..f06eb96b --- /dev/null +++ b/taiga/projects/contact/migrations/0001_initial.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-11-10 15:18 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('projects', '0056_auto_20161110_1518'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='ContactEntry', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('comment', models.TextField(verbose_name='comment')), + ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='created date')), + ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='contact_entries', to='projects.Project', verbose_name='project')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='contact_entries', to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'contact entry', + 'ordering': ['-created_date', 'id'], + 'verbose_name_plural': 'contact entries', + }, + ), + ] diff --git a/taiga/projects/contact/migrations/__init__.py b/taiga/projects/contact/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/taiga/projects/contact/models.py b/taiga/projects/contact/models.py new file mode 100644 index 00000000..c9a210cf --- /dev/null +++ b/taiga/projects/contact/models.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.conf import settings +from django.db import models +from django.utils.translation import ugettext_lazy as _ + + +class ContactEntry(models.Model): + user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name="contact_entries", + verbose_name=_("user")) + + project = models.ForeignKey("projects.Project", null=False, blank=False, + related_name="contact_entries", verbose_name=_("project")) + + comment = models.TextField(null=False, blank=False, verbose_name=_("comment")) + + created_date = models.DateTimeField(null=False, blank=False, auto_now_add=True, + verbose_name=_("created date")) + + class Meta: + verbose_name = "contact entry" + verbose_name_plural = "contact entries" + ordering = ["-created_date", "id"] diff --git a/taiga/projects/contact/permissions.py b/taiga/projects/contact/permissions.py new file mode 100644 index 00000000..d8111b1d --- /dev/null +++ b/taiga/projects/contact/permissions.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from taiga.base.api.permissions import PermissionComponent +from taiga.base.api.permissions import TaigaResourcePermission + + +class IsContactActivated(PermissionComponent): + def check_permissions(self, request, view, obj=None): + return request.user.is_authenticated() and obj.project.is_contact_activated + + +class ContactPermission(TaigaResourcePermission): + create_perms = IsContactActivated() diff --git a/taiga/projects/contact/services.py b/taiga/projects/contact/services.py new file mode 100644 index 00000000..0fe6ed7e --- /dev/null +++ b/taiga/projects/contact/services.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from taiga.base.mails import mail_builder +from taiga.celery import app +from taiga.front.templatetags.functions import resolve as resolve_front_url +from taiga.users.services import get_user_photo_url + +from . import models + + +@app.task +def send_contact_email(contact_entry_id): + contact_entry = models.ContactEntry.objects.filter(id=contact_entry_id).first() + if contact_entry is None: + return + + ctx = { + "comment": contact_entry.comment, + "full_name": contact_entry.user.get_full_name(), + "project_name": contact_entry.project.name, + "photo_url": get_user_photo_url(contact_entry.user), + "user_profile_url": resolve_front_url("user", contact_entry.user.username), + "project_settings_url": resolve_front_url("project-admin", contact_entry.project.slug), + } + users = contact_entry.project.get_users().exclude(id=contact_entry.user_id) + addresses = ", ".join([u.email for u in users]) + email = mail_builder.contact_notification(addresses, ctx) + email.extra_headers["Reply-To"] = ", ".join([contact_entry.user.email]) + email.send() diff --git a/taiga/projects/contact/templates/emails/contact_notification-body-html.jinja b/taiga/projects/contact/templates/emails/contact_notification-body-html.jinja new file mode 100644 index 00000000..257a5905 --- /dev/null +++ b/taiga/projects/contact/templates/emails/contact_notification-body-html.jinja @@ -0,0 +1,24 @@ +{% extends "emails/base-body-html.jinja" %} + +{% block body %} +

    + {% if photo_url %} + + {{ full_name }} + + {% endif %} + {% trans full_name=full_name, comment=comment, project_name=project_name %} + {{ full_name }} has written to {{ project_name }} + {% endtrans %} +

    + +

    {{ comment }}

    + +
    + +

    + {% trans project_name=project_name %} + You are receiving this message because you are listed as administrator of the project titled {{ project_name }}. If you don't want members of the Taiga community contacting your project, please update your project settings to prevent such contacts. Regular communications amongst members of the project will not be affected. + {% endtrans %} +

    +{% endblock %} diff --git a/taiga/projects/contact/templates/emails/contact_notification-body-text.jinja b/taiga/projects/contact/templates/emails/contact_notification-body-text.jinja new file mode 100644 index 00000000..63392957 --- /dev/null +++ b/taiga/projects/contact/templates/emails/contact_notification-body-text.jinja @@ -0,0 +1,9 @@ +{% trans full_name=full_name, comment=comment, project_name=project_name %} +{{ full_name }} has written to {{ project_name }} +{% endtrans %} +--------- +{{ comment }} +--------- +{% trans project_name=project_name %} +You are receiving this message because you are listed as administrator of the project titled {{ project_name }}. If you don't want members of the Taiga community contacting your project, please update your project settings +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from taiga.base.api import validators + +from . import models + + +class ContactEntryValidator(validators.ModelValidator): + + class Meta: + model = models.ContactEntry + read_only_fields = ("user", "created_date", ) diff --git a/taiga/projects/migrations/0056_auto_20161110_1518.py b/taiga/projects/migrations/0056_auto_20161110_1518.py new file mode 100644 index 00000000..1c03c79c --- /dev/null +++ b/taiga/projects/migrations/0056_auto_20161110_1518.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-11-10 15:18 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0055_json_to_jsonb'), + ] + + operations = [ + migrations.AddField( + model_name='project', + name='is_contact_activated', + field=models.BooleanField(default=True, verbose_name='active contact'), + ), + migrations.AddField( + model_name='projecttemplate', + name='is_contact_activated', + field=models.BooleanField(default=True, verbose_name='active contact'), + ), + ] diff --git a/taiga/projects/models.py b/taiga/projects/models.py index 67f9e50f..46a8a694 100644 --- a/taiga/projects/models.py +++ b/taiga/projects/models.py @@ -164,7 +164,8 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): total_milestones = models.IntegerField(null=True, blank=True, verbose_name=_("total of milestones")) total_story_points = models.FloatField(null=True, blank=True, verbose_name=_("total story points")) - + is_contact_activated = models.BooleanField(default=True, null=False, blank=True, + verbose_name=_("active contact")) is_epics_activated = models.BooleanField(default=False, null=False, blank=True, verbose_name=_("active epics panel")) is_backlog_activated = models.BooleanField(default=True, null=False, blank=True, @@ -734,7 +735,8 @@ class ProjectTemplate(models.Model): default_owner_role = models.CharField(max_length=50, null=False, blank=False, verbose_name=_("default owner's role")) - + is_contact_activated = models.BooleanField(default=True, null=False, blank=True, + verbose_name=_("active contact")) is_epics_activated = models.BooleanField(default=False, null=False, blank=True, verbose_name=_("active epics panel")) is_backlog_activated = models.BooleanField(default=True, null=False, blank=True, @@ -780,6 +782,7 @@ class ProjectTemplate(models.Model): super().save(*args, **kwargs) def load_data_from_project(self, project): + self.is_contact_activated = project.is_contact_activated self.is_epics_activated = project.is_epics_activated self.is_backlog_activated = project.is_backlog_activated self.is_kanban_activated = project.is_kanban_activated @@ -896,6 +899,7 @@ class ProjectTemplate(models.Model): raise Exception("Project need an id (must be a saved project)") project.creation_template = self + project.is_contact_activated = self.is_contact_activated project.is_epics_activated = self.is_epics_activated project.is_backlog_activated = self.is_backlog_activated project.is_kanban_activated = self.is_kanban_activated diff --git a/taiga/projects/serializers.py b/taiga/projects/serializers.py index eb7b2e54..6bdb05e5 100644 --- a/taiga/projects/serializers.py +++ b/taiga/projects/serializers.py @@ -213,6 +213,7 @@ class ProjectSerializer(serializers.LightSerializer): members = MethodField() total_milestones = Field() total_story_points = Field() + is_contact_activated = Field() is_epics_activated = Field() is_backlog_activated = Field() is_kanban_activated = Field() @@ -474,6 +475,7 @@ class ProjectTemplateSerializer(serializers.LightSerializer): created_date = Field() modified_date = Field() default_owner_role = Field() + is_contact_activated = Field() is_epics_activated = Field() is_backlog_activated = Field() is_kanban_activated = Field() diff --git a/taiga/routers.py b/taiga/routers.py index 92f2d58c..f59bea7e 100644 --- a/taiga/routers.py +++ b/taiga/routers.py @@ -223,6 +223,10 @@ router.register(r"history/task", TaskHistory, base_name="task-history") router.register(r"history/issue", IssueHistory, base_name="issue-history") router.register(r"history/wiki", WikiHistory, base_name="wiki-history") +# Contact +from taiga.projects.contact.api import ContactViewSet +router.register(r"contact", ContactViewSet, base_name="contact") + # Timelines from taiga.timeline.api import ProfileTimeline diff --git a/tests/integration/resources_permissions/test_contact.py b/tests/integration/resources_permissions/test_contact.py new file mode 100644 index 00000000..dca0081e --- /dev/null +++ b/tests/integration/resources_permissions/test_contact.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2016 Anler Hernández +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.core.urlresolvers import reverse + +from tests import factories as f +from tests.utils import helper_test_http_method + +from taiga.base.utils import json + +import pytest +pytestmark = pytest.mark.django_db + + +@pytest.fixture +def data(): + m = type("Models", (object,), {}) + m.user = f.UserFactory.create() + m.project = f.ProjectFactory.create() + f.MembershipFactory(user=m.project.owner, project=m.project, is_admin=True) + + return m + + +def test_contact_create(client, data): + url = reverse("contact-list") + users = [None, data.user] + + contact_data = json.dumps({ + "project": data.project.id, + "comment": "Testing comment" + }) + results = helper_test_http_method(client, 'post', url, contact_data, users) + assert results == [401, 201] diff --git a/tests/integration/test_contact.py b/tests/integration/test_contact.py new file mode 100644 index 00000000..4720ee37 --- /dev/null +++ b/tests/integration/test_contact.py @@ -0,0 +1,70 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2016 Anler Hernández +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.core import mail +from django.core.urlresolvers import reverse + +from tests import factories as f + +from taiga.base.utils import json + +import pytest +pytestmark = pytest.mark.django_db + + +def test_create_comment(client): + user = f.UserFactory.create() + project = f.ProjectFactory.create() + f.MembershipFactory(user=project.owner, project=project, is_admin=True) + + url = reverse("contact-list") + + contact_data = json.dumps({ + "project": project.id, + "comment": "Testing comment" + }) + + client.login(user) + + assert len(mail.outbox) == 0 + response = client.post(url, contact_data, content_type="application/json") + assert response.status_code == 201 + assert len(mail.outbox) == 1 + assert mail.outbox[0].to == [project.owner.email] + + + +def test_create_comment_disabled(client): + user = f.UserFactory.create() + project = f.ProjectFactory.create() + project.is_contact_activated = False + project.save() + f.MembershipFactory(user=project.owner, project=project, is_admin=True) + + url = reverse("contact-list") + + contact_data = json.dumps({ + "project": project.id, + "comment": "Testing comment" + }) + + client.login(user) + + response = client.post(url, contact_data, content_type="application/json") + assert response.status_code == 403 From 8b6356f80e4078c7234049540d99bf91efbd6377 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 11 Nov 2016 08:30:22 +0100 Subject: [PATCH 038/144] Cleaning code --- taiga/projects/validators.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/taiga/projects/validators.py b/taiga/projects/validators.py index 18fb95c0..32bafe35 100644 --- a/taiga/projects/validators.py +++ b/taiga/projects/validators.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from django.core.validators import validate_email from django.db.models import Q from django.utils.translation import ugettext as _ @@ -27,7 +26,6 @@ from taiga.base.exceptions import ValidationError from taiga.base.fields import JSONField from taiga.base.fields import PgArrayField from taiga.users.models import User, Role -from taiga.users import filters as user_filters from .tagging.fields import TagsField @@ -117,8 +115,6 @@ class IssueTypeValidator(DuplicatedNameInProjectValidator, validators.ModelValid class MembershipValidator(validators.ModelValidator): username = serializers.CharField(required=True) - # email = serializers.EmailField(required=False) - # user = serializers.PrimaryKeyRelatedField(required=False) class Meta: model = models.Membership @@ -230,6 +226,7 @@ class _MemberBulkValidator(validators.Validator): return attrs + class MembersBulkValidator(ProjectExistsValidator, validators.Validator): project_id = serializers.IntegerField() bulk_memberships = _MemberBulkValidator(many=True) From 4f0323eeca61b195f9830de578ed3373e080b15d Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 11 Nov 2016 09:17:18 +0100 Subject: [PATCH 039/144] Updating changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e206529d..88c5c4a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### Features - Contact with the project: if the projects have this module enabled Taiga users can contact them. +- Memberships API endpoints now allows using usernames and emails instead of using only emails +- Contacts API search by free text: consulting the username, full name and email ## 3.0.0 Stellaria Borealis (2016-10-02) From 9302936ddd0333e0a2e37ad8046cb181748b1016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 14 Nov 2016 10:36:47 +0100 Subject: [PATCH 040/144] Update djmail to 0.13.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 761b1627..3307aed7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ Pillow==3.4.2 pytz==2016.7 six==1.10.0 amqp==2.1.1 -djmail==0.13.0 +djmail==0.13.1 django-jinja==2.2.1 jinja2==2.8 pygments==2.1.3 From 4dcdbc4c73b68a6da23680502f291145cce0a65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Fri, 11 Nov 2016 13:06:02 +0100 Subject: [PATCH 041/144] Fix #4756: PATCH and PUT can't change user email --- taiga/users/api.py | 6 ++-- tests/integration/test_users.py | 60 +++++++++++++++++++++++++++++---- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/taiga/users/api.py b/taiga/users/api.py index b67882d6..b3e2e707 100644 --- a/taiga/users/api.py +++ b/taiga/users/api.py @@ -112,7 +112,7 @@ class UsersViewSet(ModelCrudViewSet): user = self.get_object() self.check_permissions(request, "update", user) - new_email = request.DATA.get('email', None) + new_email = request.DATA.pop('email', None) if new_email is not None: valid_new_email = True duplicated_email = models.User.objects.filter(email=new_email).exists() @@ -143,9 +143,7 @@ class UsersViewSet(ModelCrudViewSet): ) email.send() - ret = super().partial_update(request, *args, **kwargs) - - return ret + return super().partial_update(request, *args, **kwargs) def destroy(self, request, pk=None): user = self.get_object() diff --git a/tests/integration/test_users.py b/tests/integration/test_users.py index 3accebb7..cad6507c 100644 --- a/tests/integration/test_users.py +++ b/tests/integration/test_users.py @@ -47,6 +47,10 @@ import os pytestmark = pytest.mark.django_db +############################## +## Create user +############################## + def test_users_create_through_standard_api(client): user = f.UserFactory.create(is_superuser=True) @@ -62,6 +66,10 @@ def test_users_create_through_standard_api(client): assert response.status_code == 405 +############################## +## Change email +############################## + def test_update_user_with_same_email(client): user = f.UserFactory.create(email="same@email.com") url = reverse('users-detail', kwargs={"pk": user.pk}) @@ -73,6 +81,9 @@ def test_update_user_with_same_email(client): assert response.status_code == 400 assert response.data['_error_message'] == 'Duplicated email' + user.refresh_from_db() + assert user.email == "same@email.com" + def test_update_user_with_duplicated_email(client): f.UserFactory.create(email="one@email.com") @@ -86,6 +97,9 @@ def test_update_user_with_duplicated_email(client): assert response.status_code == 400 assert response.data['_error_message'] == 'Duplicated email' + user.refresh_from_db() + assert user.email == "two@email.com" + def test_update_user_with_invalid_email(client): user = f.UserFactory.create(email="my@email.com") @@ -98,6 +112,9 @@ def test_update_user_with_invalid_email(client): assert response.status_code == 400 assert response.data['_error_message'] == 'Not valid email' + user.refresh_from_db() + assert user.email == "my@email.com" + def test_update_user_with_unallowed_domain_email(client, settings): settings.USER_EMAIL_ALLOWED_DOMAINS = ['email.com'] @@ -111,6 +128,8 @@ def test_update_user_with_unallowed_domain_email(client, settings): assert response.status_code == 400 assert response.data['_error_message'] == 'Not valid email' + user.refresh_from_db() + assert user.email == "my@email.com" def test_update_user_with_allowed_domain_email(client, settings): settings.USER_EMAIL_ALLOWED_DOMAINS = ['email.com'] @@ -123,7 +142,9 @@ def test_update_user_with_allowed_domain_email(client, settings): response = client.patch(url, json.dumps(data), content_type="application/json") assert response.status_code == 200 - user = models.User.objects.get(pk=user.id) + + user.refresh_from_db() + assert user.email == "old@email.com" assert user.email_token is not None assert user.new_email == "new@email.com" @@ -137,13 +158,14 @@ def test_update_user_with_valid_email(client): response = client.patch(url, json.dumps(data), content_type="application/json") assert response.status_code == 200 - user = models.User.objects.get(pk=user.id) + user.refresh_from_db() + assert user.email == "old@email.com" assert user.email_token is not None assert user.new_email == "new@email.com" def test_validate_requested_email_change(client): - user = f.UserFactory.create(email_token="change_email_token", new_email="new@email.com") + user = f.UserFactory.create(email="old@email.com", email_token="change_email_token", new_email="new@email.com") url = reverse('users-change-email') data = {"email_token": "change_email_token"} @@ -151,24 +173,26 @@ def test_validate_requested_email_change(client): response = client.post(url, json.dumps(data), content_type="application/json") assert response.status_code == 204 - user = models.User.objects.get(pk=user.id) + user.refresh_from_db() assert user.email_token is None assert user.new_email is None assert user.email == "new@email.com" + def test_validate_requested_email_change_for_anonymous_user(client): - user = f.UserFactory.create(email_token="change_email_token", new_email="new@email.com") + user = f.UserFactory.create(email="old@email.com", email_token="change_email_token", new_email="new@email.com") url = reverse('users-change-email') data = {"email_token": "change_email_token"} response = client.post(url, json.dumps(data), content_type="application/json") assert response.status_code == 204 - user = models.User.objects.get(pk=user.id) + user.refresh_from_db() assert user.email_token is None assert user.new_email is None assert user.email == "new@email.com" + def test_validate_requested_email_change_without_token(client): user = f.UserFactory.create(email_token="change_email_token", new_email="new@email.com") url = reverse('users-change-email') @@ -190,6 +214,10 @@ def test_validate_requested_email_change_with_invalid_token(client): assert response.status_code == 400 +############################## +## Delete user +############################## + def test_delete_self_user(client): user = f.UserFactory.create() url = reverse('users-detail', kwargs={"pk": user.pk}) @@ -229,6 +257,10 @@ def test_delete_self_user_remove_membership_projects(client): assert project.memberships.all().count() == 0 +############################## +## Cancel account +############################## + def test_cancel_self_user_with_valid_token(client): user = f.UserFactory.create() url = reverse('users-cancel') @@ -252,6 +284,10 @@ def test_cancel_self_user_with_invalid_token(client): assert response.status_code == 400 +############################## +## Avatar +############################## + def test_change_avatar(client): url = reverse('users-change-avatar') @@ -346,6 +382,10 @@ def test_remove_avatar(client): assert not any(list(map(os.path.exists, original_photo_paths))) +############################## +## Contacts +############################## + def test_list_contacts_private_projects(client): project = f.ProjectFactory.create() user_1 = f.UserFactory.create() @@ -406,6 +446,10 @@ def test_list_contacts_public_projects(client): assert response_content[0]["id"] == user_2.id +############################## +## Mail permissions +############################## + def test_mail_permissions(client): user_1 = f.UserFactory.create(is_superuser=True) user_2 = f.UserFactory.create() @@ -445,6 +489,10 @@ def test_mail_permissions(client): assert "email" in response.data +############################## +## Watchers, Likes and Votes +############################## + def test_get_watched_list(): fav_user = f.UserFactory() viewer_user = f.UserFactory() From 78510cd67683ae597c05e947113f84209ef22b3b Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 15 Nov 2016 11:31:41 +0100 Subject: [PATCH 042/144] Fixing error on task update --- taiga/projects/tasks/api.py | 1 - taiga/projects/tasks/signals.py | 2 ++ taiga/projects/userstories/signals.py | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/taiga/projects/tasks/api.py b/taiga/projects/tasks/api.py index 2a10620d..d1e2e95c 100644 --- a/taiga/projects/tasks/api.py +++ b/taiga/projects/tasks/api.py @@ -258,7 +258,6 @@ class TaskViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, Wa return response.Ok(tasks_serialized.data) - def _bulk_update_order(self, order_field, request, **kwargs): validator = validators.UpdateTasksOrderBulkValidator(data=request.DATA) if not validator.is_valid(): diff --git a/taiga/projects/tasks/signals.py b/taiga/projects/tasks/signals.py index 4b9f7af1..dfb698e5 100644 --- a/taiga/projects/tasks/signals.py +++ b/taiga/projects/tasks/signals.py @@ -39,6 +39,7 @@ def try_to_close_or_open_us_and_milestone_when_create_or_edit_task(sender, insta _try_to_close_or_open_us_when_create_or_edit_task(instance) _try_to_close_or_open_milestone_when_create_or_edit_task(instance) + def try_to_close_or_open_us_and_milestone_when_delete_task(sender, instance, **kwargs): _try_to_close_or_open_us_when_delete_task(instance) _try_to_close_milestone_when_delete_task(instance) @@ -96,6 +97,7 @@ def _try_to_close_milestone_when_delete_task(instance): if instance.milestone_id and services.calculate_milestone_is_closed(instance.milestone): services.close_milestone(instance.milestone) + #################################### # Signals for set finished date #################################### diff --git a/taiga/projects/userstories/signals.py b/taiga/projects/userstories/signals.py index fc1fdacc..ba643b61 100644 --- a/taiga/projects/userstories/signals.py +++ b/taiga/projects/userstories/signals.py @@ -59,8 +59,9 @@ def update_role_points_when_create_or_edit_us(sender, instance, **kwargs): def update_milestone_of_tasks_when_edit_us(sender, instance, created, **kwargs): if not created: - instance.tasks.exclude(milestone=instance.milestone).update(milestone=instance.milestone) - for task in instance.tasks.all(): + tasks = instance.tasks.exclude(milestone=instance.milestone) + tasks.update(milestone=instance.milestone) + for task in tasks: take_snapshot(task) From c7d2e0c1745e3d78b4599ea9fd2b26a413f1515b Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 15 Nov 2016 12:13:37 +0100 Subject: [PATCH 043/144] Fixing multiple assigned to filter on tasks --- taiga/projects/tasks/api.py | 1 - 1 file changed, 1 deletion(-) diff --git a/taiga/projects/tasks/api.py b/taiga/projects/tasks/api.py index d1e2e95c..39fb8cbc 100644 --- a/taiga/projects/tasks/api.py +++ b/taiga/projects/tasks/api.py @@ -64,7 +64,6 @@ class TaskViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, Wa "milestone", "project", "project__slug", - "assigned_to", "status__is_closed"] def get_serializer_class(self, *args, **kwargs): From 3be846ef47b720d34eaf57e63abad5b4dbbda8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 10 Nov 2016 20:35:34 +0100 Subject: [PATCH 044/144] Throw a signal when users change their email adress --- taiga/users/api.py | 12 +++++++++++- taiga/users/signals.py | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/taiga/users/api.py b/taiga/users/api.py index b3e2e707..ef22c661 100644 --- a/taiga/users/api.py +++ b/taiga/users/api.py @@ -48,6 +48,7 @@ from . import filters as user_filters from . import services from . import utils as user_utils from .signals import user_cancel_account as user_cancel_account_signal +from .signals import user_change_email as user_change_email_signal class UsersViewSet(ModelCrudViewSet): permission_classes = (permissions.UserPermission,) @@ -279,11 +280,20 @@ class UsersViewSet(ModelCrudViewSet): "didn't use it before?")) self.check_permissions(request, "change_email", user) - user.email = user.new_email + + old_email = user.email + new_email = user.new_email + + user.email = new_email user.new_email = None user.email_token = None user.save(update_fields=["email", "new_email", "email_token"]) + user_change_email_signal.send(sender=user.__class__, + user=user, + old_email=old_email, + new_email=new_email) + return response.NoContent() @list_route(methods=["GET"]) diff --git a/taiga/users/signals.py b/taiga/users/signals.py index c3fc5c38..d812f5fc 100644 --- a/taiga/users/signals.py +++ b/taiga/users/signals.py @@ -19,4 +19,5 @@ import django.dispatch +user_change_email = django.dispatch.Signal(providing_args=["user", "old_email", "new_email"]) user_cancel_account = django.dispatch.Signal(providing_args=["user", "request_data"]) From 79b7ceb73f28d20e36d34096df76f1fbc9658d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 15 Nov 2016 16:10:01 +0100 Subject: [PATCH 045/144] Small fix on epic freezer --- taiga/projects/history/freeze_impl.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/taiga/projects/history/freeze_impl.py b/taiga/projects/history/freeze_impl.py index fd452257..027691b6 100644 --- a/taiga/projects/history/freeze_impl.py +++ b/taiga/projects/history/freeze_impl.py @@ -70,6 +70,7 @@ def _get_user_story_values(ids:set) -> dict: _get_us_status_values = partial(_get_generic_values, typename="projects.userstorystatus") _get_task_status_values = partial(_get_generic_values, typename="projects.taskstatus") +_get_epic_status_values = partial(_get_generic_values, typename="projects.epicstatus") _get_issue_status_values = partial(_get_generic_values, typename="projects.issuestatus") _get_issue_type_values = partial(_get_generic_values, typename="projects.issuetype") _get_role_values = partial(_get_generic_values, typename="users.role") @@ -110,7 +111,7 @@ def epic_values(diff): values = _common_users_values(diff) if "status" in diff: - values["status"] = _get_us_status_values(diff["status"]) + values["status"] = _get_epic_status_values(diff["status"]) return values From 3d8f637e555ec7061e9d7582caf9c518050973d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 16 Nov 2016 13:00:09 +0100 Subject: [PATCH 046/144] Fix json_to_jsonb migrations and prevent \u0000 error --- .../migrations/0011_json_to_jsonb.py | 8 +-- .../history/migrations/0014_json_to_jsonb.py | 34 +++++++++--- .../projects/migrations/0055_json_to_jsonb.py | 53 +++++++++++++++---- .../timeline/migrations/0006_json_to_jsonb.py | 2 +- taiga/users/migrations/0023_json_to_jsonb.py | 2 +- .../migrations/0003_json_to_jsonb.py | 2 +- .../webhooks/migrations/0006_json_to_jsonb.py | 14 +++-- 7 files changed, 87 insertions(+), 28 deletions(-) diff --git a/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py b/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py index e9a17bcc..cfe4ff4c 100644 --- a/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py +++ b/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py @@ -17,7 +17,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING to_json("{column_name}"::text)::jsonb; + USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """.format( table_name="custom_attributes_epiccustomattributesvalues", column_name="attributes_values", @@ -29,7 +29,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING to_json("{column_name}"::text)::jsonb; + USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """.format( table_name="custom_attributes_userstorycustomattributesvalues", column_name="attributes_values", @@ -41,7 +41,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING to_json("{column_name}"::text)::jsonb; + USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """.format( table_name="custom_attributes_taskcustomattributesvalues", column_name="attributes_values", @@ -53,7 +53,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING to_json("{column_name}"::text)::jsonb; + USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """.format( table_name="custom_attributes_issuecustomattributesvalues", column_name="attributes_values", diff --git a/taiga/projects/history/migrations/0014_json_to_jsonb.py b/taiga/projects/history/migrations/0014_json_to_jsonb.py index 7906f0ac..c0704233 100644 --- a/taiga/projects/history/migrations/0014_json_to_jsonb.py +++ b/taiga/projects/history/migrations/0014_json_to_jsonb.py @@ -16,13 +16,33 @@ class Migration(migrations.Migration): migrations.RunSQL( """ ALTER TABLE "history_historyentry" - ALTER COLUMN "delete_comment_user" TYPE jsonb USING to_json("delete_comment_user"::text)::jsonb, - ALTER COLUMN "comment_versions" TYPE jsonb USING to_json("comment_versions"::text)::jsonb, - ALTER COLUMN "values_diff_cache" TYPE jsonb USING to_json("values_diff_cache"::text)::jsonb, - ALTER COLUMN "user" TYPE jsonb USING to_json("user"::text)::jsonb, - ALTER COLUMN "diff" TYPE jsonb USING to_json("diff"::text)::jsonb, - ALTER COLUMN "snapshot" TYPE jsonb USING to_json("snapshot"::text)::jsonb, - ALTER COLUMN "values" TYPE jsonb USING to_json("values"::text)::jsonb; + ALTER COLUMN "delete_comment_user" + TYPE jsonb + USING regexp_replace("delete_comment_user"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "comment_versions" + TYPE jsonb + USING regexp_replace("comment_versions"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "values_diff_cache" + TYPE jsonb + USING regexp_replace("values_diff_cache"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "user" + TYPE jsonb + USING regexp_replace("user"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "diff" + TYPE jsonb + USING regexp_replace("diff"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "snapshot" + TYPE jsonb + USING regexp_replace("snapshot"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "values" + TYPE jsonb + USING regexp_replace("values"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """, reverse_sql=migrations.RunSQL.noop ), diff --git a/taiga/projects/migrations/0055_json_to_jsonb.py b/taiga/projects/migrations/0055_json_to_jsonb.py index 5b9a0b8e..4530bf7f 100644 --- a/taiga/projects/migrations/0055_json_to_jsonb.py +++ b/taiga/projects/migrations/0055_json_to_jsonb.py @@ -16,23 +16,54 @@ class Migration(migrations.Migration): migrations.RunSQL( """ ALTER TABLE "projects_projectmodulesconfig" - ALTER COLUMN "config" TYPE jsonb USING to_json("config"::text)::jsonb; + ALTER COLUMN "config" + TYPE jsonb + USING regexp_replace("config"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """, reverse_sql=migrations.RunSQL.noop ), migrations.RunSQL( """ ALTER TABLE "projects_projecttemplate" - ALTER COLUMN "roles" TYPE jsonb USING to_json("roles"::text)::jsonb, - ALTER COLUMN "default_options" TYPE jsonb USING to_json("default_options"::text)::jsonb, - ALTER COLUMN "epic_statuses" TYPE jsonb USING to_json("epic_statuses"::text)::jsonb, - ALTER COLUMN "us_statuses" TYPE jsonb USING to_json("us_statuses"::text)::jsonb, - ALTER COLUMN "points" TYPE jsonb USING to_json("points"::text)::jsonb, - ALTER COLUMN "task_statuses" TYPE jsonb USING to_json("task_statuses"::text)::jsonb, - ALTER COLUMN "issue_statuses" TYPE jsonb USING to_json("issue_statuses"::text)::jsonb, - ALTER COLUMN "issue_types" TYPE jsonb USING to_json("issue_types"::text)::jsonb, - ALTER COLUMN "priorities" TYPE jsonb USING to_json("priorities"::text)::jsonb, - ALTER COLUMN "severities" TYPE jsonb USING to_json("severities"::text)::jsonb; + ALTER COLUMN "roles" + TYPE jsonb + USING regexp_replace("roles"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "default_options" + TYPE jsonb + USING regexp_replace("default_options"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "epic_statuses" + TYPE jsonb + USING regexp_replace("epic_statuses"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "us_statuses" + TYPE jsonb + USING regexp_replace("us_statuses"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "points" + TYPE jsonb + USING regexp_replace("points"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "task_statuses" + TYPE jsonb + USING regexp_replace("task_statuses"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "issue_statuses" + TYPE jsonb + USING regexp_replace("issue_statuses"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "issue_types" + TYPE jsonb + USING regexp_replace("issue_types"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "priorities" + TYPE jsonb + USING regexp_replace("priorities"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "severities" + TYPE jsonb + USING regexp_replace("severities"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """, reverse_sql=migrations.RunSQL.noop ), diff --git a/taiga/timeline/migrations/0006_json_to_jsonb.py b/taiga/timeline/migrations/0006_json_to_jsonb.py index 72a63968..b6b17e54 100644 --- a/taiga/timeline/migrations/0006_json_to_jsonb.py +++ b/taiga/timeline/migrations/0006_json_to_jsonb.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING to_json("{column_name}"::text)::jsonb; + USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """.format( table_name="timeline_timeline", column_name="data", diff --git a/taiga/users/migrations/0023_json_to_jsonb.py b/taiga/users/migrations/0023_json_to_jsonb.py index 34782897..f16d5699 100644 --- a/taiga/users/migrations/0023_json_to_jsonb.py +++ b/taiga/users/migrations/0023_json_to_jsonb.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING to_json("{column_name}"::text)::jsonb; + USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """.format( table_name="users_authdata", column_name="extra", diff --git a/taiga/userstorage/migrations/0003_json_to_jsonb.py b/taiga/userstorage/migrations/0003_json_to_jsonb.py index 9e1f5243..228324ac 100644 --- a/taiga/userstorage/migrations/0003_json_to_jsonb.py +++ b/taiga/userstorage/migrations/0003_json_to_jsonb.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING to_json("{column_name}"::text)::jsonb; + USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """.format( table_name="userstorage_storageentry", column_name="value", diff --git a/taiga/webhooks/migrations/0006_json_to_jsonb.py b/taiga/webhooks/migrations/0006_json_to_jsonb.py index 9f40b860..ed6258e3 100644 --- a/taiga/webhooks/migrations/0006_json_to_jsonb.py +++ b/taiga/webhooks/migrations/0006_json_to_jsonb.py @@ -16,9 +16,17 @@ class Migration(migrations.Migration): migrations.RunSQL( """ ALTER TABLE "webhooks_webhooklog" - ALTER COLUMN "request_headers" TYPE jsonb USING to_json("request_headers"::text)::jsonb, - ALTER COLUMN "request_data" TYPE jsonb USING to_json("request_data"::text)::jsonb, - ALTER COLUMN "response_headers" TYPE jsonb USING to_json("response_headers"::text)::jsonb; + ALTER COLUMN "request_headers" + TYPE jsonb + USING regexp_replace("request_headers"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "request_data" + TYPE jsonb + USING regexp_replace("request_data"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + + ALTER COLUMN "response_headers" + TYPE jsonb + USING regexp_replace("response_headers"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; """, reverse_sql=migrations.RunSQL.noop ), From d44d666a66fa2eb9eb6e670fc795d82960bab455 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 17 Nov 2016 12:53:54 +0100 Subject: [PATCH 047/144] Fixing tasks order --- taiga/projects/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taiga/projects/utils.py b/taiga/projects/utils.py index 1b1316ad..fbec4853 100644 --- a/taiga/projects/utils.py +++ b/taiga/projects/utils.py @@ -201,7 +201,7 @@ def attach_task_statuses(queryset, as_field="task_statuses_attr"): sql = """ SELECT json_agg( row_to_json(projects_taskstatus) - ORDER BY projects_taskstatus + ORDER BY projects_taskstatus.order ) FROM projects_taskstatus WHERE projects_taskstatus.project_id = {tbl}.id From d21b4193ce6e58216d66f449cfeaf79ab0da2dc3 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 16 Nov 2016 09:45:39 +0100 Subject: [PATCH 048/144] Fixing API attachments order and deprecated --- taiga/projects/attachments/utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/taiga/projects/attachments/utils.py b/taiga/projects/attachments/utils.py index 5103fccb..b1f6b08e 100644 --- a/taiga/projects/attachments/utils.py +++ b/taiga/projects/attachments/utils.py @@ -37,8 +37,10 @@ def attach_basic_attachments(queryset, as_field="attachments_attr"): attachments_attachment.id, attachments_attachment.attached_file FROM attachments_attachment - WHERE attachments_attachment.object_id = {tbl}.id AND attachments_attachment.content_type_id = {type_id} - ORDER BY attachments_attachment.order, attachments_attachment.id) t""" + WHERE attachments_attachment.object_id = {tbl}.id + AND attachments_attachment.content_type_id = {type_id} + AND attachments_attachment.is_deprecated = False + ORDER BY attachments_attachment.order, attachments_attachment.created_date, attachments_attachment.id) t""" sql = sql.format(tbl=model._meta.db_table, type_id=type.id) queryset = queryset.extra(select={as_field: sql}) From 4df74d600762dab5de422436b17ef512249f9809 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 17 Nov 2016 08:19:52 +0100 Subject: [PATCH 049/144] Enabling console output for runserver again --- settings/common.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/settings/common.py b/settings/common.py index 747141ec..40694229 100644 --- a/settings/common.py +++ b/settings/common.py @@ -347,6 +347,10 @@ LOGGING = { "null": { "format": "%(message)s", }, + "django.server": { + "()": "django.utils.log.ServerFormatter", + "format": "[%(server_time)s] %(message)s", + }, }, "handlers": { "null": { @@ -362,7 +366,12 @@ LOGGING = { "level": "ERROR", "filters": ["require_debug_false"], "class": "django.utils.log.AdminEmailHandler", - } + }, + "django.server": { + "level": "INFO", + "class": "logging.StreamHandler", + "formatter": "django.server", + }, }, "loggers": { "django": { @@ -384,6 +393,11 @@ LOGGING = { "handlers": ["console"], "level": "DEBUG", "propagate": False, + }, + "django.server": { + "handlers": ["django.server"], + "level": "INFO", + "propagate": False, } } } From 5eec9dba977cf530ca24df7248d3b8e90aa7adda Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 21 Nov 2016 12:16:46 +0100 Subject: [PATCH 050/144] Issue 4768: Notify when something is unassigned --- taiga/projects/notifications/services.py | 32 +++++++++++++-------- tests/integration/test_notifications.py | 36 ++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/taiga/projects/notifications/services.py b/taiga/projects/notifications/services.py index e998d068..42194b41 100644 --- a/taiga/projects/notifications/services.py +++ b/taiga/projects/notifications/services.py @@ -72,14 +72,14 @@ def create_notify_policy_if_not_exists(project, user, level=NotifyLevel.involved model_cls = apps.get_model("notifications", "NotifyPolicy") try: result = model_cls.objects.get_or_create(project=project, - user=user, - defaults={"notify_level": level}) + user=user, + defaults={"notify_level": level}) return result[0] except IntegrityError as e: raise exc.IntegrityError(_("Notify exists for specified user and project")) from e -def analize_object_for_watchers(obj:object, comment:str, user:object): +def analize_object_for_watchers(obj: object, comment: str, user: object): """ Generic implementation for analize model objects and extract mentions from it and add it to watchers. @@ -91,7 +91,6 @@ def analize_object_for_watchers(obj:object, comment:str, user:object): if not hasattr(obj, "add_watcher"): return - texts = (getattr(obj, "description", ""), getattr(obj, "content", ""), comment,) @@ -142,7 +141,7 @@ def get_users_to_notify(obj, *, discard_users=None) -> list: """ project = obj.get_project() - def _check_level(project:object, user:object, levels:tuple) -> bool: + def _check_level(project: object, user: object, levels: tuple) -> bool: policy = project.cached_notify_policy_for_user(user) return policy.notify_level in levels @@ -167,7 +166,7 @@ def get_users_to_notify(obj, *, discard_users=None) -> list: return frozenset(candidates) -def _resolve_template_name(model:object, *, change_type:int) -> str: +def _resolve_template_name(model: object, *, change_type: int) -> str: """ Ginven an changed model instance and change type, return the preformated template name for it. @@ -187,7 +186,7 @@ def _resolve_template_name(model:object, *, change_type:int) -> str: change=change_type) -def _make_template_mail(name:str): +def _make_template_mail(name: str): """ Helper that creates a adhoc djmail template email instance for specified name, and return an instance @@ -211,7 +210,7 @@ def send_notifications(obj, *, history): .get_or_create(key=key, owner=owner, project=obj.project, - history_type = history.type)) + history_type=history.type)) notification.updated_datetime = timezone.now() notification.save() @@ -222,6 +221,14 @@ def send_notifications(obj, *, history): notify_users = get_users_to_notify(obj, discard_users=[notification.owner]) notification.notify_users.add(*notify_users) + # If the history is an unassignment change we should notify that user too + if history.type == HistoryType.change and "assigned_to" in history.diff: + if history.diff["assigned_to"][0] is not None: + notification.notify_users.add(history.diff["assigned_to"][0]) + + if history.diff["assigned_to"][1] is not None: + notification.notify_users.add(history.diff["assigned_to"][1]) + # If we are the min interval is 0 it just work in a synchronous and spamming way if settings.CHANGE_NOTIFICATIONS_MIN_INTERVAL == 0: send_sync_notifications(notification.id) @@ -392,8 +399,11 @@ def add_watcher(obj, user): :param user: User adding the watch. :class:`~taiga.users.models.User` instance. """ obj_type = apps.get_model("contenttypes", "ContentType").objects.get_for_model(obj) - watched, created = Watched.objects.get_or_create(content_type=obj_type, - object_id=obj.id, user=user, project=obj.project) + watched, created = Watched.objects.get_or_create( + content_type=obj_type, + object_id=obj.id, + user=user, + project=obj.project) notify_policy, _ = apps.get_model("notifications", "NotifyPolicy").objects.get_or_create( project=obj.project, user=user, defaults={"notify_level": NotifyLevel.involved}) @@ -422,7 +432,7 @@ def set_notify_policy_level(notify_policy, notify_level): """ Set notification level for specified policy. """ - if not notify_level in [e.value for e in NotifyLevel]: + if notify_level not in [e.value for e in NotifyLevel]: raise exc.IntegrityError(_("Invalid value for notify level")) notify_policy.notify_level = notify_level diff --git a/tests/integration/test_notifications.py b/tests/integration/test_notifications.py index fd8f3aa8..c49e8a12 100644 --- a/tests/integration/test_notifications.py +++ b/tests/integration/test_notifications.py @@ -726,6 +726,42 @@ def test_send_notifications_using_services_method_for_wiki_pages(settings, mail) assert services.make_ms_thread_index(in_reply_to, msg_ts) == headers.get('Thread-Index') +def test_send_notifications_on_unassigned(client, mail): + project = f.ProjectFactory.create() + role = f.RoleFactory.create(project=project, permissions=['modify_issue', 'view_issues', 'view_us', 'view_tasks', 'view_wiki_pages']) + member1 = f.MembershipFactory.create(project=project, role=role) + member2 = f.MembershipFactory.create(project=project, role=role) + issue = f.IssueFactory.create(project=project, + owner=member1.user, + milestone=None, + status=project.default_issue_status, + severity=project.default_severity, + priority=project.default_priority, + type=project.default_issue_type) + + take_snapshot(issue, user=issue.owner) + + client.login(member1.user) + url = reverse("issues-detail", args=[issue.pk]) + data = { + "assigned_to": member2.user.id, + "version": issue.version + } + response = client.json.patch(url, json.dumps(data)) + assert len(mail.outbox) == 1 + assert mail.outbox[0].to == [member2.user.email] + + mail.outbox = [] + + data = { + "assigned_to": None, + "version": issue.version + 1 + } + response = client.json.patch(url, json.dumps(data)) + assert len(mail.outbox) == 1 + assert mail.outbox[0].to == [member2.user.email] + + def test_resource_notification_test(client, settings, mail): settings.CHANGE_NOTIFICATIONS_MIN_INTERVAL = 1 From 5449aac84d73903256bb16023addf9f5b320a239 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 24 Nov 2016 07:59:18 +0100 Subject: [PATCH 051/144] Fixing unassignment notifications --- taiga/projects/notifications/services.py | 8 +++--- tests/integration/test_notifications.py | 34 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/taiga/projects/notifications/services.py b/taiga/projects/notifications/services.py index 42194b41..dfe71f15 100644 --- a/taiga/projects/notifications/services.py +++ b/taiga/projects/notifications/services.py @@ -223,11 +223,9 @@ def send_notifications(obj, *, history): # If the history is an unassignment change we should notify that user too if history.type == HistoryType.change and "assigned_to" in history.diff: - if history.diff["assigned_to"][0] is not None: - notification.notify_users.add(history.diff["assigned_to"][0]) - - if history.diff["assigned_to"][1] is not None: - notification.notify_users.add(history.diff["assigned_to"][1]) + for assigned_to in history.diff["assigned_to"]: + if assigned_to is not None and owner.id != assigned_to: + notification.notify_users.add(assigned_to) # If we are the min interval is 0 it just work in a synchronous and spamming way if settings.CHANGE_NOTIFICATIONS_MIN_INTERVAL == 0: diff --git a/tests/integration/test_notifications.py b/tests/integration/test_notifications.py index c49e8a12..cdd29270 100644 --- a/tests/integration/test_notifications.py +++ b/tests/integration/test_notifications.py @@ -762,6 +762,40 @@ def test_send_notifications_on_unassigned(client, mail): assert mail.outbox[0].to == [member2.user.email] +def test_not_send_notifications_on_unassigned_if_executer_and_unassigned_match(client, mail): + project = f.ProjectFactory.create() + role = f.RoleFactory.create(project=project, permissions=['modify_issue', 'view_issues', 'view_us', 'view_tasks', 'view_wiki_pages']) + member1 = f.MembershipFactory.create(project=project, role=role) + member2 = f.MembershipFactory.create(project=project, role=role) + issue = f.IssueFactory.create(project=project, + owner=member1.user, + milestone=None, + status=project.default_issue_status, + severity=project.default_severity, + priority=project.default_priority, + type=project.default_issue_type) + + take_snapshot(issue, user=issue.owner) + + client.login(member1.user) + url = reverse("issues-detail", args=[issue.pk]) + data = { + "assigned_to": member1.user.id, + "version": issue.version + } + response = client.json.patch(url, json.dumps(data)) + assert len(mail.outbox) == 0 + + mail.outbox = [] + + data = { + "assigned_to": None, + "version": issue.version + 1 + } + response = client.json.patch(url, json.dumps(data)) + assert len(mail.outbox) == 0 + + def test_resource_notification_test(client, settings, mail): settings.CHANGE_NOTIFICATIONS_MIN_INTERVAL = 1 From 9970f68d2bb34f6c79c2b014be327e13aceeaf92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 2 Nov 2016 11:42:44 +0100 Subject: [PATCH 052/144] Add total comments to kanban and taskboard --- taiga/projects/history/mixins.py | 11 ++++++ taiga/projects/history/utils.py | 45 +++++++++++++++++++++++ taiga/projects/tasks/serializers.py | 4 +- taiga/projects/tasks/utils.py | 2 + taiga/projects/userstories/serializers.py | 3 +- taiga/projects/userstories/utils.py | 2 + 6 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 taiga/projects/history/utils.py diff --git a/taiga/projects/history/mixins.py b/taiga/projects/history/mixins.py index 14a0f44d..2e058879 100644 --- a/taiga/projects/history/mixins.py +++ b/taiga/projects/history/mixins.py @@ -20,6 +20,9 @@ import warnings from .services import take_snapshot from taiga.projects.notifications import services as notifications_services +from taiga.base.api import serializers +from taiga.base.fields import MethodField + class HistoryResourceMixin(object): """ @@ -77,3 +80,11 @@ class HistoryResourceMixin(object): def pre_delete(self, obj): self.persist_history_snapshot(obj, delete=True) super().pre_delete(obj) + + +class TotalCommentsSerializerMixin(serializers.LightSerializer): + total_comments = MethodField() + + def get_total_comments(self, obj): + # The "total_comments" attribute is attached in the get_queryset of the viewset. + return getattr(obj, "total_comments", 0) or 0 diff --git a/taiga/projects/history/utils.py b/taiga/projects/history/utils.py new file mode 100644 index 00000000..a273f748 --- /dev/null +++ b/taiga/projects/history/utils.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2016 Anler Hernández +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from taiga.projects.history.services import get_typename_for_model_class + + +def attach_total_comments_to_queryset(queryset, as_field="total_comments"): + """Attach a total comments counter to each object of the queryset. + + :param queryset: A Django projects queryset object. + :param as_field: Attach the counter as an attribute with this name. + + :return: Queryset object with the additional `as_field` field. + """ + model = queryset.model + sql = """ + SELECT COUNT(history_historyentry.id) + FROM history_historyentry + WHERE history_historyentry.key = CONCAT('{key_prefix}', {tbl}.id) AND + history_historyentry.comment is not null AND + history_historyentry.comment != '' + """ + + typename = get_typename_for_model_class(model) + + sql = sql.format(tbl=model._meta.db_table, key_prefix="{}:".format(typename)) + + queryset = queryset.extra(select={as_field: sql}) + return queryset diff --git a/taiga/projects/tasks/serializers.py b/taiga/projects/tasks/serializers.py index f0621581..c1fca652 100644 --- a/taiga/projects/tasks/serializers.py +++ b/taiga/projects/tasks/serializers.py @@ -28,11 +28,13 @@ from taiga.projects.mixins.serializers import StatusExtraInfoSerializerMixin from taiga.projects.notifications.mixins import WatchedResourceSerializer from taiga.projects.tagging.serializers import TaggedInProjectResourceSerializer from taiga.projects.votes.mixins.serializers import VoteResourceSerializerMixin +from taiga.projects.history.mixins import TotalCommentsSerializerMixin class TaskListSerializer(VoteResourceSerializerMixin, WatchedResourceSerializer, OwnerExtraInfoSerializerMixin, AssignedToExtraInfoSerializerMixin, StatusExtraInfoSerializerMixin, BasicAttachmentsInfoSerializerMixin, - TaggedInProjectResourceSerializer, serializers.LightSerializer): + TaggedInProjectResourceSerializer, TotalCommentsSerializerMixin, + serializers.LightSerializer): id = Field() user_story = Field(attr="user_story_id") diff --git a/taiga/projects/tasks/utils.py b/taiga/projects/tasks/utils.py index 0d8661fc..d06f96e3 100644 --- a/taiga/projects/tasks/utils.py +++ b/taiga/projects/tasks/utils.py @@ -23,6 +23,7 @@ from taiga.projects.notifications.utils import attach_total_watchers_to_queryset from taiga.projects.notifications.utils import attach_is_watcher_to_queryset from taiga.projects.votes.utils import attach_total_voters_to_queryset from taiga.projects.votes.utils import attach_is_voter_to_queryset +from taiga.projects.history.utils import attach_total_comments_to_queryset def attach_user_story_extra_info(queryset, as_field="user_story_extra_info"): @@ -76,4 +77,5 @@ def attach_extra_info(queryset, user=None, include_attachments=False): queryset = attach_is_voter_to_queryset(queryset, user) queryset = attach_is_watcher_to_queryset(queryset, user) queryset = attach_user_story_extra_info(queryset) + queryset = attach_total_comments_to_queryset(queryset) return queryset diff --git a/taiga/projects/userstories/serializers.py b/taiga/projects/userstories/serializers.py index b7c43466..7fecf778 100644 --- a/taiga/projects/userstories/serializers.py +++ b/taiga/projects/userstories/serializers.py @@ -29,6 +29,7 @@ from taiga.projects.mixins.serializers import StatusExtraInfoSerializerMixin from taiga.projects.notifications.mixins import WatchedResourceSerializer from taiga.projects.tagging.serializers import TaggedInProjectResourceSerializer from taiga.projects.votes.mixins.serializers import VoteResourceSerializerMixin +from taiga.projects.history.mixins import TotalCommentsSerializerMixin class OriginIssueSerializer(serializers.LightSerializer): @@ -47,7 +48,7 @@ class UserStoryListSerializer(ProjectExtraInfoSerializerMixin, VoteResourceSerializerMixin, WatchedResourceSerializer, OwnerExtraInfoSerializerMixin, AssignedToExtraInfoSerializerMixin, StatusExtraInfoSerializerMixin, BasicAttachmentsInfoSerializerMixin, - TaggedInProjectResourceSerializer, + TaggedInProjectResourceSerializer, TotalCommentsSerializerMixin, serializers.LightSerializer): id = Field() diff --git a/taiga/projects/userstories/utils.py b/taiga/projects/userstories/utils.py index 57e4ecd3..5e410aba 100644 --- a/taiga/projects/userstories/utils.py +++ b/taiga/projects/userstories/utils.py @@ -21,6 +21,7 @@ from taiga.projects.attachments.utils import attach_basic_attachments from taiga.projects.notifications.utils import attach_watchers_to_queryset from taiga.projects.notifications.utils import attach_total_watchers_to_queryset from taiga.projects.notifications.utils import attach_is_watcher_to_queryset +from taiga.projects.history.utils import attach_total_comments_to_queryset from taiga.projects.votes.utils import attach_total_voters_to_queryset from taiga.projects.votes.utils import attach_is_voter_to_queryset @@ -174,4 +175,5 @@ def attach_extra_info(queryset, user=None, include_attachments=False, include_ta queryset = attach_total_watchers_to_queryset(queryset) queryset = attach_is_voter_to_queryset(queryset, user) queryset = attach_is_watcher_to_queryset(queryset, user) + queryset = attach_total_comments_to_queryset(queryset) return queryset From 09e40b9968d2841e9e0c24545308a1523641f9d2 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 24 Nov 2016 11:02:19 +0100 Subject: [PATCH 053/144] Fixing sample data to make the comments consistent --- taiga/projects/management/commands/sample_data.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/taiga/projects/management/commands/sample_data.py b/taiga/projects/management/commands/sample_data.py index e8b47290..cc502d0d 100644 --- a/taiga/projects/management/commands/sample_data.py +++ b/taiga/projects/management/commands/sample_data.py @@ -318,7 +318,6 @@ class Command(BaseCommand): attachment = self.create_attachment(wiki_page, i+1) take_snapshot(wiki_page, - comment=self.sd.paragraph(), user=wiki_page.owner) # Add history entry @@ -374,7 +373,6 @@ class Command(BaseCommand): bug.save() take_snapshot(bug, - comment=self.sd.paragraph(), user=bug.owner) # Add history entry @@ -421,7 +419,6 @@ class Command(BaseCommand): attachment = self.create_attachment(task, i+1) take_snapshot(task, - comment=self.sd.paragraph(), user=task.owner) # Add history entry @@ -476,7 +473,6 @@ class Command(BaseCommand): take_snapshot(us, - comment=self.sd.paragraph(), user=us.owner) # Add history entry @@ -533,7 +529,6 @@ class Command(BaseCommand): epic.save() take_snapshot(epic, - comment=self.sd.paragraph(), user=epic.owner) # Add history entry @@ -559,9 +554,15 @@ class Command(BaseCommand): # Add history entry take_snapshot(epic, - comment=self.sd.paragraph(), user=epic.owner) + # Add history entry + epic.status=self.sd.db_object_from_queryset(project.epic_statuses.filter(is_closed=False)) + epic.save() + take_snapshot(epic, + comment=self.sd.paragraph(), + user=epic.owner) + return epic def create_project(self, counter, is_private=None, blocked_code=None): @@ -633,4 +634,3 @@ class Command(BaseCommand): def generate_color(self, tag): color = sha1(tag.encode("utf-8")).hexdigest()[0:6] return "#{}".format(color) - From 4d3e65c60328b3b239b4d121e33a1c0917461ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 24 Nov 2016 11:35:28 +0100 Subject: [PATCH 054/144] Move the timeline rebuild to the timeline library --- .../commands/change_project_slug.py | 4 +- .../_rebuild_timeline_for_user_creation.py | 97 ------------- .../management/commands/rebuild_timeline.py | 112 +------------- taiga/timeline/rebuilder.py | 137 ++++++++++++++++++ taiga/timeline/service.py | 5 +- taiga/timeline/signals.py | 12 +- 6 files changed, 152 insertions(+), 215 deletions(-) delete mode 100644 taiga/timeline/management/commands/_rebuild_timeline_for_user_creation.py create mode 100644 taiga/timeline/rebuilder.py diff --git a/taiga/projects/management/commands/change_project_slug.py b/taiga/projects/management/commands/change_project_slug.py index 8e8d012e..e27dc77f 100644 --- a/taiga/projects/management/commands/change_project_slug.py +++ b/taiga/projects/management/commands/change_project_slug.py @@ -23,7 +23,7 @@ from django.test.utils import override_settings from taiga.base.utils.slug import slugify_uniquely from taiga.projects.models import Project from taiga.projects.history.models import HistoryEntry -from taiga.timeline.management.commands.rebuild_timeline import generate_timeline +from taiga.timeline.rebuilder import rebuild_timeline class Command(BaseCommand): @@ -58,4 +58,4 @@ class Command(BaseCommand): # Regenerate timeline self.stdout.write(self.style.SUCCESS("-> Regenerate timeline entries.")) - generate_timeline(None, None, project.id) + rebuild_timeline(None, None, project.id) diff --git a/taiga/timeline/management/commands/_rebuild_timeline_for_user_creation.py b/taiga/timeline/management/commands/_rebuild_timeline_for_user_creation.py deleted file mode 100644 index f3a5fa57..00000000 --- a/taiga/timeline/management/commands/_rebuild_timeline_for_user_creation.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -# Examples: -# python manage.py rebuild_timeline_for_user_creation --settings=settings.local_timeline - -from django.contrib.auth import get_user_model -from django.contrib.contenttypes.models import ContentType -from django.core.management.base import BaseCommand -from django.db.models import Model -from django.test.utils import override_settings - -from taiga.timeline.service import _get_impl_key_from_model, -from taiga.timeline.service import _timeline_impl_map, -from taiga.timeline.service import extract_user_info) -from taiga.timeline.models import Timeline -from taiga.timeline.signals import _push_to_timelines - -from unittest.mock import patch - -import gc - - -class BulkCreator(object): - def __init__(self): - self.timeline_objects = [] - self.created = None - - def create_element(self, element): - self.timeline_objects.append(element) - if len(self.timeline_objects) > 1000: - self.flush() - - def flush(self): - Timeline.objects.bulk_create(self.timeline_objects, batch_size=1000) - del self.timeline_objects - self.timeline_objects = [] - gc.collect() - -bulk_creator = BulkCreator() - - -def custom_add_to_object_timeline(obj:object, instance:object, event_type:str, created_datetime:object, - namespace:str="default", extra_data:dict={}): - assert isinstance(obj, Model), "obj must be a instance of Model" - assert isinstance(instance, Model), "instance must be a instance of Model" - event_type_key = _get_impl_key_from_model(instance.__class__, event_type) - impl = _timeline_impl_map.get(event_type_key, None) - - bulk_creator.create_element(Timeline( - content_object=obj, - namespace=namespace, - event_type=event_type_key, - project=None, - data=impl(instance, extra_data=extra_data), - data_content_type = ContentType.objects.get_for_model(instance.__class__), - created=created_datetime, - )) - - -def generate_timeline(): - with patch('taiga.timeline.service._add_to_object_timeline', new=custom_add_to_object_timeline): - # Users api wasn't a HistoryResourceMixin so we can't interate on the HistoryEntries in this case - users = get_user_model().objects.order_by("date_joined") - for user in users.iterator(): - print("User:", user.date_joined) - extra_data = { - "values_diff": {}, - "user": extract_user_info(user), - } - _push_to_timelines(None, user, user, "create", user.date_joined, extra_data=extra_data) - del extra_data - - bulk_creator.flush() - - -class Command(BaseCommand): - help = 'Regenerate project timeline' - - @override_settings(DEBUG=False) - def handle(self, *args, **options): - generate_timeline() diff --git a/taiga/timeline/management/commands/rebuild_timeline.py b/taiga/timeline/management/commands/rebuild_timeline.py index cd14795a..fdd2dbd8 100644 --- a/taiga/timeline/management/commands/rebuild_timeline.py +++ b/taiga/timeline/management/commands/rebuild_timeline.py @@ -21,122 +21,14 @@ # python manage.py rebuild_timeline --settings=settings.local_timeline --purge # python manage.py rebuild_timeline --settings=settings.local_timeline --initial_date 2014-10-02 -from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ObjectDoesNotExist from django.core.management.base import BaseCommand -from django.db.models import Model from django.test.utils import override_settings -from taiga.projects.models import Project -from taiga.projects.history.models import HistoryEntry from taiga.timeline.models import Timeline -from taiga.timeline.service import _get_impl_key_from_model,_timeline_impl_map, extract_user_info -from taiga.timeline.signals import on_new_history_entry, _push_to_timelines +from taiga.timeline.rebuilder import rebuild_timeline -from unittest.mock import patch from optparse import make_option -import gc - - -class BulkCreator(object): - def __init__(self): - self.timeline_objects = [] - self.created = None - - def create_element(self, element): - self.timeline_objects.append(element) - if len(self.timeline_objects) > 999: - self.flush() - - def flush(self): - Timeline.objects.bulk_create(self.timeline_objects, batch_size=1000) - del self.timeline_objects - self.timeline_objects = [] - gc.collect() - -bulk_creator = BulkCreator() - - -def custom_add_to_object_timeline(obj:object, instance:object, event_type:str, created_datetime:object, - namespace:str="default", extra_data:dict={}): - assert isinstance(obj, Model), "obj must be a instance of Model" - assert isinstance(instance, Model), "instance must be a instance of Model" - event_type_key = _get_impl_key_from_model(instance.__class__, event_type) - impl = _timeline_impl_map.get(event_type_key, None) - - bulk_creator.create_element(Timeline( - content_object=obj, - namespace=namespace, - event_type=event_type_key, - project=instance.project, - data=impl(instance, extra_data=extra_data), - data_content_type=ContentType.objects.get_for_model(instance.__class__), - created=created_datetime, - )) - - -def generate_timeline(initial_date, final_date, project_id): - if initial_date or final_date or project_id: - timelines = Timeline.objects.all() - if initial_date: - timelines = timelines.filter(created__gte=initial_date) - if final_date: - timelines = timelines.filter(created__lt=final_date) - if project_id: - timelines = timelines.filter(project__id=project_id) - - timelines.delete() - - with patch('taiga.timeline.service._add_to_object_timeline', new=custom_add_to_object_timeline): - # Projects api wasn't a HistoryResourceMixin so we can't interate on the HistoryEntries in this case - projects = Project.objects.order_by("created_date") - history_entries = HistoryEntry.objects.order_by("created_at") - - if initial_date: - projects = projects.filter(created_date__gte=initial_date) - history_entries = history_entries.filter(created_at__gte=initial_date) - - if final_date: - projects = projects.filter(created_date__lt=final_date) - history_entries = history_entries.filter(created_at__lt=final_date) - - if project_id: - project = Project.objects.get(id=project_id) - epic_keys = ['epics.epic:%s'%(id) for id in project.epics.values_list("id", flat=True)] - us_keys = ['userstories.userstory:%s'%(id) for id in project.user_stories.values_list("id", - flat=True)] - tasks_keys = ['tasks.task:%s'%(id) for id in project.tasks.values_list("id", flat=True)] - issue_keys = ['issues.issue:%s'%(id) for id in project.issues.values_list("id", flat=True)] - wiki_keys = ['wiki.wikipage:%s'%(id) for id in project.wiki_pages.values_list("id", flat=True)] - keys = epic_keys + us_keys + tasks_keys + issue_keys + wiki_keys - - projects = projects.filter(id=project_id) - history_entries = history_entries.filter(key__in=keys) - - #Memberships - for membership in project.memberships.exclude(user=None).exclude(user=project.owner): - _push_to_timelines(project, membership.user, membership, "create", membership.created_at) - - for project in projects.iterator(): - print("Project:", project) - extra_data = { - "values_diff": {}, - "user": extract_user_info(project.owner), - } - _push_to_timelines(project, project.owner, project, "create", project.created_date, - extra_data=extra_data) - del extra_data - - for historyEntry in history_entries.iterator(): - print("History entry:", historyEntry.created_at) - try: - on_new_history_entry(None, historyEntry, None) - except ObjectDoesNotExist as e: - print("Ignoring") - - bulk_creator.flush() - class Command(BaseCommand): help = 'Regenerate project timeline' @@ -168,4 +60,4 @@ class Command(BaseCommand): if options["purge"] == True: Timeline.objects.all().delete() - generate_timeline(options["initial_date"], options["final_date"], options["project"]) + rebuild_timeline(options["initial_date"], options["final_date"], options["project"]) diff --git a/taiga/timeline/rebuilder.py b/taiga/timeline/rebuilder.py new file mode 100644 index 00000000..e8100fed --- /dev/null +++ b/taiga/timeline/rebuilder.py @@ -0,0 +1,137 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import ObjectDoesNotExist +from django.db.models import Model +from django.test.utils import override_settings + +from taiga.projects.models import Project +from taiga.projects.history.models import HistoryEntry +from .models import Timeline +from .service import _get_impl_key_from_model, _timeline_impl_map, extract_user_info +from .signals import on_new_history_entry, _push_to_timelines + +from unittest.mock import patch + +import gc + + +class BulkCreator(object): + def __init__(self): + self.timeline_objects = [] + self.created = None + + def create_element(self, element): + self.timeline_objects.append(element) + if len(self.timeline_objects) > 999: + self.flush() + + def flush(self): + Timeline.objects.bulk_create(self.timeline_objects, batch_size=1000) + del self.timeline_objects + self.timeline_objects = [] + gc.collect() + +bulk_creator = BulkCreator() + + +def custom_add_to_object_timeline(obj:object, instance:object, event_type:str, created_datetime:object, + namespace:str="default", extra_data:dict={}): + assert isinstance(obj, Model), "obj must be a instance of Model" + assert isinstance(instance, Model), "instance must be a instance of Model" + event_type_key = _get_impl_key_from_model(instance.__class__, event_type) + impl = _timeline_impl_map.get(event_type_key, None) + + bulk_creator.create_element(Timeline( + content_object=obj, + namespace=namespace, + event_type=event_type_key, + project=instance.project, + data=impl(instance, extra_data=extra_data), + data_content_type=ContentType.objects.get_for_model(instance.__class__), + created=created_datetime, + )) + + +@override_settings(CELERY_ENABLED=False) +def rebuild_timeline(initial_date, final_date, project_id): + if initial_date or final_date or project_id: + timelines = Timeline.objects.all() + if initial_date: + timelines = timelines.filter(created__gte=initial_date) + if final_date: + timelines = timelines.filter(created__lt=final_date) + if project_id: + timelines = timelines.filter(project__id=project_id) + + timelines.delete() + + with patch('taiga.timeline.service._add_to_object_timeline', new=custom_add_to_object_timeline): + # Projects api wasn't a HistoryResourceMixin so we can't interate on the HistoryEntries in this case + projects = Project.objects.order_by("created_date") + history_entries = HistoryEntry.objects.order_by("created_at") + + if initial_date: + projects = projects.filter(created_date__gte=initial_date) + history_entries = history_entries.filter(created_at__gte=initial_date) + + if final_date: + projects = projects.filter(created_date__lt=final_date) + history_entries = history_entries.filter(created_at__lt=final_date) + + if project_id: + project = Project.objects.get(id=project_id) + epic_keys = ['epics.epic:%s'%(id) for id in project.epics.values_list("id", flat=True)] + us_keys = ['userstories.userstory:%s'%(id) for id in project.user_stories.values_list("id", + flat=True)] + tasks_keys = ['tasks.task:%s'%(id) for id in project.tasks.values_list("id", flat=True)] + issue_keys = ['issues.issue:%s'%(id) for id in project.issues.values_list("id", flat=True)] + wiki_keys = ['wiki.wikipage:%s'%(id) for id in project.wiki_pages.values_list("id", flat=True)] + keys = epic_keys + us_keys + tasks_keys + issue_keys + wiki_keys + + projects = projects.filter(id=project_id) + history_entries = history_entries.filter(key__in=keys) + + #Memberships + for membership in project.memberships.exclude(user=None).exclude(user=project.owner): + _push_to_timelines(project, membership.user, membership, "create", membership.created_at, refresh_totals=False) + + for project in projects.iterator(): + print("Project:", project) + extra_data = { + "values_diff": {}, + "user": extract_user_info(project.owner), + } + _push_to_timelines(project, project.owner, project, 'create', + project.created_date, extra_data=extra_data, + refresh_totals=False) + del extra_data + + for historyEntry in history_entries.iterator(): + print("History entry:", historyEntry.created_at) + try: + historyEntry.refresh_totals = False + on_new_history_entry(None, historyEntry, None) + except ObjectDoesNotExist as e: + print("Ignoring") + + for project in projects.iterator(): + project.refresh_totals() + + bulk_creator.flush() diff --git a/taiga/timeline/service.py b/taiga/timeline/service.py index 03ca3e96..07d742bf 100644 --- a/taiga/timeline/service.py +++ b/taiga/timeline/service.py @@ -93,7 +93,7 @@ def _push_to_timeline(objects, instance: object, event_type: str, created_dateti @app.task def push_to_timelines(project_id, user_id, obj_app_label, obj_model_name, obj_id, event_type, - created_datetime, extra_data={}): + created_datetime, extra_data={}, refresh_totals=True): ObjModel = apps.get_model(obj_app_label, obj_model_name) try: @@ -120,7 +120,8 @@ def push_to_timelines(project_id, user_id, obj_app_label, obj_model_name, obj_id namespace=build_project_namespace(project), extra_data=extra_data) - project.refresh_totals() + if refresh_totals: + project.refresh_totals() if hasattr(obj, "get_related_people"): related_people = obj.get_related_people() diff --git a/taiga/timeline/signals.py b/taiga/timeline/signals.py index 7f754b63..c5590c81 100644 --- a/taiga/timeline/signals.py +++ b/taiga/timeline/signals.py @@ -31,7 +31,7 @@ from taiga.timeline.service import (push_to_timelines, extract_user_info) -def _push_to_timelines(project, user, obj, event_type, created_datetime, extra_data={}): +def _push_to_timelines(project, user, obj, event_type, created_datetime, extra_data={}, refresh_totals=True): project_id = None if project is None else project.id ct = ContentType.objects.get_for_model(obj) @@ -43,7 +43,8 @@ def _push_to_timelines(project, user, obj, event_type, created_datetime, extra_d obj.id, event_type, created_datetime, - extra_data=extra_data)) + extra_data=extra_data, + refresh_totals=refresh_totals)) else: push_to_timelines(project_id, user.id, @@ -52,7 +53,8 @@ def _push_to_timelines(project, user, obj, event_type, created_datetime, extra_d obj.id, event_type, created_datetime, - extra_data=extra_data) + extra_data=extra_data, + refresh_totals=refresh_totals) def _clean_description_fields(values_diff): @@ -73,6 +75,8 @@ def on_new_history_entry(sender, instance, created, **kwargs): if instance.user["pk"] is None: return None + refresh_totals = getattr(instance, "refresh_totals", True) + model = history_services.get_model_from_key(instance.key) pk = history_services.get_pk_from_key(instance.key) obj = model.objects.get(pk=pk) @@ -105,7 +109,7 @@ def on_new_history_entry(sender, instance, created, **kwargs): extra_data["comment_edited"] = True created_datetime = instance.created_at - _push_to_timelines(project, user, obj, event_type, created_datetime, extra_data=extra_data) + _push_to_timelines(project, user, obj, event_type, created_datetime, extra_data=extra_data, refresh_totals=refresh_totals) def create_membership_push_to_timeline(sender, instance, created, **kwargs): From ad8b2549d7dc9e1c922935670e9abc6ac2ac7085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 24 Nov 2016 09:56:14 +0100 Subject: [PATCH 055/144] Fix sending events accidentally before commit --- taiga/events/events.py | 17 +++++++++++------ .../commands/emit_notification_message.py | 2 +- taiga/events/signal_handlers.py | 7 ++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/taiga/events/events.py b/taiga/events/events.py index 2df3dd37..bbd8735c 100644 --- a/taiga/events/events.py +++ b/taiga/events/events.py @@ -17,10 +17,9 @@ # along with this program. If not, see . -import json import collections -from django.contrib.contenttypes.models import ContentType +from django.db import connection from taiga.base.utils import json from taiga.base.utils.db import get_typename_for_model_instance @@ -39,7 +38,8 @@ watched_types = set([ def emit_event(data:dict, routing_key:str, *, - sessionid:str=None, channel:str="events"): + sessionid:str=None, channel:str="events", + on_commit:bool=True): if not sessionid: sessionid = mw.get_current_session_id() @@ -47,9 +47,14 @@ def emit_event(data:dict, routing_key:str, *, "data": data} backend = backends.get_events_backend() - return backend.emit_event(message=json.dumps(data), - routing_key=routing_key, - channel=channel) + + def backend_emit_event(): + backend.emit_event(message=json.dumps(data), routing_key=routing_key, channel=channel) + + if on_commit: + connection.on_commit(backend_emit_event) + else: + backend_emit_event() def emit_event_for_model(obj, *, type:str="change", channel:str="events", diff --git a/taiga/events/management/commands/emit_notification_message.py b/taiga/events/management/commands/emit_notification_message.py index 7ae7facc..ed5365d2 100644 --- a/taiga/events/management/commands/emit_notification_message.py +++ b/taiga/events/management/commands/emit_notification_message.py @@ -33,4 +33,4 @@ class Command(BaseCommand): "desc": options["description"], } routing_key = "notifications" - emit_event(data, routing_key) + emit_event(data, routing_key, on_commit=False) diff --git a/taiga/events/signal_handlers.py b/taiga/events/signal_handlers.py index cb2a1250..e310fcf1 100644 --- a/taiga/events/signal_handlers.py +++ b/taiga/events/signal_handlers.py @@ -17,7 +17,6 @@ # along with this program. If not, see . from django.db.models import signals -from django.db import connection from django.dispatch import receiver @@ -43,8 +42,7 @@ def on_save_any_model(sender, instance, created, **kwargs): if created: type = "create" - emit_event = lambda: events.emit_event_for_model(instance, sessionid=sesionid, type=type) - connection.on_commit(emit_event) + events.emit_event_for_model(instance, sessionid=sesionid, type=type) def on_delete_any_model(sender, instance, **kwargs): @@ -57,5 +55,4 @@ def on_delete_any_model(sender, instance, **kwargs): sesionid = mw.get_current_session_id() - emit_event = lambda: events.emit_event_for_model(instance, sessionid=sesionid, type="delete") - connection.on_commit(emit_event) + events.emit_event_for_model(instance, sessionid=sesionid, type="delete") From 39dabdb0c8a7282f11fc8644bd3eecea25d64ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 24 Nov 2016 11:53:40 +0100 Subject: [PATCH 056/144] Fix deprectae warnings with amqp >= 2.x --- taiga/events/backends/rabbitmq.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/taiga/events/backends/rabbitmq.py b/taiga/events/backends/rabbitmq.py index 829dcf3a..c09113c6 100644 --- a/taiga/events/backends/rabbitmq.py +++ b/taiga/events/backends/rabbitmq.py @@ -50,17 +50,21 @@ class EventsPushBackend(base.BaseEventsPushBackend): def emit_event(self, message:str, *, routing_key:str, channel:str="events"): connection = _make_rabbitmq_connection(self.url) - try: - rchannel = connection.channel() - message = AmqpMessage(message) + connection.connect() + except ConnectionRefusedError: + log.error("EventsPushBackend: Unable to connect with RabbitMQ at {}".format(self.url), + exc_info=True) + else: + try: + message = AmqpMessage(message) + rchannel = connection.channel() - rchannel.exchange_declare(exchange=channel, type="topic", auto_delete=True) - rchannel.basic_publish(message, routing_key=routing_key, exchange=channel) - rchannel.close() - - except Exception: - log.error("Unhandled exception", exc_info=True) - - finally: - connection.close() + rchannel.exchange_declare(exchange=channel, type="topic", auto_delete=True) + rchannel.basic_publish(message, routing_key=routing_key, exchange=channel) + rchannel.close() + except Exception: + log.error("EventsPushBackend: Unhandled exception", + exc_info=True) + finally: + connection.close() From 2c170f3d04629939c376bce8d666139d0a912090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 22 Nov 2016 08:30:59 +0100 Subject: [PATCH 057/144] Add rich text custom field --- CHANGELOG.md | 12 +++- taiga/mdrender/service.py | 2 +- taiga/projects/custom_attributes/choices.py | 2 + taiga/projects/history/freeze_impl.py | 14 +++-- taiga/projects/history/models.py | 15 ++++- .../emails/includes/fields_diff-html.jinja | 60 ++++++++++++------- .../emails/includes/fields_diff-text.jinja | 26 ++++---- 7 files changed, 86 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88c5c4a3..08e9819c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ # Changelog # -## 3.1.0 ¿¿?? (¿¿??) + +## 3.1.0 unnamed (unreleased) ### Features - Contact with the project: if the projects have this module enabled Taiga users can contact them. -- Memberships API endpoints now allows using usernames and emails instead of using only emails -- Contacts API search by free text: consulting the username, full name and email +- Memberships API endpoints now allows using usernames and emails instead of using only emails. +- Contacts API search by free text: consulting the username, full name and email. +- Ability to create rich text custom fields in Epics, User Stories, Tasks and Isues. + +### Misc +- Lots of small and not so small bugfixes. + ## 3.0.0 Stellaria Borealis (2016-10-02) diff --git a/taiga/mdrender/service.py b/taiga/mdrender/service.py index 701ed0d4..c24454e4 100644 --- a/taiga/mdrender/service.py +++ b/taiga/mdrender/service.py @@ -167,7 +167,7 @@ class DiffMatchPatch(diff_match_patch.diff_match_patch): def get_diff_of_htmls(html1, html2): diffutil = DiffMatchPatch() - diffs = diffutil.diff_main(html1, html2) + diffs = diffutil.diff_main(html1 or "", html2 or "") diffutil.diff_cleanupSemantic(diffs) return diffutil.diff_pretty_html(diffs) diff --git a/taiga/projects/custom_attributes/choices.py b/taiga/projects/custom_attributes/choices.py index d03ce070..355cf4d1 100644 --- a/taiga/projects/custom_attributes/choices.py +++ b/taiga/projects/custom_attributes/choices.py @@ -21,12 +21,14 @@ from django.utils.translation import ugettext_lazy as _ TEXT_TYPE = "text" MULTILINE_TYPE = "multiline" +RICHTEXT_TYPE = "richtext" DATE_TYPE = "date" URL_TYPE = "url" TYPES_CHOICES = ( (TEXT_TYPE, _("Text")), (MULTILINE_TYPE, _("Multi-Line Text")), + (RICHTEXT_TYPE, _("Rich text")), (DATE_TYPE, _("Date")), (URL_TYPE, _("Url")) ) diff --git a/taiga/projects/history/freeze_impl.py b/taiga/projects/history/freeze_impl.py index 027691b6..159d7a3f 100644 --- a/taiga/projects/history/freeze_impl.py +++ b/taiga/projects/history/freeze_impl.py @@ -208,13 +208,14 @@ def extract_attachments(obj) -> list: @as_tuple def extract_epic_custom_attributes(obj) -> list: with suppress(ObjectDoesNotExist): - custom_attributes_values = obj.custom_attributes_values.attributes_values + custom_attributes_values = obj.custom_attributes_values.attributes_values for attr in obj.project.epiccustomattributes.all(): with suppress(KeyError): value = custom_attributes_values[str(attr.id)] yield {"id": attr.id, "name": attr.name, - "value": value} + "value": value, + "type": attr.type} @as_tuple @@ -226,7 +227,8 @@ def extract_user_story_custom_attributes(obj) -> list: value = custom_attributes_values[str(attr.id)] yield {"id": attr.id, "name": attr.name, - "value": value} + "value": value, + "type": attr.type} @as_tuple @@ -238,7 +240,8 @@ def extract_task_custom_attributes(obj) -> list: value = custom_attributes_values[str(attr.id)] yield {"id": attr.id, "name": attr.name, - "value": value} + "value": value, + "type": attr.type} @as_tuple @@ -250,7 +253,8 @@ def extract_issue_custom_attributes(obj) -> list: value = custom_attributes_values[str(attr.id)] yield {"id": attr.id, "name": attr.name, - "value": value} + "value": value, + "type": attr.type} def project_freezer(project) -> dict: diff --git a/taiga/projects/history/models.py b/taiga/projects/history/models.py index 9f60b0ab..1a2ded60 100644 --- a/taiga/projects/history/models.py +++ b/taiga/projects/history/models.py @@ -30,6 +30,7 @@ from .choices import HistoryType from .choices import HISTORY_TYPE_CHOICES from taiga.base.utils.diff import make_diff as make_diff_from_dicts +from taiga.projects.custom_attributes.choices import TEXT_TYPE # This keys has been removed from freeze_impl so we can have objects where the # previous diff has value for the attribute and we want to prevent their propagation @@ -250,15 +251,25 @@ class HistoryEntry(models.Model): changes = make_diff_from_dicts(oldcustattrs[aid], newcustattrs[aid], excluded_keys=("name")) + newcustattr = newcustattrs.get(aid, {}) if changes: + change_type = newcustattr.get("type", TEXT_TYPE) + old_value = oldcustattrs[aid].get("value", "") + new_value = newcustattrs[aid].get("value", "") + value_diff = get_diff_of_htmls(old_value, new_value) change = { - "name": newcustattrs.get(aid, {}).get("name", ""), - "changes": changes + "name": newcustattr.get("name", ""), + "changes": changes, + "type": change_type, + "value_diff": value_diff } custom_attributes["changed"].append(change) elif aid in oldcustattrs and aid not in newcustattrs: custom_attributes["deleted"].append(oldcustattrs[aid]) elif aid not in oldcustattrs and aid in newcustattrs: + new_value = newcustattrs[aid].get("value", "") + value_diff = get_diff_of_htmls("", new_value) + newcustattrs[aid]["value_diff"] = value_diff custom_attributes["new"].append(newcustattrs[aid]) if custom_attributes["new"] or custom_attributes["changed"] or custom_attributes["deleted"]: diff --git a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja index eadca5c3..1f7fa5ce 100644 --- a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja +++ b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja @@ -170,40 +170,58 @@ {# CUSTOM ATTRIBUTES #} {% if values.new %} {% for attr in values['new']%} -     - - - - - - {% endfor %} - {% endif %} - {% if values.changed %} - {% for attr in values['changed'] %} - {% if attr.changes.value%} + {% if attr.type == "richtext" %} + + + + {% else %} - {% endif %} {% endfor %} {% endif %} + {% if values.changed %} + {% for attr in values['changed'] %} + {% if attr.changes.value%} + {% if attr.type == "richtext" %} + + + + {% else %} + + + + + + + + {% endif %} + {% endif %} + {% endfor %} + {% endif %} {% if values.deleted %} {% for attr in values['deleted']%} diff --git a/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja b/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja index ff0a1b0d..dd2975aa 100644 --- a/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja +++ b/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja @@ -66,27 +66,27 @@ {% elif field_name == "custom_attributes" %} {# CUSTOM ATTRIBUTES #} - {% elif field_name == "attachments" %} - {% if values.new %} - {% for attr in values['new']%} + {% if values.new %} + {% for attr in values['new']%} + - {{ attr.name }}: * {{ attr.value }} - {% endfor %} - {% endif %} + {% endfor %} + {% endif %} - {% if values.changed %} - {% for attr in values['changed'] %} + {% if values.changed %} + {% for attr in values['changed'] %} - {{ attr.name }}: * {{ _("From:") }} {{ attr.changes.value.0 }} * {{ _("To:") }} {{ attr.changes.value.1 }} - {% endfor %} - {% endif %} + {% endfor %} + {% endif %} - {% if values.deleted %} - {% for attr in values['deleted']%} + {% if values.deleted %} + {% for attr in values['deleted']%} - {{ attr.name }}: {{ _("-deleted-") }} * {{ attr.value }} - {% endfor %} - {% endif %} + {% endfor %} + {% endif %} {% endif %} {% endfor %} From 26e45907d76be6c0765d924cec4227e57eaca650 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 25 Nov 2016 10:00:30 +0100 Subject: [PATCH 058/144] Transforming tags to lowercase on creation --- taiga/projects/tagging/services.py | 4 ++-- taiga/projects/tagging/validators.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/taiga/projects/tagging/services.py b/taiga/projects/tagging/services.py index 4e7fe1f7..e281eaa5 100644 --- a/taiga/projects/tagging/services.py +++ b/taiga/projects/tagging/services.py @@ -24,12 +24,12 @@ def tag_exist_for_project_elements(project, tag): def create_tags(project, new_tags_colors): - project.tags_colors += [[k, v] for k, v in new_tags_colors.items()] + project.tags_colors += [[k.lower(), v] for k, v in new_tags_colors.items()] project.save(update_fields=["tags_colors"]) def create_tag(project, tag, color): - project.tags_colors.append([tag, color]) + project.tags_colors.append([tag.lower(), color]) project.save(update_fields=["tags_colors"]) diff --git a/taiga/projects/tagging/validators.py b/taiga/projects/tagging/validators.py index ea0c32c8..4070045d 100644 --- a/taiga/projects/tagging/validators.py +++ b/taiga/projects/tagging/validators.py @@ -50,7 +50,7 @@ class CreateTagValidator(ProjectTagValidator): def validate_color(self, attrs, source): color = attrs.get(source, None) - if color is not None and not re.match('^\#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$', color): + if color and not re.match('^\#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$', color): raise ValidationError(_("The color is not a valid HEX color.")) return attrs From e3226f4cb9fc9b6d2be507cab1bf1e9514616a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Fri, 25 Nov 2016 17:31:38 +0100 Subject: [PATCH 059/144] Fix notificacion when change assignement and they are disabled --- taiga/projects/notifications/services.py | 18 ++++++----- tests/integration/test_notifications.py | 40 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/taiga/projects/notifications/services.py b/taiga/projects/notifications/services.py index dfe71f15..b8453b16 100644 --- a/taiga/projects/notifications/services.py +++ b/taiga/projects/notifications/services.py @@ -131,7 +131,7 @@ def _filter_notificable(user): return user.is_active and not user.is_system -def get_users_to_notify(obj, *, discard_users=None) -> list: +def get_users_to_notify(obj, *, history=None, discard_users=None) -> list: """ Get filtered set of users to notify for specified model instance and changer. @@ -156,13 +156,21 @@ def get_users_to_notify(obj, *, discard_users=None) -> list: candidates.update(filter(_can_notify_light, obj.get_watchers())) candidates.update(filter(_can_notify_light, obj.get_participants())) + # If the history is an unassignment change we should notify that user too + if history and history.type == HistoryType.change and "assigned_to" in history.diff: + assigned_to_users = get_user_model().objects.filter(id__in=history.diff["assigned_to"]) + candidates.update(filter(_can_notify_light, assigned_to_users)) + # Remove the changer from candidates if discard_users: candidates = candidates - set(discard_users) + # Filter by object permissions candidates = set(filter(partial(_filter_by_permissions, obj), candidates)) + # Filter disabled and system users candidates = set(filter(partial(_filter_notificable), candidates)) + return frozenset(candidates) @@ -218,15 +226,9 @@ def send_notifications(obj, *, history): # Get a complete list of notifiable users for current # object and send the change notification to them. - notify_users = get_users_to_notify(obj, discard_users=[notification.owner]) + notify_users = get_users_to_notify(obj, history=history, discard_users=[notification.owner]) notification.notify_users.add(*notify_users) - # If the history is an unassignment change we should notify that user too - if history.type == HistoryType.change and "assigned_to" in history.diff: - for assigned_to in history.diff["assigned_to"]: - if assigned_to is not None and owner.id != assigned_to: - notification.notify_users.add(assigned_to) - # If we are the min interval is 0 it just work in a synchronous and spamming way if settings.CHANGE_NOTIFICATIONS_MIN_INTERVAL == 0: send_sync_notifications(notification.id) diff --git a/tests/integration/test_notifications.py b/tests/integration/test_notifications.py index cdd29270..4bc99ad1 100644 --- a/tests/integration/test_notifications.py +++ b/tests/integration/test_notifications.py @@ -762,6 +762,46 @@ def test_send_notifications_on_unassigned(client, mail): assert mail.outbox[0].to == [member2.user.email] +def test_send_notifications_on_unassigned_and_notifications_are_disabled(client, mail): + project = f.ProjectFactory.create() + role = f.RoleFactory.create(project=project, permissions=['modify_issue', 'view_issues', 'view_us', 'view_tasks', 'view_wiki_pages']) + member1 = f.MembershipFactory.create(project=project, role=role) + member2 = f.MembershipFactory.create(project=project, role=role) + + member2_notify_policy = member2.user.notify_policies.get(project=project) + member2_notify_policy.notify_level = NotifyLevel.none + member2_notify_policy.save() + + issue = f.IssueFactory.create(project=project, + owner=member1.user, + milestone=None, + status=project.default_issue_status, + severity=project.default_severity, + priority=project.default_priority, + type=project.default_issue_type) + + take_snapshot(issue, user=issue.owner) + + client.login(member1.user) + url = reverse("issues-detail", args=[issue.pk]) + data = { + "assigned_to": member2.user.id, + "version": issue.version + } + response = client.json.patch(url, json.dumps(data)) + assert len(mail.outbox) == 0 + + mail.outbox = [] + + data = { + "assigned_to": None, + "version": issue.version + 1 + } + response = client.json.patch(url, json.dumps(data)) + assert len(mail.outbox) == 0 + + + def test_not_send_notifications_on_unassigned_if_executer_and_unassigned_match(client, mail): project = f.ProjectFactory.create() role = f.RoleFactory.create(project=project, permissions=['modify_issue', 'view_issues', 'view_us', 'view_tasks', 'view_wiki_pages']) From 421a213f5e8d6c2d8ee5d425ae8705898e9ff9bd Mon Sep 17 00:00:00 2001 From: Michael Jurke Date: Tue, 8 Nov 2016 21:40:02 +0100 Subject: [PATCH 060/144] Add estimated_start, estimated_finish filters to tasks, userstories and milestones --- CHANGELOG.md | 1 + taiga/base/filters.py | 16 +++++ taiga/projects/milestones/api.py | 8 ++- taiga/projects/tasks/api.py | 2 + taiga/projects/userstories/api.py | 2 + tests/integration/test_milestones.py | 98 +++++++++++++++++++++++++++ tests/integration/test_tasks.py | 32 +++++++++ tests/integration/test_userstories.py | 31 +++++++++ 8 files changed, 189 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08e9819c..644df116 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Ability to create rich text custom fields in Epics, User Stories, Tasks and Isues. ### Misc +- API: Filter milestones, user stories and tasks by estimated_start and estimated_finish dates. - Lots of small and not so small bugfixes. diff --git a/taiga/base/filters.py b/taiga/base/filters.py index 06274128..80c7e280 100644 --- a/taiga/base/filters.py +++ b/taiga/base/filters.py @@ -526,6 +526,22 @@ class FinishDateFilter(BaseDateFilter): filter_name_base = "finish_date" +class EstimatedStartFilter(BaseDateFilter): + filter_name_base = "estimated_start" + + +class EstimatedFinishFilter(BaseDateFilter): + filter_name_base = "estimated_finish" + + +class MilestoneEstimatedStartFilter(BaseDateFilter): + filter_name_base = "milestone__estimated_start" + + +class MilestoneEstimatedFinishFilter(BaseDateFilter): + filter_name_base = "milestone__estimated_finish" + + ##################################################################### # Text search filters ##################################################################### diff --git a/taiga/projects/milestones/api.py b/taiga/projects/milestones/api.py index 820e90c7..e53c8110 100644 --- a/taiga/projects/milestones/api.py +++ b/taiga/projects/milestones/api.py @@ -46,7 +46,13 @@ class MilestoneViewSet(HistoryResourceMixin, WatchedResourceMixin, serializer_class = serializers.MilestoneSerializer validator_class = validators.MilestoneValidator permission_classes = (permissions.MilestonePermission,) - filter_backends = (filters.CanViewMilestonesFilterBackend,) + filter_backends = ( + filters.CanViewMilestonesFilterBackend, + filters.CreatedDateFilter, + filters.ModifiedDateFilter, + filters.EstimatedStartFilter, + filters.EstimatedFinishFilter, + ) filter_fields = ( "project", "project__slug", diff --git a/taiga/projects/tasks/api.py b/taiga/projects/tasks/api.py index 39fb8cbc..75026865 100644 --- a/taiga/projects/tasks/api.py +++ b/taiga/projects/tasks/api.py @@ -59,6 +59,8 @@ class TaskViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, Wa filters.QFilter, filters.CreatedDateFilter, filters.ModifiedDateFilter, + filters.MilestoneEstimatedStartFilter, + filters.MilestoneEstimatedFinishFilter, filters.FinishedDateFilter) filter_fields = ["user_story", "milestone", diff --git a/taiga/projects/userstories/api.py b/taiga/projects/userstories/api.py index bb888f88..3df5ddc9 100644 --- a/taiga/projects/userstories/api.py +++ b/taiga/projects/userstories/api.py @@ -70,6 +70,8 @@ class UserStoryViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixi base_filters.CreatedDateFilter, base_filters.ModifiedDateFilter, base_filters.FinishDateFilter, + base_filters.MilestoneEstimatedStartFilter, + base_filters.MilestoneEstimatedFinishFilter, base_filters.OrderByFilterMixin) filter_fields = ["project", "project__slug", diff --git a/tests/integration/test_milestones.py b/tests/integration/test_milestones.py index 18562a8e..61a54bc8 100644 --- a/tests/integration/test_milestones.py +++ b/tests/integration/test_milestones.py @@ -18,6 +18,10 @@ # along with this program. If not, see . import pytest +import pytz + +from datetime import datetime, timedelta +from urllib.parse import quote from django.core.urlresolvers import reverse @@ -82,3 +86,97 @@ def test_list_milestones_taiga_info_headers(client): assert response2.has_header("Taiga-Info-Total-Opened-Milestones") == True assert response2["taiga-info-total-closed-milestones"] == "3" assert response2["taiga-info-total-opened-milestones"] == "1" + + +def test_api_filter_by_created_date__lte(client): + user = f.UserFactory.create() + project = f.ProjectFactory.create(owner=user) + role = f.RoleFactory.create(project=project) + f.MembershipFactory.create( + project=project, user=user, role=role, is_admin=True + ) + one_day_ago = datetime.now(pytz.utc) - timedelta(days=1) + + old_milestone = f.MilestoneFactory.create( + project=project, owner=user, created_date=one_day_ago + ) + milestone = f.MilestoneFactory.create(project=project, owner=user) + + url = reverse("milestones-list") + "?created_date__lte=%s" % ( + quote(milestone.created_date.isoformat()) + ) + + client.login(milestone.owner) + response = client.get(url) + number_of_milestones = len(response.data) + + assert response.status_code == 200 + assert number_of_milestones == 2 + + +def test_api_filter_by_modified_date__gte(client): + user = f.UserFactory.create() + project = f.ProjectFactory.create(owner=user) + role = f.RoleFactory.create(project=project) + f.MembershipFactory.create( + project=project, user=user, role=role, is_admin=True + ) + one_day_ago = datetime.now(pytz.utc) - timedelta(days=1) + + older_milestone = f.MilestoneFactory.create( + project=project, owner=user, created_date=one_day_ago + ) + milestone = f.MilestoneFactory.create(project=project, owner=user) + # we have to refresh as it slightly differs + milestone.refresh_from_db() + + assert older_milestone.modified_date < milestone.modified_date + + url = reverse("milestones-list") + "?modified_date__gte=%s" % ( + quote(milestone.modified_date.isoformat()) + ) + + client.login(milestone.owner) + response = client.get(url) + number_of_milestones = len(response.data) + + assert response.status_code == 200 + assert number_of_milestones == 1 + assert response.data[0]["slug"] == milestone.slug + + +@pytest.mark.parametrize("field_name", [ + "estimated_start", "estimated_finish" +]) +def test_api_filter_by_milestone__estimated_start_and_end(client, field_name): + user = f.UserFactory.create() + project = f.ProjectFactory.create(owner=user) + role = f.RoleFactory.create(project=project) + f.MembershipFactory.create( + project=project, user=user, role=role, is_admin=True + ) + milestone = f.MilestoneFactory.create(project=project, owner=user) + + assert hasattr(milestone, field_name) + date = getattr(milestone, field_name) + before = (date - timedelta(days=1)).isoformat() + after = (date + timedelta(days=1)).isoformat() + + client.login(milestone.owner) + + expections = { + field_name + "__gte=" + quote(before): 1, + field_name + "__gte=" + quote(after): 0, + field_name + "__lte=" + quote(before): 0, + field_name + "__lte=" + quote(after): 1 + } + + for param, expection in expections.items(): + url = reverse("milestones-list") + "?" + param + response = client.get(url) + number_of_milestones = len(response.data) + + assert response.status_code == 200 + assert number_of_milestones == expection, param + if number_of_milestones > 0: + assert response.data[0]["slug"] == milestone.slug diff --git a/tests/integration/test_tasks.py b/tests/integration/test_tasks.py index 04546233..cdda8375 100644 --- a/tests/integration/test_tasks.py +++ b/tests/integration/test_tasks.py @@ -702,6 +702,38 @@ def test_api_filter_by_finished_date(client): assert response.data[0]["subject"] == finished_task.subject +@pytest.mark.parametrize("field_name", ["estimated_start", "estimated_finish"]) +def test_api_filter_by_milestone__estimated_start_and_end(client, field_name): + user = f.UserFactory(is_superuser=True) + task = f.create_task(owner=user) + + assert task.milestone + assert hasattr(task.milestone, field_name) + date = getattr(task.milestone, field_name) + before = (date - timedelta(days=1)).isoformat() + after = (date + timedelta(days=1)).isoformat() + + client.login(task.owner) + + full_field_name = "milestone__" + field_name + expections = { + full_field_name + "__gte=" + quote(before): 1, + full_field_name + "__gte=" + quote(after): 0, + full_field_name + "__lte=" + quote(before): 0, + full_field_name + "__lte=" + quote(after): 1 + } + + for param, expection in expections.items(): + url = reverse("tasks-list") + "?" + param + response = client.get(url) + number_of_tasks = len(response.data) + + assert response.status_code == 200 + assert number_of_tasks == expection, param + if number_of_tasks > 0: + assert response.data[0]["subject"] == task.subject + + def test_api_filters_data(client): project = f.ProjectFactory.create() user1 = f.UserFactory.create(is_superuser=True) diff --git a/tests/integration/test_userstories.py b/tests/integration/test_userstories.py index daae88a5..3ff5f345 100644 --- a/tests/integration/test_userstories.py +++ b/tests/integration/test_userstories.py @@ -655,6 +655,37 @@ def test_api_filter_by_finish_date(client): assert number_of_userstories == 1 assert response.data[0]["subject"] == userstory_to_finish.subject +@pytest.mark.parametrize("field_name", ["estimated_start", "estimated_finish"]) +def test_api_filter_by_milestone__estimated_start_and_end(client, field_name): + user = f.UserFactory(is_superuser=True) + userstory = f.create_userstory(owner=user) + + assert userstory.milestone + assert hasattr(userstory.milestone, field_name) + date = getattr(userstory.milestone, field_name) + before = (date - timedelta(days=1)).isoformat() + after = (date + timedelta(days=1)).isoformat() + + client.login(userstory.owner) + + full_field_name = "milestone__" + field_name + expections = { + full_field_name + "__gte=" + quote(before): 1, + full_field_name + "__gte=" + quote(after): 0, + full_field_name + "__lte=" + quote(before): 0, + full_field_name + "__lte=" + quote(after): 1 + } + + for param, expection in expections.items(): + url = reverse("userstories-list") + "?" + param + response = client.get(url) + number_of_userstories = len(response.data) + + assert response.status_code == 200 + assert number_of_userstories == expection, param + if number_of_userstories > 0: + assert response.data[0]["subject"] == userstory.subject + def test_api_filters_data(client): project = f.ProjectFactory.create() From d5bc770334d1f284acdd430e82f7c988166870c0 Mon Sep 17 00:00:00 2001 From: Michael Jurke Date: Sun, 6 Nov 2016 14:16:20 +0100 Subject: [PATCH 061/144] Add project extra info to epics, wiki pages, issues, tasks and milestones list serializers --- CHANGELOG.md | 4 +++- taiga/projects/epics/serializers.py | 4 +++- taiga/projects/issues/serializers.py | 3 ++- taiga/projects/milestones/serializers.py | 5 ++++- taiga/projects/tasks/serializers.py | 8 +++++--- taiga/projects/wiki/serializers.py | 6 +++++- 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 644df116..1561f620 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,9 @@ - Ability to create rich text custom fields in Epics, User Stories, Tasks and Isues. ### Misc -- API: Filter milestones, user stories and tasks by estimated_start and estimated_finish dates. +- API: + - Filter milestones, user stories and tasks by estimated_start and estimated_finish dates. + - Add project_extra_info to epics, tasks, milestones, issues and wiki pages endpoints. - Lots of small and not so small bugfixes. diff --git a/taiga/projects/epics/serializers.py b/taiga/projects/epics/serializers.py index 339272de..feccc79a 100644 --- a/taiga/projects/epics/serializers.py +++ b/taiga/projects/epics/serializers.py @@ -23,6 +23,7 @@ from taiga.base.neighbors import NeighborsSerializerMixin from taiga.mdrender.service import render as mdrender from taiga.projects.attachments.serializers import BasicAttachmentsInfoSerializerMixin from taiga.projects.mixins.serializers import OwnerExtraInfoSerializerMixin +from taiga.projects.mixins.serializers import ProjectExtraInfoSerializerMixin from taiga.projects.mixins.serializers import AssignedToExtraInfoSerializerMixin from taiga.projects.mixins.serializers import StatusExtraInfoSerializerMixin from taiga.projects.notifications.mixins import WatchedResourceSerializer @@ -32,7 +33,8 @@ from taiga.projects.votes.mixins.serializers import VoteResourceSerializerMixin class EpicListSerializer(VoteResourceSerializerMixin, WatchedResourceSerializer, OwnerExtraInfoSerializerMixin, AssignedToExtraInfoSerializerMixin, - StatusExtraInfoSerializerMixin, BasicAttachmentsInfoSerializerMixin, + StatusExtraInfoSerializerMixin, ProjectExtraInfoSerializerMixin, + BasicAttachmentsInfoSerializerMixin, TaggedInProjectResourceSerializer, serializers.LightSerializer): id = Field() diff --git a/taiga/projects/issues/serializers.py b/taiga/projects/issues/serializers.py index c8d3b5dc..8ec8e492 100644 --- a/taiga/projects/issues/serializers.py +++ b/taiga/projects/issues/serializers.py @@ -22,6 +22,7 @@ from taiga.base.neighbors import NeighborsSerializerMixin from taiga.mdrender.service import render as mdrender from taiga.projects.mixins.serializers import OwnerExtraInfoSerializerMixin +from taiga.projects.mixins.serializers import ProjectExtraInfoSerializerMixin from taiga.projects.mixins.serializers import AssignedToExtraInfoSerializerMixin from taiga.projects.mixins.serializers import StatusExtraInfoSerializerMixin from taiga.projects.notifications.mixins import WatchedResourceSerializer @@ -31,7 +32,7 @@ from taiga.projects.votes.mixins.serializers import VoteResourceSerializerMixin class IssueListSerializer(VoteResourceSerializerMixin, WatchedResourceSerializer, OwnerExtraInfoSerializerMixin, AssignedToExtraInfoSerializerMixin, - StatusExtraInfoSerializerMixin, + StatusExtraInfoSerializerMixin, ProjectExtraInfoSerializerMixin, TaggedInProjectResourceSerializer, serializers.LightSerializer): id = Field() ref = Field() diff --git a/taiga/projects/milestones/serializers.py b/taiga/projects/milestones/serializers.py index 44b3e8f4..49f7e09c 100644 --- a/taiga/projects/milestones/serializers.py +++ b/taiga/projects/milestones/serializers.py @@ -20,9 +20,12 @@ from taiga.base.api import serializers from taiga.base.fields import Field, MethodField from taiga.projects.notifications.mixins import WatchedResourceSerializer from taiga.projects.userstories.serializers import UserStoryListSerializer +from taiga.projects.mixins.serializers import ProjectExtraInfoSerializerMixin -class MilestoneSerializer(WatchedResourceSerializer, serializers.LightSerializer): +class MilestoneSerializer(WatchedResourceSerializer, + ProjectExtraInfoSerializerMixin, + serializers.LightSerializer): id = Field() name = Field() slug = Field() diff --git a/taiga/projects/tasks/serializers.py b/taiga/projects/tasks/serializers.py index c1fca652..0a877b4f 100644 --- a/taiga/projects/tasks/serializers.py +++ b/taiga/projects/tasks/serializers.py @@ -23,6 +23,7 @@ from taiga.base.neighbors import NeighborsSerializerMixin from taiga.mdrender.service import render as mdrender from taiga.projects.attachments.serializers import BasicAttachmentsInfoSerializerMixin from taiga.projects.mixins.serializers import OwnerExtraInfoSerializerMixin +from taiga.projects.mixins.serializers import ProjectExtraInfoSerializerMixin from taiga.projects.mixins.serializers import AssignedToExtraInfoSerializerMixin from taiga.projects.mixins.serializers import StatusExtraInfoSerializerMixin from taiga.projects.notifications.mixins import WatchedResourceSerializer @@ -30,11 +31,12 @@ from taiga.projects.tagging.serializers import TaggedInProjectResourceSerializer from taiga.projects.votes.mixins.serializers import VoteResourceSerializerMixin from taiga.projects.history.mixins import TotalCommentsSerializerMixin + class TaskListSerializer(VoteResourceSerializerMixin, WatchedResourceSerializer, OwnerExtraInfoSerializerMixin, AssignedToExtraInfoSerializerMixin, - StatusExtraInfoSerializerMixin, BasicAttachmentsInfoSerializerMixin, - TaggedInProjectResourceSerializer, TotalCommentsSerializerMixin, - serializers.LightSerializer): + StatusExtraInfoSerializerMixin, ProjectExtraInfoSerializerMixin, + BasicAttachmentsInfoSerializerMixin, TaggedInProjectResourceSerializer, + TotalCommentsSerializerMixin, serializers.LightSerializer): id = Field() user_story = Field(attr="user_story_id") diff --git a/taiga/projects/wiki/serializers.py b/taiga/projects/wiki/serializers.py index a7e36c60..548fbd17 100644 --- a/taiga/projects/wiki/serializers.py +++ b/taiga/projects/wiki/serializers.py @@ -19,11 +19,15 @@ from taiga.base.api import serializers from taiga.base.fields import Field, MethodField from taiga.projects.history import services as history_service +from taiga.projects.mixins.serializers import ProjectExtraInfoSerializerMixin from taiga.projects.notifications.mixins import WatchedResourceSerializer from taiga.mdrender.service import render as mdrender -class WikiPageSerializer(WatchedResourceSerializer, serializers.LightSerializer): +class WikiPageSerializer( + WatchedResourceSerializer, ProjectExtraInfoSerializerMixin, + serializers.LightSerializer +): id = Field() project = Field(attr="project_id") slug = Field() From 6d4a4cca9b32d45025077cb9ac4125670c992a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 30 Nov 2016 19:12:31 +0100 Subject: [PATCH 062/144] Fix json_to_jsonb migrations --- .../migrations/0011_json_to_jsonb.py | 8 +++---- .../history/migrations/0014_json_to_jsonb.py | 14 ++++++------ .../projects/migrations/0055_json_to_jsonb.py | 22 +++++++++---------- .../timeline/migrations/0006_json_to_jsonb.py | 2 +- taiga/users/migrations/0023_json_to_jsonb.py | 2 +- .../migrations/0003_json_to_jsonb.py | 2 +- .../webhooks/migrations/0006_json_to_jsonb.py | 6 ++--- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py b/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py index cfe4ff4c..bbe14196 100644 --- a/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py +++ b/taiga/projects/custom_attributes/migrations/0011_json_to_jsonb.py @@ -17,7 +17,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("{column_name}"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """.format( table_name="custom_attributes_epiccustomattributesvalues", column_name="attributes_values", @@ -29,7 +29,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("{column_name}"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """.format( table_name="custom_attributes_userstorycustomattributesvalues", column_name="attributes_values", @@ -41,7 +41,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("{column_name}"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """.format( table_name="custom_attributes_taskcustomattributesvalues", column_name="attributes_values", @@ -53,7 +53,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("{column_name}"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """.format( table_name="custom_attributes_issuecustomattributesvalues", column_name="attributes_values", diff --git a/taiga/projects/history/migrations/0014_json_to_jsonb.py b/taiga/projects/history/migrations/0014_json_to_jsonb.py index c0704233..940217d9 100644 --- a/taiga/projects/history/migrations/0014_json_to_jsonb.py +++ b/taiga/projects/history/migrations/0014_json_to_jsonb.py @@ -18,31 +18,31 @@ class Migration(migrations.Migration): ALTER TABLE "history_historyentry" ALTER COLUMN "delete_comment_user" TYPE jsonb - USING regexp_replace("delete_comment_user"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("delete_comment_user"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "comment_versions" TYPE jsonb - USING regexp_replace("comment_versions"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("comment_versions"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "values_diff_cache" TYPE jsonb - USING regexp_replace("values_diff_cache"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("values_diff_cache"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "user" TYPE jsonb - USING regexp_replace("user"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("user"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "diff" TYPE jsonb - USING regexp_replace("diff"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("diff"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "snapshot" TYPE jsonb - USING regexp_replace("snapshot"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("snapshot"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "values" TYPE jsonb - USING regexp_replace("values"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("values"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """, reverse_sql=migrations.RunSQL.noop ), diff --git a/taiga/projects/migrations/0055_json_to_jsonb.py b/taiga/projects/migrations/0055_json_to_jsonb.py index 4530bf7f..f84d35c0 100644 --- a/taiga/projects/migrations/0055_json_to_jsonb.py +++ b/taiga/projects/migrations/0055_json_to_jsonb.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ALTER TABLE "projects_projectmodulesconfig" ALTER COLUMN "config" TYPE jsonb - USING regexp_replace("config"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("config"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """, reverse_sql=migrations.RunSQL.noop ), @@ -27,43 +27,43 @@ class Migration(migrations.Migration): ALTER TABLE "projects_projecttemplate" ALTER COLUMN "roles" TYPE jsonb - USING regexp_replace("roles"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("roles"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "default_options" TYPE jsonb - USING regexp_replace("default_options"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("default_options"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "epic_statuses" TYPE jsonb - USING regexp_replace("epic_statuses"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("epic_statuses"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "us_statuses" TYPE jsonb - USING regexp_replace("us_statuses"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("us_statuses"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "points" TYPE jsonb - USING regexp_replace("points"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("points"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "task_statuses" TYPE jsonb - USING regexp_replace("task_statuses"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("task_statuses"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "issue_statuses" TYPE jsonb - USING regexp_replace("issue_statuses"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("issue_statuses"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "issue_types" TYPE jsonb - USING regexp_replace("issue_types"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("issue_types"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "priorities" TYPE jsonb - USING regexp_replace("priorities"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("priorities"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "severities" TYPE jsonb - USING regexp_replace("severities"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("severities"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """, reverse_sql=migrations.RunSQL.noop ), diff --git a/taiga/timeline/migrations/0006_json_to_jsonb.py b/taiga/timeline/migrations/0006_json_to_jsonb.py index b6b17e54..de9b3830 100644 --- a/taiga/timeline/migrations/0006_json_to_jsonb.py +++ b/taiga/timeline/migrations/0006_json_to_jsonb.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("{column_name}"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """.format( table_name="timeline_timeline", column_name="data", diff --git a/taiga/users/migrations/0023_json_to_jsonb.py b/taiga/users/migrations/0023_json_to_jsonb.py index f16d5699..feb42127 100644 --- a/taiga/users/migrations/0023_json_to_jsonb.py +++ b/taiga/users/migrations/0023_json_to_jsonb.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("{column_name}"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """.format( table_name="users_authdata", column_name="extra", diff --git a/taiga/userstorage/migrations/0003_json_to_jsonb.py b/taiga/userstorage/migrations/0003_json_to_jsonb.py index 228324ac..e828d74c 100644 --- a/taiga/userstorage/migrations/0003_json_to_jsonb.py +++ b/taiga/userstorage/migrations/0003_json_to_jsonb.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ALTER TABLE "{table_name}" ALTER COLUMN "{column_name}" TYPE jsonb - USING regexp_replace("{column_name}"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("{column_name}"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """.format( table_name="userstorage_storageentry", column_name="value", diff --git a/taiga/webhooks/migrations/0006_json_to_jsonb.py b/taiga/webhooks/migrations/0006_json_to_jsonb.py index ed6258e3..fb86ed7b 100644 --- a/taiga/webhooks/migrations/0006_json_to_jsonb.py +++ b/taiga/webhooks/migrations/0006_json_to_jsonb.py @@ -18,15 +18,15 @@ class Migration(migrations.Migration): ALTER TABLE "webhooks_webhooklog" ALTER COLUMN "request_headers" TYPE jsonb - USING regexp_replace("request_headers"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("request_headers"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "request_data" TYPE jsonb - USING regexp_replace("request_data"::text, '\\u0000', '\\\\u0000', 'g')::jsonb, + USING regexp_replace("request_data"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb, ALTER COLUMN "response_headers" TYPE jsonb - USING regexp_replace("response_headers"::text, '\\u0000', '\\\\u0000', 'g')::jsonb; + USING regexp_replace("response_headers"::text, '[\\\\]+u0000', '\\\\\\\\u0000', 'g')::jsonb; """, reverse_sql=migrations.RunSQL.noop ), From e215fa41470e74fbd100ecacdd55d98b47a2b55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 1 Dec 2016 16:02:05 +0100 Subject: [PATCH 063/144] [i18n] Add locales ja nad zh-Hans --- CHANGELOG.md | 3 + settings/common.py | 4 +- taiga/locale/ja/LC_MESSAGES/django.po | 3920 ++++++++++++++++++ taiga/locale/zh-Hans/LC_MESSAGES/django.po | 4144 ++++++++++++++++++++ 4 files changed, 8069 insertions(+), 2 deletions(-) create mode 100644 taiga/locale/ja/LC_MESSAGES/django.po create mode 100644 taiga/locale/zh-Hans/LC_MESSAGES/django.po diff --git a/CHANGELOG.md b/CHANGELOG.md index 1561f620..5b5a5fc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ - Memberships API endpoints now allows using usernames and emails instead of using only emails. - Contacts API search by free text: consulting the username, full name and email. - Ability to create rich text custom fields in Epics, User Stories, Tasks and Isues. +- i18n: + - Add japanese (ja) translation. + - Add chinese simplified (zh-Hans) translation. ### Misc - API: diff --git a/settings/common.py b/settings/common.py index 40694229..c1a60956 100644 --- a/settings/common.py +++ b/settings/common.py @@ -110,7 +110,7 @@ LANGUAGES = [ #("io", "IDO"), # Ido #("is", "Íslenska"), # Icelandic ("it", "Italiano"), # Italian - #("ja", "日本語"), # Japanese + ("ja", "日本語"), # Japanese #("ka", "ქართული"), # Georgian #("kk", "Қазақша"), # Kazakh #("km", "ភាសាខ្មែរ"), # Khmer @@ -151,7 +151,7 @@ LANGUAGES = [ #("uk", "Українська"), # Ukrainian #("ur", "اردو‏"), # Urdu #("vi", "Tiếng Việt"), # Vietnamese - #("zh-hans", "中文(简体)"), # Simplified Chinese + ("zh-hans", "中文(简体)"), # Simplified Chinese ("zh-hant", "中文(香港)"), # Traditional Chinese ] diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po new file mode 100644 index 00000000..631738b1 --- /dev/null +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -0,0 +1,3920 @@ +# taiga-back.taiga. +# Copyright (C) 2014-2016 Taiga Dev Team +# This file is distributed under the same license as the taiga-back package. +# +# Translators: +# Akihiro YAGASAKI , 2016 +# Masaharu KAMIMURA , 2016 +# Nikita K , 2016 +# Shun Yanaura , 2016 +# Suguru Sato , 2016 +# Tomonori Tanabe , 2015 +msgid "" +msgstr "" +"Project-Id-Version: taiga-back\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-09-28 10:29+0200\n" +"PO-Revision-Date: 2016-11-15 15:50+0000\n" +"Last-Translator: Nikita K \n" +"Language-Team: Japanese (http://www.transifex.com/taiga-agile-llc/taiga-back/" +"language/ja/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: taiga/auth/api.py:102 +msgid "Public register is disabled." +msgstr "パブリックなレジスタは無効です。" + +#: taiga/auth/api.py:135 +msgid "invalid register type" +msgstr "このレジスタタイプは無効です。" + +#: taiga/auth/api.py:148 +msgid "invalid login type" +msgstr "このログインタイプは無効です。" + +#: taiga/auth/services.py:76 +msgid "Username is already in use." +msgstr "Username は既に使用されています." + +#: taiga/auth/services.py:79 +msgid "Email is already in use." +msgstr "Email はすでに使用されています." + +#: taiga/auth/services.py:95 +msgid "Token not matches any valid invitation." +msgstr "存在しないトークンです。" + +#: taiga/auth/services.py:123 +msgid "User is already registered." +msgstr "User は既に登録されています." + +#: taiga/auth/services.py:147 +msgid "This user is already a member of the project." +msgstr "このユーザーは既にプロジェクトに追加されています." + +#: taiga/auth/services.py:173 +msgid "Error on creating new user." +msgstr "新しいユーザを作成中にエラーが発生しました。" + +#: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 +#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 +#: taiga/projects/api.py:385 +msgid "Invalid token" +msgstr "トークンが間違っています" + +#: taiga/auth/validators.py:37 taiga/users/validators.py:44 +msgid "invalid username" +msgstr "username が間違っています" + +#: taiga/auth/validators.py:42 taiga/users/validators.py:50 +msgid "" +"Required. 255 characters or fewer. Letters, numbers and /./-/_ characters'" +msgstr "必須です. 255文字以下. 半角英数字,記号 /./-/_ が使用できます." + +#: taiga/base/api/fields.py:294 +msgid "This field is required." +msgstr "このフィールドは必須です." + +#: taiga/base/api/fields.py:295 taiga/base/api/relations.py:337 +msgid "Invalid value." +msgstr "値が正しくありません." + +#: taiga/base/api/fields.py:479 +#, python-format +msgid "'%s' value must be either True or False." +msgstr "'%s' は True または False である必要があります." + +#: taiga/base/api/fields.py:543 +msgid "" +"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +msgstr "" +"英数文字、アンダースコア、ハイフンを含む正しいスラグを入力してください。" + +#: taiga/base/api/fields.py:558 +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "" +"有効な選択肢を選択してください。%(value)sは選択できる選択肢ではありません。" + +#: taiga/base/api/fields.py:621 +msgid "You email domain is not allowed" +msgstr "そのメールドメインは許可されていません。" + +#: taiga/base/api/fields.py:630 +msgid "Enter a valid email address." +msgstr "正しいメールアドレスを入力してください." + +#: taiga/base/api/fields.py:672 +#, python-format +msgid "Date has wrong format. Use one of these formats instead: %s" +msgstr "" +"日付のフォーマットが間違っています。このフォーマットを利用してください。%s" + +#: taiga/base/api/fields.py:736 +#, python-format +msgid "Datetime has wrong format. Use one of these formats instead: %s" +msgstr "" +"日時のフォーマットが間違っています。このフォーマットを利用してください。%s" + +#: taiga/base/api/fields.py:806 +#, python-format +msgid "Time has wrong format. Use one of these formats instead: %s" +msgstr "" +"時刻のフォーマットが間違っています。このフォーマットを利用してください。%s" + +#: taiga/base/api/fields.py:863 +msgid "Enter a whole number." +msgstr "整数を入力してください。" + +#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#, python-format +msgid "Ensure this value is less than or equal to %(limit_value)s." +msgstr "値がこの値以下であることを確認してください。%(limit_value)s." + +#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#, python-format +msgid "Ensure this value is greater than or equal to %(limit_value)s." +msgstr "値がこの値以上であることを確認してください。%(limit_value)s." + +#: taiga/base/api/fields.py:895 +#, python-format +msgid "\"%s\" value must be a float." +msgstr "\"%s\"は小数である必要があります。" + +#: taiga/base/api/fields.py:916 +msgid "Enter a number." +msgstr "数字を入力してください。" + +#: taiga/base/api/fields.py:919 +#, python-format +msgid "Ensure that there are no more than %s digits in total." +msgstr "桁数が%s以下であることを確認してください。" + +#: taiga/base/api/fields.py:920 +#, python-format +msgid "Ensure that there are no more than %s decimal places." +msgstr "小数点以下の桁数は%sより少ないことを確認してください。" + +#: taiga/base/api/fields.py:921 +#, python-format +msgid "Ensure that there are no more than %s digits before the decimal point." +msgstr "整数部分の桁数は%s以下であることを確認してください。" + +#: taiga/base/api/fields.py:988 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "ファイルが送信されませんでした. フォームのエンコードを確認して下さい." + +#: taiga/base/api/fields.py:989 +msgid "No file was submitted." +msgstr "ファイルが送信されませんでした." + +#: taiga/base/api/fields.py:990 +msgid "The submitted file is empty." +msgstr "送信されたファイルは空です." + +#: taiga/base/api/fields.py:991 +#, python-format +msgid "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr "" +"ファイル名の文字数は%(max)d以下であることを確認してください。現在は%(length)d" +"字です。" + +#: taiga/base/api/fields.py:992 +msgid "Please either submit a file or check the clear checkbox, not both." +msgstr "" +"ファイルをサブミットするか、クリアチェックボックスを入れるか、どちらかだけし" +"てください。" + +#: taiga/base/api/fields.py:1032 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"正しい画像をアップロードしてください。アップロードしたファイルは画像じゃない" +"か破損しています。" + +#: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 +#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 +#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 +#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 +#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 +#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 +#: taiga/webhooks/api.py:71 +msgid "Blocked element" +msgstr "ブロックされた要素" + +#: taiga/base/api/pagination.py:214 +msgid "Page is not 'last', nor can it be converted to an int." +msgstr "ページは「最後」じゃないか、整数に変換することができません。" + +#: taiga/base/api/pagination.py:218 +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "このページは無効です。(%(page_number)s): %(message)s" + +#: taiga/base/api/permissions.py:66 +msgid "Invalid permission definition." +msgstr "許可定義は無効です。" + +#: taiga/base/api/relations.py:247 +#, python-format +msgid "Invalid pk '%s' - object does not exist." +msgstr "pk'%s'は無効です。オブジェクトが存在しません。" + +#: taiga/base/api/relations.py:248 +#, python-format +msgid "Incorrect type. Expected pk value, received %s." +msgstr "" +"タイプが正しくありません。予想したタイプはpk、受け取ったタイプは%sです。" + +#: taiga/base/api/relations.py:336 +#, python-format +msgid "Object with %s=%s does not exist." +msgstr "%s=%sであるオブジェクトは存在しません。" + +#: taiga/base/api/relations.py:372 +msgid "Invalid hyperlink - No URL match" +msgstr "URLがマッチしないためハイパーリンクは無効です。" + +#: taiga/base/api/relations.py:373 +msgid "Invalid hyperlink - Incorrect URL match" +msgstr "URLのマッチが正しくないためハイパーリンクは無効です。" + +#: taiga/base/api/relations.py:374 +msgid "Invalid hyperlink due to configuration error" +msgstr "設定エラーのためハイパーリンクは無効です。" + +#: taiga/base/api/relations.py:375 +msgid "Invalid hyperlink - object does not exist." +msgstr "オブジェクトが存在しないためハイパーリンクは無効です。" + +#: taiga/base/api/relations.py:376 +#, python-format +msgid "Incorrect type. Expected url string, received %s." +msgstr "" +"タイプが正しくありません。予想したタイプはURLの配列、受け取ったタイプは%sで" +"す。" + +#: taiga/base/api/serializers.py:324 +msgid "Invalid data" +msgstr "無効なデータ" + +#: taiga/base/api/serializers.py:416 +msgid "No input provided" +msgstr "未入力" + +#: taiga/base/api/serializers.py:579 +msgid "Cannot create a new item, only existing items may be updated." +msgstr "新しいアイテムは作成できません。既存アイテムを更新してください。" + +#: taiga/base/api/serializers.py:590 +msgid "Expected a list of items." +msgstr "アイテムの配列を予想していました。" + +#: taiga/base/api/views.py:126 +msgid "Not found" +msgstr "見つかりませんでした。" + +#: taiga/base/api/views.py:129 +msgid "Permission denied" +msgstr "権限がありません。" + +#: taiga/base/api/views.py:477 +msgid "Server application error" +msgstr "サーバーアプリケーションのエラー" + +#: taiga/base/connectors/exceptions.py:26 +msgid "Connection error." +msgstr "接続エラー" + +#: taiga/base/exceptions.py:79 +msgid "Malformed request." +msgstr "不正なリクエスト" + +#: taiga/base/exceptions.py:84 +msgid "Incorrect authentication credentials." +msgstr "認証情報が正しくありません。" + +#: taiga/base/exceptions.py:89 +msgid "Authentication credentials were not provided." +msgstr "認証情報が未入力です。" + +#: taiga/base/exceptions.py:94 +msgid "You do not have permission to perform this action." +msgstr "この動作を行う権限がありません。" + +#: taiga/base/exceptions.py:99 +#, python-format +msgid "Method '%s' not allowed." +msgstr "'%s'メソッドが許可されていません。" + +#: taiga/base/exceptions.py:107 +msgid "Could not satisfy the request's Accept header" +msgstr "リクエストのAcceptヘッダーを満たすことができませんでした。" + +#: taiga/base/exceptions.py:116 +#, python-format +msgid "Unsupported media type '%s' in request." +msgstr "リクエストのメディアタイプ'%s'に対応していません。" + +#: taiga/base/exceptions.py:124 +msgid "Request was throttled." +msgstr "リクエストはスロットルされました。" + +#: taiga/base/exceptions.py:125 +#, python-format +msgid "Expected available in %d second%s." +msgstr "%d %s秒後に利用可能になる見込みです。" + +#: taiga/base/exceptions.py:139 +msgid "Unexpected error" +msgstr "予期せぬエラー" + +#: taiga/base/exceptions.py:151 +msgid "Not found." +msgstr "見つかりませんでした。" + +#: taiga/base/exceptions.py:156 +msgid "Method not supported for this endpoint." +msgstr "このエンドポイントはこのメソッドに対応していません。" + +#: taiga/base/exceptions.py:164 taiga/base/exceptions.py:172 +msgid "Wrong arguments." +msgstr "引数の数が正しくありません。" + +#: taiga/base/exceptions.py:176 +msgid "Data validation error" +msgstr "データのバリデーションエラー" + +#: taiga/base/exceptions.py:188 +msgid "Integrity Error for wrong or invalid arguments" +msgstr "引数が不正か無効による整合性エラー" + +#: taiga/base/exceptions.py:195 +msgid "Precondition error" +msgstr "前提条件エラー" + +#: taiga/base/exceptions.py:219 +msgid "No room left for more projects." +msgstr "新しいプロジェクトを作成するスペースがありません。" + +#: taiga/base/filters.py:81 taiga/base/filters.py:462 +msgid "Error in filter params types." +msgstr "パラメータタイプのフィルターエラー" + +#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/projects/filters.py:64 +msgid "'project' must be an integer value." +msgstr "'project'は整数である必要があります。" + +#: taiga/base/templates/emails/base-body-html.jinja:6 +msgid "Taiga" +msgstr "Taiga" + +#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/hero-body-html.jinja:380 +#: taiga/base/templates/emails/updates-body-html.jinja:442 +msgid "Follow us on Twitter" +msgstr "Twitterをフォローする" + +#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/hero-body-html.jinja:380 +#: taiga/base/templates/emails/updates-body-html.jinja:442 +msgid "Twitter" +msgstr "Twitter" + +#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/hero-body-html.jinja:381 +#: taiga/base/templates/emails/updates-body-html.jinja:443 +msgid "Get the code on GitHub" +msgstr "GitHubからコードを入手する" + +#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/hero-body-html.jinja:381 +#: taiga/base/templates/emails/updates-body-html.jinja:443 +msgid "GitHub" +msgstr "Github" + +#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/hero-body-html.jinja:382 +#: taiga/base/templates/emails/updates-body-html.jinja:444 +msgid "Visit our website" +msgstr "ホームページに移動" + +#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/hero-body-html.jinja:382 +#: taiga/base/templates/emails/updates-body-html.jinja:444 +msgid "Taiga.io" +msgstr "Taiga.io" + +#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/hero-body-html.jinja:397 +#: taiga/base/templates/emails/updates-body-html.jinja:459 +#, python-format +msgid "" +"\n" +" Taiga Support:\n" +" %(support_url)s\n" +"
    \n" +" Contact us:\n" +" \n" +" %(support_email)s\n" +" \n" +"
    \n" +" Mailing list:\n" +" \n" +" %(mailing_list_url)s\n" +" \n" +" " +msgstr "" +"\n" +"Taigaサポート\n" +"%(support_url)s\n" +"
    \n" +"問い合わせ\n" +"\n" +"%(support_email)s\n" +"\n" +"
    \n" +"メールリスト\n" +"\n" +"%(mailing_list_url)s\n" +"" + +#: taiga/base/templates/emails/hero-body-html.jinja:6 +msgid "You have been Taigatized" +msgstr "あなたはTaiga化されました" + +#: taiga/base/templates/emails/hero-body-html.jinja:359 +msgid "" +"\n" +"

    You have been Taigatized!" +"

    \n" +"

    Welcome to Taiga, an Open " +"Source, Agile Project Management Tool

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

    あなたはTaiga化されまし" +"た。

    \n" +"

    Taigaへようこそ！Taigaは" +"オープンソースでアジャイルなプロジェクトマネジメントツールです。

    \n" +" " + +#: taiga/base/templates/emails/updates-body-html.jinja:6 +msgid "[Taiga] Updates" +msgstr "[Taiga] Updates" + +#: taiga/base/templates/emails/updates-body-html.jinja:417 +msgid "Updates" +msgstr "Updates" + +#: taiga/base/templates/emails/updates-body-html.jinja:423 +#, python-format +msgid "" +"\n" +"

    comment:" +"

    \n" +"

    " +"%(comment)s

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

    コメント:

    \n" +"

    %(comment)s

    " + +#: taiga/base/templates/emails/updates-body-text.jinja:6 +#, python-format +msgid "" +"\n" +" Comment: %(comment)s\n" +" " +msgstr "" +"\n" +"コメント: %(comment)s" + +#: taiga/export_import/api.py:127 +msgid "We needed at least one role" +msgstr "少なくとも1つの役割が必要です." + +#: taiga/export_import/api.py:323 +msgid "Needed dump file" +msgstr "ダンプファイルが必要です." + +#: taiga/export_import/api.py:333 +msgid "Invalid dump format" +msgstr "ダンプフォーマットが正しくありません" + +#: taiga/export_import/services/store.py:718 +#: taiga/export_import/services/store.py:736 +msgid "error importing project data" +msgstr "プロジェクトデータのインポートエラー" + +#: taiga/export_import/services/store.py:743 +msgid "error importing roles" +msgstr "役割のインポートエラー" + +#: taiga/export_import/services/store.py:748 +msgid "error importing memberships" +msgstr "メンバーシップのインポートエラー" + +#: taiga/export_import/services/store.py:759 +msgid "error importing lists of project attributes" +msgstr "プロジェクトアトリビュートリストのインポートエラー" + +#: taiga/export_import/services/store.py:763 +msgid "error importing default project attributes values" +msgstr "デフォルトプロジェクトアトリビュートのインポートエラー" + +#: taiga/export_import/services/store.py:774 +msgid "error importing custom attributes" +msgstr "カスタムアトリビュートのインポートエラー" + +#: taiga/export_import/services/store.py:778 +msgid "error importing sprints" +msgstr "スプリントのインポートエラー" + +#: taiga/export_import/services/store.py:782 +msgid "error importing issues" +msgstr "チケットのインポートエラー" + +#: taiga/export_import/services/store.py:786 +msgid "error importing user stories" +msgstr "ユーザストーリのインポートエラー" + +#: taiga/export_import/services/store.py:790 +msgid "error importing epics" +msgstr "エピックのインポートエラー" + +#: taiga/export_import/services/store.py:794 +msgid "error importing tasks" +msgstr "タスクのインポートエラー" + +#: taiga/export_import/services/store.py:798 +msgid "error importing wiki pages" +msgstr "Wikiページのインポートエラー" + +#: taiga/export_import/services/store.py:802 +msgid "error importing wiki links" +msgstr "Wikiリンクのインポートエラー" + +#: taiga/export_import/services/store.py:806 +msgid "error importing tags" +msgstr "タグのインポートエラー" + +#: taiga/export_import/services/store.py:810 +msgid "error importing timelines" +msgstr "タイムラインのインポートエラー" + +#: taiga/export_import/services/store.py:832 +msgid "unexpected error importing project" +msgstr "プロジェクトをインポート中に予期せぬエラー" + +#: taiga/export_import/tasks.py:62 taiga/export_import/tasks.py:63 +msgid "Error generating project dump" +msgstr "プロジェクトダンプの生成エラー" + +#: taiga/export_import/tasks.py:91 +#, python-brace-format +msgid "" +"\n" +"\n" +"Error loading dump by {user_full_name} <{user_email}>:\"\n" +"\n" +"\n" +"REASON:\n" +"-------\n" +"{reason}\n" +"\n" +"DETAILS:\n" +"--------\n" +"{details}\n" +"\n" +"TRACE ERROR:\n" +"------------" +msgstr "" +"\n" +"\n" +"ユーザー{user_full_name} <{user_email}>のダンプのロードエラー\"\n" +"\n" +"\n" +"原因\n" +"-------\n" +"{reason}\n" +"\n" +"詳細:\n" +"--------\n" +"{details}\n" +"\n" +"エラートレース\n" +"------------" + +#: taiga/export_import/tasks.py:120 +msgid "Error loading project dump" +msgstr "プロジェクトダンプのロードエラー" + +#: taiga/export_import/tasks.py:121 +msgid "Error loading your project dump file" +msgstr "プロジェクトダンプのロードエラー" + +#: taiga/export_import/tasks.py:135 +msgid " -- no detail info --" +msgstr "詳細な情報がありません" + +#: taiga/export_import/templates/emails/dump_project-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Project dump generated

    \n" +"

    Hello %(user)s,

    \n" +"

    Your dump from project %(project)s has been correctly generated.\n" +"

    You can download it here:

    \n" +" Download the dump file\n" +"

    This file will be deleted on %(deletion_date)s.

    \n" +"

    The Taiga Team

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

    プロジェクトダンプを生成しました

    \n" +"

    こんにちは、%(user)s。

    \n" +"

    プロジェクト%(project)sのダンプが正常に生成されました。

    \n" +"

    以下リンクからダウンロードできます。

    \n" +" ダンプファイルをダウンロード\n" +"

    このファイルは%(deletion_date)sに削除されます。

    \n" +"

    Taigaチーム

    \n" +" " + +#: taiga/export_import/templates/emails/dump_project-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your dump from project %(project)s has been correctly generated. You can " +"download it here:\n" +"\n" +"%(url)s\n" +"\n" +"This file will be deleted on %(deletion_date)s.\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"こんにちは、%(user)s。\n" +"\n" +"プロジェクト%(project)sのダンプが正常に生成されました。以下リンクからダウン" +"ロードできます。\n" +"\n" +"%(url)s\n" +"\n" +"このファイルは%(deletion_date)sに削除されます。\n" +"\n" +"---\n" +"Taigaチーム\n" + +#: taiga/export_import/templates/emails/dump_project-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your project dump has been generated" +msgstr "[%(project)s]プロジェクトのダンプが生成されました。" + +#: taiga/export_import/templates/emails/export_error-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    %(error_message)s

    \n" +"

    Hello %(user)s,

    \n" +"

    Your project %(project)s has not been exported correctly.

    \n" +"

    The Taiga system administrators have been informed.
    Please, try " +"it again or contact with the support team at\n" +" %(support_email)s

    \n" +"

    The Taiga Team

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

    %(error_message)s

    \n" +"

    こんにちは、%(user)s。

    \n" +"

    プロジェクト%(project)sが正常にエクスポートできませんでした。

    \n" +"

    Taigaシステム管理者にお知らせしました。
    もう一度試してみるかサポー" +"トチームにお問い合せください。問い合わせ先は、\n" +" %(support_email)sです。

    \n" +"

    Taigaチーム

    \n" +" " + +#: taiga/export_import/templates/emails/export_error-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"%(error_message)s\n" +"Your project %(project)s has not been exported correctly.\n" +"\n" +"The Taiga system administrators have been informed.\n" +"\n" +"Please, try it again or contact with the support team at %(support_email)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"こんにちは、%(user)s。\n" +"\n" +"%(error_message)s\n" +"プロジェクト%(project)sは正常にエクスポートできませんでした。\n" +"\n" +"Taigaシステム管理者にお知らせしました。\n" +"\n" +"もう一度試してみるかサポートチームにお問い合せください。問い合わせ先は、 " +"%(support_email)sです。\n" +"\n" +"---\n" +"Taigaチーム\n" + +#: taiga/export_import/templates/emails/export_error-subject.jinja:1 +#, python-format +msgid "[%(project)s] %(error_subject)s" +msgstr "[%(project)s] %(error_subject)s" + +#: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    %(error_message)s

    \n" +"

    Hello %(user)s,

    \n" +"

    Your project has not been importer correctly.

    \n" +"

    The Taiga system administrators have been informed.
    Please, try " +"it again or contact with the support team at\n" +" %(support_email)s

    \n" +"

    The Taiga Team

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

    %(error_message)s

    \n" +"

    こんにちは、%(user)s。

    \n" +"

    プロジェクトが正常にインポートできませんでした。

    \n" +"

    Taigaシステム管理者にお知らせしました。
    もう一度試してみるかサ" +"ポートチームにお問い合せください。問い合わせ先は、\n" +" %(support_email)sです。

    \n" +"

    Taigaチーム

    \n" +" " + +#: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"%(error_message)s\n" +"\n" +"Your project has not been importer correctly.\n" +"\n" +"The Taiga system administrators have been informed.\n" +"\n" +"Please, try it again or contact with the support team at %(support_email)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"こんにちは、%(user)s。\n" +"\n" +"%(error_message)s\n" +"\n" +"プロジェクトが正常にインポートできませんでした。\n" +"\n" +"Taigaシステム管理者にお知らせしました。\n" +"\n" +"もう一度試してみるかサポートチームにお問い合せください。問い合わせ先" +"は、%(support_email)sです。\n" +"\n" +"---\n" +"Taigaチーム\n" + +#: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#, python-format +msgid "[Taiga] %(error_subject)s" +msgstr "[Taiga] %(error_subject)s" + +#: taiga/export_import/templates/emails/load_dump-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Project dump imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your project dump has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

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

    プロジェクトダンプがインポートされました。

    \n" +"

    こんにちは、%(user)s。

    \n" +"

    プロジェクトダンプが正常にインポートされました。

    \n" +" " +"プロジェクト%(project)sへ\n" +"

    Taigaチーム

    \n" +" " + +#: taiga/export_import/templates/emails/load_dump-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your project dump has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"こんにちは、%(user)s。\n" +"\n" +"プロジェクトダンプが正常にインポートされました。\n" +"\n" +"プロジェクト%(project)sを以下リンクからアクセスでいます。\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"Taigaチーム\n" + +#: taiga/export_import/templates/emails/load_dump-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your project dump has been imported" +msgstr "[%(project)s] プロジェクトダンプがインポートされました。" + +#: taiga/export_import/validators/fields.py:144 +msgid "{}=\"{}\" not found in this project" +msgstr "{}=\"{}\"がプロジェクトに見つかりませんでした。" + +#: taiga/export_import/validators/validators.py:150 +#: taiga/projects/custom_attributes/validators.py:109 +msgid "Invalid content. It must be {\"key\": \"value\",...}" +msgstr "コンテントが無効です。正しい形式は {\"key\": \"value\",...}" + +#: taiga/export_import/validators/validators.py:165 +#: taiga/projects/custom_attributes/validators.py:124 +msgid "It contain invalid custom fields." +msgstr "無効なカスタムフィールドが含まれています。" + +#: taiga/export_import/validators/validators.py:245 +#: taiga/projects/validators.py:52 +msgid "Name duplicated for the project" +msgstr "同じプロジェクト名があります。" + +#: taiga/external_apps/api.py:43 taiga/external_apps/api.py:70 +#: taiga/external_apps/api.py:77 +msgid "Authentication required" +msgstr "認証が必要です。" + +#: taiga/external_apps/models.py:35 +#: taiga/projects/custom_attributes/models.py:36 +#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 +#: taiga/projects/models.py:512 taiga/projects/models.py:545 +#: taiga/projects/models.py:581 taiga/projects/models.py:603 +#: taiga/projects/models.py:637 taiga/projects/models.py:657 +#: taiga/projects/models.py:677 taiga/projects/models.py:709 +#: taiga/projects/models.py:729 taiga/users/admin.py:54 +#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +msgid "name" +msgstr "名前" + +#: taiga/external_apps/models.py:37 +msgid "Icon url" +msgstr "アイコンのURL" + +#: taiga/external_apps/models.py:38 +msgid "web" +msgstr "ウェブ" + +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/projects/custom_attributes/models.py:37 +#: taiga/projects/epics/models.py:55 +#: taiga/projects/history/templatetags/functions.py:25 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 +#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/userstories/models.py:95 +msgid "description" +msgstr "説明" + +#: taiga/external_apps/models.py:41 +msgid "Next url" +msgstr "次のURL" + +#: taiga/external_apps/models.py:43 +msgid "secret key for ciphering the application tokens" +msgstr "アプリケーショントークンを暗号化するための秘密鍵" + +#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 +#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +msgid "user" +msgstr "ユーザー" + +#: taiga/external_apps/models.py:61 +msgid "application" +msgstr "アプリケーション" + +#: taiga/feedback/models.py:25 taiga/users/models.py:137 +msgid "full name" +msgstr "フルネーム" + +#: taiga/feedback/models.py:27 taiga/users/models.py:132 +msgid "email address" +msgstr "メールアドレス" + +#: taiga/feedback/models.py:29 +msgid "comment" +msgstr "コメント" + +#: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/custom_attributes/models.py:46 +#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 +#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 +#: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 +#: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 +msgid "created date" +msgstr "作成日時" + +#: taiga/feedback/templates/emails/feedback_notification-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Feedback

    \n" +"

    Taiga has received feedback from %(full_name)s <%(email)s>

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

    フィードバック

    \n" +"

    Taigaが%(full_name)s <%(email)s>からフィードバックを受け付けました。\n" +" " + +#: taiga/feedback/templates/emails/feedback_notification-body-html.jinja:9 +#, python-format +msgid "" +"\n" +"

    Comment

    \n" +"

    %(comment)s

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

    コメント

    \n" +"

    %(comment)s

    \n" +" " + +#: taiga/feedback/templates/emails/feedback_notification-body-html.jinja:18 +#: taiga/projects/admin.py:106 taiga/users/admin.py:120 +msgid "Extra info" +msgstr "追加情報" + +#: taiga/feedback/templates/emails/feedback_notification-body-text.jinja:1 +#, python-format +msgid "" +"---------\n" +"- From: %(full_name)s <%(email)s>\n" +"---------\n" +"- Comment:\n" +"%(comment)s\n" +"---------" +msgstr "" +"---------\n" +"- 差出人 %(full_name)s <%(email)s>\n" +"---------\n" +"- コメント\n" +"%(comment)s\n" +"---------" + +#: taiga/feedback/templates/emails/feedback_notification-body-text.jinja:8 +msgid "- Extra info:" +msgstr "- 追加情報" + +#: taiga/feedback/templates/emails/feedback_notification-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[Taiga] Feedback from %(full_name)s <%(email)s>\n" +msgstr "" +"\n" +"[Taiga] %(full_name)sさんからのフィードバック <%(email)s>\n" + +#: taiga/hooks/api.py:54 +msgid "The payload is not a valid json" +msgstr "ペイロードは有効なjsonではありません。" + +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 +#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 +#: taiga/projects/userstories/api.py:273 +msgid "The project doesn't exist" +msgstr "プロジェクトは存在していません。" + +#: taiga/hooks/api.py:66 +msgid "Bad signature" +msgstr "無効なシグネチャー" + +#: taiga/hooks/event_hooks.py:66 +#, python-brace-format +msgid "" +"[@{user_name}]({user_url} \"See @{user_name}'s {platform} profile\") says in " +"[{platform}#{number}]({comment_url} \"Go to comment\"):\n" +"\n" +"\"{comment_message}\"" +msgstr "" +"[@{user_name}]({user_url} \"@{user_name}さんの{platform}プロフィール\")が" +"[{platform}#{number}]({comment_url}でコメントしました。 \"コメントへ移動" +"\"):\n" +"\n" +"\"{comment_message}\"" + +#: taiga/hooks/event_hooks.py:71 +#, python-brace-format +msgid "" +"Comment From {platform}:\n" +"\n" +"> {comment_message}" +msgstr "" +"{platform}からのコメント\n" +"\n" +"> {comment_message}" + +#: taiga/hooks/event_hooks.py:84 +msgid "Invalid issue comment information" +msgstr "イッシューコメントの情報は無効です。" + +#: taiga/hooks/event_hooks.py:103 +#, python-brace-format +msgid "" +"Issue created by [@{user_name}]({user_url} \"See @{user_name}'s {platform} " +"profile\") from [{platform}#{number}]({url} \"Go to issue\")." +msgstr "" +"[@{user_name}]({user_url}がc\"@{user_name}さんの{platform}プロフィールを見る" +"\")[{platform}#{number}]からイッシューを作成しました。({url} \"イッシューへ移" +"動\")." + +#: taiga/hooks/event_hooks.py:107 +#, python-brace-format +msgid "Issue created from {platform}." +msgstr "{platform}からイッシューが作成されました。" + +#: taiga/hooks/event_hooks.py:120 +msgid "Invalid issue information" +msgstr "イッシュー情報は無効です。" + +#: taiga/hooks/event_hooks.py:149 taiga/hooks/event_hooks.py:171 +msgid "unknown user" +msgstr "無効なユーザー" + +#: taiga/hooks/event_hooks.py:156 +#, python-brace-format +msgid "" +"{user_text} changed the status from [{platform} commit]({commit_url} \"See " +"commit '{commit_id} - {commit_message}'\")\n" +"\n" +" - Status: **{src_status}** → **{dst_status}**" +msgstr "" +"{user_text}さんが[{platform} commit]({commit_url}ステータスを更新しまし" +"た。\"コミットを参照する'{commit_id} - {commit_message}'\")\n" +"\n" +" - ステータス**{src_status}** → **{dst_status}**" + +#: taiga/hooks/event_hooks.py:161 +#, python-brace-format +msgid "" +"Changed status from {platform} commit.\n" +"\n" +" - Status: **{src_status}** → **{dst_status}**" +msgstr "" +"コミット{platform}更新しました。\n" +"\n" +" - ステータス: **{src_status}** → **{dst_status}**" + +#: taiga/hooks/event_hooks.py:179 +#, python-brace-format +msgid "" +"This {type_name} has been mentioned by {user_text} in the [{platform} commit]" +"({commit_url} \"See commit '{commit_id} - {commit_message}'\") " +"\"{commit_message}\"" +msgstr "" +"{type_name}は{user_text}さんによって[{platform} commit]({commit_url}でメン" +"ションされました。 \"コミット'{commit_id} - {commit_message}'を参照する\") " +"\"{commit_message}\"" + +#: taiga/hooks/event_hooks.py:184 +#, python-brace-format +msgid "" +"This issue has been mentioned in the {platform} commit \"{commit_message}\"" +msgstr "" +"このイッシューは{platform}コミット内でメンションされまし" +"た。\"{commit_message}\"" + +#: taiga/hooks/event_hooks.py:206 +msgid "The referenced element doesn't exist" +msgstr "参照された要素は存在しません。" + +#: taiga/hooks/event_hooks.py:222 +msgid "The status doesn't exist" +msgstr "ステータスは存在しません。" + +#: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 +msgid "View project" +msgstr "プロジェクトを見る" + +#: taiga/permissions/choices.py:24 taiga/permissions/choices.py:36 +msgid "View milestones" +msgstr "マイルストーンを見る" + +#: taiga/permissions/choices.py:25 taiga/permissions/choices.py:41 +msgid "View epic" +msgstr "エピックを見る" + +#: taiga/permissions/choices.py:26 +msgid "View user stories" +msgstr "ユーザストーリを見る" + +#: taiga/permissions/choices.py:27 taiga/permissions/choices.py:53 +msgid "View tasks" +msgstr "タスクを見る" + +#: taiga/permissions/choices.py:28 taiga/permissions/choices.py:59 +msgid "View issues" +msgstr "課題 を表示" + +#: taiga/permissions/choices.py:29 taiga/permissions/choices.py:65 +msgid "View wiki pages" +msgstr "ウィキページを見る" + +#: taiga/permissions/choices.py:30 taiga/permissions/choices.py:71 +msgid "View wiki links" +msgstr "ウィキリンクを見る" + +#: taiga/permissions/choices.py:37 +msgid "Add milestone" +msgstr "マイルストーンを追加する" + +#: taiga/permissions/choices.py:38 +msgid "Modify milestone" +msgstr "マイルストーンを変更する" + +#: taiga/permissions/choices.py:39 +msgid "Delete milestone" +msgstr "マイルストーンを削除する" + +#: taiga/permissions/choices.py:42 +msgid "Add epic" +msgstr "エピックを追加する" + +#: taiga/permissions/choices.py:43 +msgid "Modify epic" +msgstr "エピックを変更する" + +#: taiga/permissions/choices.py:44 +msgid "Comment epic" +msgstr "エピックをコメントする" + +#: taiga/permissions/choices.py:45 +msgid "Delete epic" +msgstr "エピックを削除する" + +#: taiga/permissions/choices.py:47 +msgid "View user story" +msgstr "ユーザストーリを見る" + +#: taiga/permissions/choices.py:48 +msgid "Add user story" +msgstr "ユーザストーリを追加する" + +#: taiga/permissions/choices.py:49 +msgid "Modify user story" +msgstr "ユーザストーリを変更する" + +#: taiga/permissions/choices.py:50 +msgid "Comment user story" +msgstr "ユーザストーリをコメントする" + +#: taiga/permissions/choices.py:51 +msgid "Delete user story" +msgstr "ユーザストーリを削除する" + +#: taiga/permissions/choices.py:54 +msgid "Add task" +msgstr "タスクを追加する" + +#: taiga/permissions/choices.py:55 +msgid "Modify task" +msgstr "タスクを変更する" + +#: taiga/permissions/choices.py:56 +msgid "Comment task" +msgstr "タスクをコメントする" + +#: taiga/permissions/choices.py:57 +msgid "Delete task" +msgstr "タスクを削除する" + +#: taiga/permissions/choices.py:60 +msgid "Add issue" +msgstr "イッシューを追加する" + +#: taiga/permissions/choices.py:61 +msgid "Modify issue" +msgstr "イッシューを変更する" + +#: taiga/permissions/choices.py:62 +msgid "Comment issue" +msgstr "イッシューをコメントする" + +#: taiga/permissions/choices.py:63 +msgid "Delete issue" +msgstr "イッシューを削除する" + +#: taiga/permissions/choices.py:66 +msgid "Add wiki page" +msgstr "ウィキページを追加する" + +#: taiga/permissions/choices.py:67 +msgid "Modify wiki page" +msgstr "ウィキページを変更する" + +#: taiga/permissions/choices.py:68 +msgid "Comment wiki page" +msgstr "ウィキページをコメントする" + +#: taiga/permissions/choices.py:69 +msgid "Delete wiki page" +msgstr "ウィキページを削除する" + +#: taiga/permissions/choices.py:72 +msgid "Add wiki link" +msgstr "ウィキリンクを追加する" + +#: taiga/permissions/choices.py:73 +msgid "Modify wiki link" +msgstr "ウィキリンクを変更する" + +#: taiga/permissions/choices.py:74 +msgid "Delete wiki link" +msgstr "ウィキリンクを削除する" + +#: taiga/permissions/choices.py:78 +msgid "Modify project" +msgstr "プロジェクトを変更する" + +#: taiga/permissions/choices.py:79 +msgid "Delete project" +msgstr "プロジェクトを削除する" + +#: taiga/permissions/choices.py:80 +msgid "Add member" +msgstr "メンバーを追加する" + +#: taiga/permissions/choices.py:81 +msgid "Remove member" +msgstr "メンバーを削除する" + +#: taiga/permissions/choices.py:82 +msgid "Admin project values" +msgstr "管理者プロジェクトの値" + +#: taiga/permissions/choices.py:83 +msgid "Admin roles" +msgstr "管理者のロール" + +#: taiga/projects/admin.py:100 +msgid "Privacity" +msgstr "プライバシー" + +#: taiga/projects/admin.py:112 +msgid "Modules" +msgstr "モジュール" + +#: taiga/projects/admin.py:120 +msgid "Default values" +msgstr "初期値" + +#: taiga/projects/admin.py:126 +msgid "Activity" +msgstr "アクティビティ" + +#: taiga/projects/admin.py:131 +msgid "Fans" +msgstr "ファン" + +#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 +#: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 +#: taiga/users/admin.py:69 taiga/userstorage/models.py:27 +msgid "owner" +msgstr "オーナー" + +#: taiga/projects/admin.py:200 +#, python-brace-format +msgid "{count} successfully made public." +msgstr "{count} 公開に成功しました。" + +#: taiga/projects/admin.py:201 +msgid "Make public" +msgstr "公開にする" + +#: taiga/projects/admin.py:215 +#, python-brace-format +msgid "{count} successfully made private." +msgstr "{count} プライベートにするのに成功しました。" + +#: taiga/projects/admin.py:216 +msgid "Make private" +msgstr "プライベートにする" + +#: taiga/projects/admin.py:246 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "選択中の%(verbose_name_plural)sらを削除する" + +#: taiga/projects/api.py:150 taiga/users/api.py:237 +msgid "Incomplete arguments" +msgstr "引数は不足している" + +#: taiga/projects/api.py:154 taiga/users/api.py:242 +msgid "Invalid image format" +msgstr "画像形式が正しくありません" + +#: taiga/projects/api.py:215 +msgid "Not valid template name" +msgstr "無効なテンプレート名" + +#: taiga/projects/api.py:218 +msgid "Not valid template description" +msgstr "無効なテンプレートの説明文" + +#: taiga/projects/api.py:344 +msgid "Invalid user id" +msgstr "無効なユーザーID" + +#: taiga/projects/api.py:350 +msgid "The user doesn't exist" +msgstr "このユーザーは存在しません。" + +#: taiga/projects/api.py:354 +msgid "The user must be already a project member" +msgstr "ユーザーはプロジェクトのメンバーである必要がある" + +#: taiga/projects/api.py:701 +msgid "" +"The project must have an owner and at least one of the users must be an " +"active admin" +msgstr "" +"プロジェクトにオーナーと、1人以上のアクティブな管理者であるユーザーが必要で" +"す。" + +#: taiga/projects/api.py:735 +msgid "You don't have permisions to see that." +msgstr "閲覧する権限がありません。" + +#: taiga/projects/attachments/api.py:54 +msgid "Partial updates are not supported" +msgstr "部分的な更新に対応していません。" + +#: taiga/projects/attachments/api.py:69 +msgid "Object id issue isn't exists" +msgstr "オブジェクトIDのイッシューは存在しません。" + +#: taiga/projects/attachments/api.py:72 +msgid "Project ID not matches between object and project" +msgstr "" + +#: taiga/projects/attachments/models.py:41 +#: taiga/projects/custom_attributes/models.py:43 +#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 +#: taiga/projects/models.py:522 taiga/projects/models.py:559 +#: taiga/projects/models.py:587 taiga/projects/models.py:613 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/notifications/models.py:74 +#: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 +#: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +msgid "project" +msgstr "プロジェクト" + +#: taiga/projects/attachments/models.py:43 +msgid "content type" +msgstr "コンテントタイプ" + +#: taiga/projects/attachments/models.py:45 +msgid "object id" +msgstr "オブジェクトID" + +#: taiga/projects/attachments/models.py:51 +#: taiga/projects/custom_attributes/models.py:48 +#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 +#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 +#: taiga/userstorage/models.py:31 +msgid "modified date" +msgstr "更新日時" + +#: taiga/projects/attachments/models.py:56 +msgid "attached file" +msgstr "添付ファイル" + +#: taiga/projects/attachments/models.py:58 +msgid "sha1" +msgstr "sha1" + +#: taiga/projects/attachments/models.py:60 +msgid "is deprecated" +msgstr "は廃止予定である" + +#: taiga/projects/attachments/models.py:62 +#: taiga/projects/custom_attributes/models.py:41 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 +#: taiga/projects/models.py:516 taiga/projects/models.py:549 +#: taiga/projects/models.py:583 taiga/projects/models.py:607 +#: taiga/projects/models.py:639 taiga/projects/models.py:659 +#: taiga/projects/models.py:681 taiga/projects/models.py:711 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +msgid "order" +msgstr "並べ替え" + +#: taiga/projects/choices.py:23 +msgid "AppearIn" +msgstr "AppearIn" + +#: taiga/projects/choices.py:24 +msgid "Jitsi" +msgstr "Jitsi" + +#: taiga/projects/choices.py:25 +msgid "Custom" +msgstr "カスタム" + +#: taiga/projects/choices.py:26 +msgid "Talky" +msgstr "" + +#: taiga/projects/choices.py:35 +msgid "This project is blocked due to payment failure" +msgstr "このプロジェクトは支払い不能によりブロックされています。" + +#: taiga/projects/choices.py:36 +msgid "This project is blocked by admin staff" +msgstr "このプロジェクトは管理スタッフによりブロックされました。" + +#: taiga/projects/choices.py:37 +msgid "This project is blocked because the owner left" +msgstr "このプロジェクトはオーナーの辞退によりブロックされています。" + +#: taiga/projects/choices.py:38 +msgid "This project is blocked while it's deleted" +msgstr "このプロジェクトは削除中のためブロックされています。" + +#: taiga/projects/custom_attributes/choices.py:28 +msgid "Text" +msgstr "テキスト" + +#: taiga/projects/custom_attributes/choices.py:29 +msgid "Multi-Line Text" +msgstr "マルチラインテキスト" + +#: taiga/projects/custom_attributes/choices.py:30 +msgid "Date" +msgstr "日時" + +#: taiga/projects/custom_attributes/choices.py:31 +msgid "Url" +msgstr "URL" + +#: taiga/projects/custom_attributes/models.py:40 +#: taiga/projects/issues/models.py:45 +msgid "type" +msgstr "タイプ" + +#: taiga/projects/custom_attributes/models.py:95 +msgid "values" +msgstr "値" + +#: taiga/projects/custom_attributes/models.py:105 +msgid "epic" +msgstr "エピック" + +#: taiga/projects/custom_attributes/models.py:121 +#: taiga/projects/tasks/models.py:35 taiga/projects/userstories/models.py:38 +msgid "user story" +msgstr "ユーザストーリ" + +#: taiga/projects/custom_attributes/models.py:137 +msgid "task" +msgstr "タスク" + +#: taiga/projects/custom_attributes/models.py:153 +msgid "issue" +msgstr "イッシュー" + +#: taiga/projects/custom_attributes/validators.py:58 +msgid "Already exists one with the same name." +msgstr "同じ名前のものがすでに存在します。" + +#: taiga/projects/epics/api.py:92 +msgid "You don't have permissions to set this status to this epic." +msgstr "このエピックにこのステータスを付与する権限がありません。" + +#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 +msgid "ref" +msgstr "" + +#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 +msgid "status" +msgstr "ステータス" + +#: taiga/projects/epics/models.py:45 +msgid "epics order" +msgstr "" + +#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 +msgid "subject" +msgstr "件名" + +#: taiga/projects/epics/models.py:58 taiga/projects/models.py:520 +#: taiga/projects/models.py:555 taiga/projects/models.py:611 +#: taiga/projects/models.py:641 taiga/projects/models.py:661 +#: taiga/projects/models.py:685 taiga/projects/models.py:713 +#: taiga/users/models.py:139 +msgid "color" +msgstr "色" + +#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 +msgid "assigned to" +msgstr "担当者" + +#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +msgid "is client requirement" +msgstr "クライアントの要件" + +#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +msgid "is team requirement" +msgstr "チームの要件" + +#: taiga/projects/epics/models.py:69 +msgid "user stories" +msgstr "ユーザストーリ" + +#: taiga/projects/epics/validators.py:37 +msgid "There's no epic with that id" +msgstr "このIDのエピックは存在しません。" + +#: taiga/projects/history/api.py:93 +msgid "comment is required" +msgstr "コメントが必須" + +#: taiga/projects/history/api.py:96 +msgid "deleted comments can't be edited" +msgstr "削除されたコメントを編集できません。" + +#: taiga/projects/history/api.py:130 +msgid "Comment already deleted" +msgstr "コメントがすでに削除済みです。" + +#: taiga/projects/history/api.py:151 +msgid "Comment not deleted" +msgstr "コメントが削除されていません。" + +#: taiga/projects/history/choices.py:31 +msgid "Change" +msgstr "変更する" + +#: taiga/projects/history/choices.py:32 +msgid "Create" +msgstr "作成する" + +#: taiga/projects/history/choices.py:33 +msgid "Delete" +msgstr "削除する" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#, python-format +msgid "%(role)s role points" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:194 +msgid "from" +msgstr "from" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:180 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:200 +msgid "to" +msgstr "to" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +msgid "Added new attachment" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +msgid "Updated attachment" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +msgid "deprecated" +msgstr "非推奨" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +msgid "not deprecated" +msgstr "非推奨ではない" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +msgid "Deleted attachment" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +msgid "added" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +msgid "removed" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 +msgid "Unassigned" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:212 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +msgid "-deleted-" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +msgid "to:" +msgstr "to:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +msgid "from:" +msgstr "from:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +msgid "Added" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +msgid "Changed" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +msgid "Deleted" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +msgid "added:" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +msgid "removed:" +msgstr "" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +msgid "From:" +msgstr "差出人" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +msgid "To:" +msgstr "宛先" + +#: taiga/projects/history/templatetags/functions.py:26 +#: taiga/projects/wiki/models.py:38 +msgid "content" +msgstr "コンテント" + +#: taiga/projects/history/templatetags/functions.py:27 +#: taiga/projects/mixins/blocked.py:33 +msgid "blocked note" +msgstr "ブロックされたノート" + +#: taiga/projects/history/templatetags/functions.py:28 +msgid "sprint" +msgstr "スプリント" + +#: taiga/projects/issues/api.py:156 +msgid "You don't have permissions to set this sprint to this issue." +msgstr "このイッシューにこのスプリントを付与する権限がありません。" + +#: taiga/projects/issues/api.py:160 +msgid "You don't have permissions to set this status to this issue." +msgstr "このイッシューにこのステータスを付与する権限がありません。" + +#: taiga/projects/issues/api.py:164 +msgid "You don't have permissions to set this severity to this issue." +msgstr "このイッシューにこの深刻度を付与する権限がありません。" + +#: taiga/projects/issues/api.py:168 +msgid "You don't have permissions to set this priority to this issue." +msgstr "このイッシューにこの優先度を付与する権限がありません。" + +#: taiga/projects/issues/api.py:172 +msgid "You don't have permissions to set this type to this issue." +msgstr "このイッシューのこのタイプを付与する権限がありません。" + +#: taiga/projects/issues/models.py:41 +msgid "severity" +msgstr "深刻度" + +#: taiga/projects/issues/models.py:43 +msgid "priority" +msgstr "優先度" + +#: taiga/projects/issues/models.py:48 taiga/projects/tasks/models.py:46 +#: taiga/projects/userstories/models.py:65 +msgid "milestone" +msgstr "マイルストーン" + +#: taiga/projects/issues/models.py:57 taiga/projects/tasks/models.py:53 +msgid "finished date" +msgstr "完了日時" + +#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 +#: taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "外部参照" + +#: taiga/projects/likes/models.py:36 +msgid "Like" +msgstr "いいね" + +#: taiga/projects/likes/models.py:37 +msgid "Likes" +msgstr "いいねの数" + +#: taiga/projects/milestones/models.py:41 taiga/projects/models.py:147 +#: taiga/projects/models.py:514 taiga/projects/models.py:547 +#: taiga/projects/models.py:605 taiga/projects/models.py:679 +#: taiga/projects/models.py:731 taiga/projects/wiki/models.py:36 +#: taiga/users/admin.py:58 taiga/users/models.py:294 +msgid "slug" +msgstr "スラグ" + +#: taiga/projects/milestones/models.py:46 +msgid "estimated start date" +msgstr "開始予定日時" + +#: taiga/projects/milestones/models.py:47 +msgid "estimated finish date" +msgstr "完了予定日時" + +#: taiga/projects/milestones/models.py:54 taiga/projects/models.py:518 +#: taiga/projects/models.py:551 taiga/projects/models.py:609 +#: taiga/projects/models.py:683 +msgid "is closed" +msgstr "" + +#: taiga/projects/milestones/models.py:56 +msgid "disponibility" +msgstr "" + +#: taiga/projects/milestones/models.py:80 +msgid "The estimated start must be previous to the estimated finish." +msgstr "" + +#: taiga/projects/milestones/validators.py:33 +msgid "There's no milestone with that id" +msgstr "このIDのマイルストーンは存在しません。" + +#: taiga/projects/mixins/blocked.py:31 +msgid "is blocked" +msgstr "はブロックされています。" + +#: taiga/projects/mixins/ordering.py:49 +#, python-brace-format +msgid "'{param}' parameter is mandatory" +msgstr "'{param}'パラメータは必須です。" + +#: taiga/projects/mixins/ordering.py:53 +msgid "'project' parameter is mandatory" +msgstr "'project'パラメータは必須です。" + +#: taiga/projects/models.py:76 +msgid "email" +msgstr "メール" + +#: taiga/projects/models.py:78 +msgid "create at" +msgstr "" + +#: taiga/projects/models.py:80 taiga/users/models.py:154 +msgid "token" +msgstr "トークン" + +#: taiga/projects/models.py:86 +msgid "invitation extra text" +msgstr "招待状の追加テキスト" + +#: taiga/projects/models.py:89 taiga/projects/models.py:735 +msgid "user order" +msgstr "" + +#: taiga/projects/models.py:105 +msgid "The user is already member of the project" +msgstr "このユーザーはすでにプロジェクトのメンバーです。" + +#: taiga/projects/models.py:112 +msgid "default epic status" +msgstr "" + +#: taiga/projects/models.py:116 +msgid "default US status" +msgstr "" + +#: taiga/projects/models.py:119 +msgid "default points" +msgstr "" + +#: taiga/projects/models.py:123 +msgid "default task status" +msgstr "" + +#: taiga/projects/models.py:126 +msgid "default priority" +msgstr "" + +#: taiga/projects/models.py:129 +msgid "default severity" +msgstr "" + +#: taiga/projects/models.py:133 +msgid "default issue status" +msgstr "" + +#: taiga/projects/models.py:137 +msgid "default issue type" +msgstr "" + +#: taiga/projects/models.py:153 +msgid "logo" +msgstr "ロゴ" + +#: taiga/projects/models.py:163 +msgid "members" +msgstr "メンバー" + +#: taiga/projects/models.py:166 +msgid "total of milestones" +msgstr "" + +#: taiga/projects/models.py:167 +msgid "total story points" +msgstr "" + +#: taiga/projects/models.py:170 taiga/projects/models.py:746 +msgid "active epics panel" +msgstr "" + +#: taiga/projects/models.py:172 taiga/projects/models.py:748 +msgid "active backlog panel" +msgstr "" + +#: taiga/projects/models.py:174 taiga/projects/models.py:750 +msgid "active kanban panel" +msgstr "" + +#: taiga/projects/models.py:176 taiga/projects/models.py:752 +msgid "active wiki panel" +msgstr "" + +#: taiga/projects/models.py:178 taiga/projects/models.py:754 +msgid "active issues panel" +msgstr "" + +#: taiga/projects/models.py:181 taiga/projects/models.py:757 +msgid "videoconference system" +msgstr "" + +#: taiga/projects/models.py:183 taiga/projects/models.py:759 +msgid "videoconference extra data" +msgstr "" + +#: taiga/projects/models.py:189 +msgid "creation template" +msgstr "" + +#: taiga/projects/models.py:192 taiga/users/admin.py:62 +msgid "is private" +msgstr "" + +#: taiga/projects/models.py:194 +msgid "anonymous permissions" +msgstr "" + +#: taiga/projects/models.py:196 +msgid "user permissions" +msgstr "" + +#: taiga/projects/models.py:199 +msgid "is featured" +msgstr "" + +#: taiga/projects/models.py:202 +msgid "is looking for people" +msgstr "" + +#: taiga/projects/models.py:204 +msgid "loking for people note" +msgstr "" + +#: taiga/projects/models.py:218 +msgid "project transfer token" +msgstr "" + +#: taiga/projects/models.py:222 +msgid "blocked code" +msgstr "" + +#: taiga/projects/models.py:226 taiga/projects/notifications/models.py:66 +msgid "updated date time" +msgstr "" + +#: taiga/projects/models.py:229 taiga/projects/models.py:241 +#: taiga/projects/votes/models.py:30 +msgid "count" +msgstr "" + +#: taiga/projects/models.py:232 +msgid "fans last week" +msgstr "" + +#: taiga/projects/models.py:235 +msgid "fans last month" +msgstr "" + +#: taiga/projects/models.py:238 +msgid "fans last year" +msgstr "" + +#: taiga/projects/models.py:244 +msgid "activity last week" +msgstr "" + +#: taiga/projects/models.py:247 +msgid "activity last month" +msgstr "" + +#: taiga/projects/models.py:250 +msgid "activity last year" +msgstr "" + +#: taiga/projects/models.py:501 +msgid "modules config" +msgstr "" + +#: taiga/projects/models.py:553 +msgid "is archived" +msgstr "" + +#: taiga/projects/models.py:557 +msgid "work in progress limit" +msgstr "" + +#: taiga/projects/models.py:585 taiga/userstorage/models.py:33 +msgid "value" +msgstr "" + +#: taiga/projects/models.py:743 +msgid "default owner's role" +msgstr "" + +#: taiga/projects/models.py:761 +msgid "default options" +msgstr "" + +#: taiga/projects/models.py:762 +msgid "epic statuses" +msgstr "" + +#: taiga/projects/models.py:763 +msgid "us statuses" +msgstr "" + +#: taiga/projects/models.py:764 taiga/projects/userstories/models.py:44 +#: taiga/projects/userstories/models.py:77 +msgid "points" +msgstr "" + +#: taiga/projects/models.py:765 +msgid "task statuses" +msgstr "" + +#: taiga/projects/models.py:766 +msgid "issue statuses" +msgstr "" + +#: taiga/projects/models.py:767 +msgid "issue types" +msgstr "" + +#: taiga/projects/models.py:768 +msgid "priorities" +msgstr "" + +#: taiga/projects/models.py:769 +msgid "severities" +msgstr "" + +#: taiga/projects/models.py:770 +msgid "roles" +msgstr "" + +#: taiga/projects/notifications/choices.py:30 +msgid "Involved" +msgstr "" + +#: taiga/projects/notifications/choices.py:31 +msgid "All" +msgstr "" + +#: taiga/projects/notifications/choices.py:32 +msgid "None" +msgstr "" + +#: taiga/projects/notifications/models.py:64 +msgid "created date time" +msgstr "" + +#: taiga/projects/notifications/models.py:68 +msgid "history entries" +msgstr "" + +#: taiga/projects/notifications/models.py:71 +msgid "notify users" +msgstr "" + +#: taiga/projects/notifications/models.py:93 +#: taiga/projects/notifications/models.py:94 +msgid "Watched" +msgstr "" + +#: taiga/projects/notifications/services.py:65 +#: taiga/projects/notifications/services.py:79 +msgid "Notify exists for specified user and project" +msgstr "" + +#: taiga/projects/notifications/services.py:426 +msgid "Invalid value for notify level" +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Epic updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a epic on %(project)s\n" +"

    Epic #%(ref)s %(subject)s

    \n" +" See epic\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Epic updated\n" +"Hello %(user)s, %(changer)s has updated a epic on %(project)s\n" +"See epic #%(ref)s %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the epic #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New epic created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new epic on " +"%(project)s

    \n" +"

    Epic #%(ref)s %(subject)s

    \n" +" See epic\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New epic created\n" +"Hello %(user)s, %(changer)s has created a new epic on %(project)s\n" +"See epic #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the epic #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Epic deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a epic on %(project)s\n" +"

    Epic #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Epic deleted\n" +"Hello %(user)s, %(changer)s has deleted a epic on %(project)s\n" +"Epic #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the epic #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Issue updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated an issue on %(project)s\n" +"

    Issue #%(ref)s %(subject)s

    \n" +" See issue\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Issue updated\n" +"Hello %(user)s, %(changer)s has updated an issue on %(project)s\n" +"See issue #%(ref)s %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New issue created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new issue on " +"%(project)s

    \n" +"

    Issue #%(ref)s %(subject)s

    \n" +" See issue\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New issue created\n" +"Hello %(user)s, %(changer)s has created a new issue on %(project)s\n" +"See issue #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Issue deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted an issue on %(project)s\n" +"

    Issue #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Issue deleted\n" +"Hello %(user)s, %(changer)s has deleted an issue on %(project)s\n" +"Issue #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Sprint updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated an sprint on " +"%(project)s

    \n" +"

    Sprint %(name)s

    \n" +" See sprint\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Sprint updated\n" +"Hello %(user)s, %(changer)s has updated a sprint on %(project)s\n" +"See sprint %(name)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the sprint \"%(milestone)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New sprint created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new sprint on " +"%(project)s

    \n" +"

    Sprint %(name)s

    \n" +" See " +"sprint\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New sprint created\n" +"Hello %(user)s, %(changer)s has created a new sprint on %(project)s\n" +"See sprint %(name)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the sprint \"%(milestone)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Sprint deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted an sprint on " +"%(project)s

    \n" +"

    Sprint %(name)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Sprint deleted\n" +"Hello %(user)s, %(changer)s has deleted an sprint on %(project)s\n" +"Sprint %(name)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the Sprint \"%(milestone)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Task updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a task on %(project)s\n" +"

    Task #%(ref)s %(subject)s

    \n" +" See task\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Task updated\n" +"Hello %(user)s, %(changer)s has updated a task on %(project)s\n" +"See task #%(ref)s %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the task #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New task created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new task on " +"%(project)s

    \n" +"

    Task #%(ref)s %(subject)s

    \n" +" See task\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New task created\n" +"Hello %(user)s, %(changer)s has created a new task on %(project)s\n" +"See task #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the task #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Task deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a task on %(project)s\n" +"

    Task #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Task deleted\n" +"Hello %(user)s, %(changer)s has deleted a task on %(project)s\n" +"Task #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the task #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    User Story updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a user story on " +"%(project)s

    \n" +"

    User Story #%(ref)s %(subject)s

    \n" +" See user story\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"User story updated\n" +"Hello %(user)s, %(changer)s has updated a user story on %(project)s\n" +"See user story #%(ref)s %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the US #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New user story created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new user story on " +"%(project)s

    \n" +"

    User Story #%(ref)s %(subject)s

    \n" +" See user story\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New user story created\n" +"Hello %(user)s, %(changer)s has created a new user story on %(project)s\n" +"See user story #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the US #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    User Story deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a user story on " +"%(project)s

    \n" +"

    User Story #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"User Story deleted\n" +"Hello %(user)s, %(changer)s has deleted a user story on %(project)s\n" +"User Story #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the US #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Wiki Page updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a wiki page on " +"%(project)s

    \n" +"

    Wiki page %(page)s

    \n" +" See Wiki Page\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Wiki Page updated\n" +"\n" +"Hello %(user)s, %(changer)s has updated a wiki page on %(project)s\n" +"\n" +"See wiki page %(page)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the Wiki Page \"%(page)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New wiki page created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new wiki page on " +"%(project)s

    \n" +"

    Wiki page %(page)s

    \n" +" See " +"wiki page\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New wiki page created\n" +"\n" +"Hello %(user)s, %(changer)s has created a new wiki page on %(project)s\n" +"\n" +"See wiki page %(page)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the Wiki Page \"%(page)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Wiki page deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a wiki page on " +"%(project)s

    \n" +"

    Wiki page %(page)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Wiki page deleted\n" +"\n" +"Hello %(user)s, %(changer)s has deleted a wiki page on %(project)s\n" +"\n" +"Wiki page %(page)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the Wiki Page \"%(page)s\"\n" +msgstr "" + +#: taiga/projects/notifications/validators.py:48 +msgid "Watchers contains invalid users" +msgstr "" + +#: taiga/projects/occ/mixins.py:37 +msgid "The version must be an integer" +msgstr "" + +#: taiga/projects/occ/mixins.py:60 +msgid "The version parameter is not valid" +msgstr "" + +#: taiga/projects/occ/mixins.py:76 +msgid "The version doesn't match with the current one" +msgstr "" + +#: taiga/projects/occ/mixins.py:95 +msgid "version" +msgstr "" + +#: taiga/projects/permissions.py:44 +msgid "" +"You can't leave the project if you are the owner or there are no more admins" +msgstr "" + +#: taiga/projects/services/members.py:118 +msgid "Project without owner" +msgstr "" + +#: taiga/projects/services/members.py:123 +msgid "You have reached your current limit of memberships for private projects" +msgstr "" + +#: taiga/projects/services/members.py:127 +msgid "You have reached your current limit of memberships for public projects" +msgstr "" + +#: taiga/projects/services/projects.py:94 +#: taiga/projects/services/projects.py:134 taiga/users/services.py:589 +msgid "You can't have more private projects" +msgstr "" + +#: taiga/projects/services/projects.py:98 +#: taiga/projects/services/projects.py:138 taiga/users/services.py:592 +msgid "" +"This project reaches your current limit of memberships for private projects" +msgstr "" + +#: taiga/projects/services/projects.py:102 +#: taiga/projects/services/projects.py:142 taiga/users/services.py:596 +msgid "You can't have more public projects" +msgstr "" + +#: taiga/projects/services/projects.py:106 +#: taiga/projects/services/projects.py:146 taiga/users/services.py:599 +msgid "" +"This project reaches your current limit of memberships for public projects" +msgstr "" + +#: taiga/projects/services/stats.py:197 +msgid "Future sprint" +msgstr "" + +#: taiga/projects/services/stats.py:217 +msgid "Project End" +msgstr "プロジェクト完了" + +#: taiga/projects/services/transfer.py:62 +#: taiga/projects/services/transfer.py:69 +#: taiga/projects/services/transfer.py:72 taiga/users/api.py:186 +#: taiga/users/api.py:191 +msgid "Token is invalid" +msgstr "" + +#: taiga/projects/services/transfer.py:67 +msgid "Token has expired" +msgstr "" + +#: taiga/projects/tagging/fields.py:52 +#, python-brace-format +msgid "Invalid tag '{value}'. The color is not a valid HEX color or null." +msgstr "" + +#: taiga/projects/tagging/fields.py:55 +#, python-brace-format +msgid "" +"Invalid tag '{value}'. it must be the name or a pair '[\"name\", \"hex color/" +"\" | null]'." +msgstr "" + +#: taiga/projects/tagging/fields.py:77 +#, python-brace-format +msgid "Invalid tag '{value}'. It must be the tag name." +msgstr "" + +#: taiga/projects/tagging/models.py:27 +msgid "tags" +msgstr "" + +#: taiga/projects/tagging/models.py:35 +msgid "tags colors" +msgstr "" + +#: taiga/projects/tagging/validators.py:47 +#: taiga/projects/tagging/validators.py:74 +msgid "This tag already exists." +msgstr "" + +#: taiga/projects/tagging/validators.py:54 +#: taiga/projects/tagging/validators.py:81 +msgid "The color is not a valid HEX color." +msgstr "" + +#: taiga/projects/tagging/validators.py:67 +#: taiga/projects/tagging/validators.py:101 +#: taiga/projects/tagging/validators.py:114 +#: taiga/projects/tagging/validators.py:121 +msgid "The tag doesn't exist." +msgstr "" + +#: taiga/projects/tasks/api.py:97 taiga/projects/tasks/api.py:106 +msgid "You don't have permissions to set this sprint to this task." +msgstr "" + +#: taiga/projects/tasks/api.py:100 +msgid "You don't have permissions to set this user story to this task." +msgstr "" + +#: taiga/projects/tasks/api.py:103 +msgid "You don't have permissions to set this status to this task." +msgstr "" + +#: taiga/projects/tasks/models.py:58 +msgid "us order" +msgstr "" + +#: taiga/projects/tasks/models.py:60 +msgid "taskboard order" +msgstr "" + +#: taiga/projects/tasks/models.py:68 +msgid "is iocaine" +msgstr "" + +#: taiga/projects/tasks/validators.py:59 +msgid "Invalid milestone id." +msgstr "" + +#: taiga/projects/tasks/validators.py:70 +msgid "Invalid task status id." +msgstr "" + +#: taiga/projects/tasks/validators.py:83 +msgid "Invalid user story id." +msgstr "" + +#: taiga/projects/tasks/validators.py:107 +msgid "Invalid task status id. The status must belong to the same project." +msgstr "" + +#: taiga/projects/tasks/validators.py:121 +msgid "Invalid user story id. The user story must belong to the same project." +msgstr "" + +#: taiga/projects/tasks/validators.py:133 +msgid "Invalid milestone id. The milestone must belong to the same project." +msgstr "" + +#: taiga/projects/tasks/validators.py:150 +msgid "" +"Invalid task ids. All tasks must belong to the same project and, if it " +"exists, to the same status, user story and/or milestone." +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:6 +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:4 +msgid "someone" +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:11 +#, python-format +msgid "" +"\n" +"

    You have been invited to Taiga!

    \n" +"

    Hi! %(full_name)s has sent you an invitation to join project " +"%(project)s in Taiga.
    Taiga is a Free, open Source Agile Project " +"Management Tool.

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:17 +#, python-format +msgid "" +"\n" +"

    And now a few words from the jolly good fellow or sistren
    " +"who thought so kindly as to invite you

    \n" +"

    %(extra)s

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:24 +msgid "Accept your invitation to Taiga" +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:24 +msgid "Accept your invitation" +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:25 +msgid "The Taiga Team" +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:6 +#, python-format +msgid "" +"\n" +"You, or someone you know, has invited you to Taiga\n" +"\n" +"Hi! %(full_name)s has sent you an invitation to join a project called " +"%(project)s which is being managed on Taiga, a Free, open Source Agile " +"Project Management Tool.\n" +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:12 +#, python-format +msgid "" +"\n" +"And now a few words from the jolly good fellow or sistren who thought so " +"kindly as to invite you:\n" +"\n" +"%(extra)s\n" +" " +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:18 +msgid "Accept your invitation to Taiga following this link:" +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:20 +msgid "" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[Taiga] Invitation to join to the project '%(project)s'\n" +msgstr "" + +#: taiga/projects/templates/emails/membership_notification-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    You have been added to a project

    \n" +"

    Hello %(full_name)s,
    you have been added to the project " +"%(project)s

    \n" +" Go to " +"project\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/membership_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"You have been added to a project\n" +"Hello %(full_name)s,you have been added to the project %(project)s\n" +"\n" +"See project at %(url)s\n" +msgstr "" + +#: taiga/projects/templates/emails/membership_notification-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[Taiga] Added to the project '%(project)s'\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_accept-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(old_owner_name)s,

    \n" +"

    %(new_owner_name)s has accepted your offer and will become the " +"new project owner for \"%(project_name)s\".

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/transfer_accept-body-html.jinja:10 +#, python-format +msgid "

    %(new_owner_name)s says:

    " +msgstr "" + +#: taiga/projects/templates/emails/transfer_accept-body-html.jinja:14 +msgid "" +"\n" +"

    From now on, your new status for this project will be \"admin\".\n" +" " +msgstr "" + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(old_owner_name)s,\n" +"%(new_owner_name)s has accepted your offer and will become the new project " +"owner for \"%(project_name)s\".\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:7 +#, python-format +msgid "%(new_owner_name)s says:" +msgstr "" + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:11 +msgid "" +"\n" +"From now on, your new status for this project will be \"admin\".\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:16 +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:19 +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:13 +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:18 +msgid "" +"\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_accept-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer offer accepted!\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(owner_name)s,

    \n" +"

    %(rejecter_name)s has declined your offer and will not become the " +"new project owner for \"%(project_name)s\".

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:10 +#, python-format +msgid "" +"\n" +"

    %(rejecter_name)s says:

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:16 +msgid "" +"\n" +"

    If you want, you can still try to transfer the project ownership to a " +"different person.

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:21 +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:22 +msgid "Request transfer to a different person" +msgstr "" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(owner_name)s,\n" +"%(rejecter_name)s has declined your offer and will not become the new " +"project owner for \"%(project_name)s\".\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:7 +#, python-format +msgid "%(rejecter_name)s says:" +msgstr "%(rejecter_name)s がコメント:" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:11 +msgid "" +"\n" +"If you want, you can still try to transfer the project ownership to a " +"different person.\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:15 +msgid "Request transfer to a different person:" +msgstr "" + +#: taiga/projects/templates/emails/transfer_reject-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer declined\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_request-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(owner_name)s,

    \n" +"

    %(requester_name)s has requested to become the project owner for " +"\"%(project_name)s\".

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/transfer_request-body-html.jinja:9 +msgid "" +"\n" +"

    Please, click on \"Continue\" if you would like to start the " +"project transfer from the administration panel.

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/transfer_request-body-html.jinja:14 +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:22 +msgid "Continue" +msgstr "続ける" + +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(owner_name)s,\n" +"%(requester_name)s has requested to become the project owner for " +"\"%(project_name)s\".\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:6 +msgid "" +"\n" +"Please, go to your project settings if you would like to start the project " +"transfer from the administration panel.\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:10 +msgid "Go to your project settings:" +msgstr "プロジェクト設定へ移動する:" + +#: taiga/projects/templates/emails/transfer_request-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer request\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(receiver_name)s,

    \n" +"

    %(owner_name)s, the current project owner at \"%(project_name)s\" " +"would like you to become the new project owner.

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:10 +#, python-format +msgid "" +"\n" +"

    %(owner_name)s says:

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:17 +msgid "" +"\n" +"

    Please, click on \"Continue\" to either accept or reject this " +"proposal.

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(receiver_name)s,\n" +"%(owner_name)s, the current project owner at \"%(project_name)s\" would like " +"you to become the new project owner.\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:6 +#, python-format +msgid "%(owner_name)s says:" +msgstr "%(owner_name)s がコメント:" + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:11 +msgid "" +"\n" +"Please, go to the following link to either accept or reject this proposal.\n" +msgstr "" + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:15 +msgid "Accept or reject the project ownership transfer:" +msgstr "" + +#: taiga/projects/templates/emails/transfer_start-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer offer\n" +msgstr "" + +#. Translators: Name of scrum project template. +#: taiga/projects/translations.py:30 +msgid "Scrum" +msgstr "スクラム" + +#. Translators: Description of scrum project template. +#: taiga/projects/translations.py:32 +msgid "" +"The agile product backlog in Scrum is a prioritized features list, " +"containing short descriptions of all functionality desired in the product. " +"When applying Scrum, it's not necessary to start a project with a lengthy, " +"upfront effort to document all requirements. The Scrum product backlog is " +"then allowed to grow and change as more is learned about the product and its " +"customers" +msgstr "" + +#. Translators: Name of kanban project template. +#: taiga/projects/translations.py:35 +msgid "Kanban" +msgstr "カンバン" + +#. Translators: Description of kanban project template. +#: taiga/projects/translations.py:37 +msgid "" +"Kanban is a method for managing knowledge work with an emphasis on just-in-" +"time delivery while not overloading the team members. In this approach, the " +"process, from definition of a task to its delivery to the customer, is " +"displayed for participants to see and team members pull work from a queue." +msgstr "" + +#. Translators: User story point value (value = undefined) +#: taiga/projects/translations.py:45 +msgid "?" +msgstr "?" + +#. Translators: User story point value (value = 0) +#: taiga/projects/translations.py:47 +msgid "0" +msgstr "0" + +#. Translators: User story point value (value = 0.5) +#: taiga/projects/translations.py:49 +msgid "1/2" +msgstr "1/2" + +#. Translators: User story point value (value = 1) +#: taiga/projects/translations.py:51 +msgid "1" +msgstr "1" + +#. Translators: User story point value (value = 2) +#: taiga/projects/translations.py:53 +msgid "2" +msgstr "2" + +#. Translators: User story point value (value = 3) +#: taiga/projects/translations.py:55 +msgid "3" +msgstr "3" + +#. Translators: User story point value (value = 5) +#: taiga/projects/translations.py:57 +msgid "5" +msgstr "5" + +#. Translators: User story point value (value = 8) +#: taiga/projects/translations.py:59 +msgid "8" +msgstr "8" + +#. Translators: User story point value (value = 10) +#: taiga/projects/translations.py:61 +msgid "10" +msgstr "10" + +#. Translators: User story point value (value = 13) +#: taiga/projects/translations.py:63 +msgid "13" +msgstr "13" + +#. Translators: User story point value (value = 20) +#: taiga/projects/translations.py:65 +msgid "20" +msgstr "20" + +#. Translators: User story point value (value = 40) +#: taiga/projects/translations.py:67 +msgid "40" +msgstr "40" + +#. Translators: User story status +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:75 taiga/projects/translations.py:98 +#: taiga/projects/translations.py:114 +msgid "New" +msgstr "新規" + +#. Translators: User story status +#: taiga/projects/translations.py:78 +msgid "Ready" +msgstr "準備中" + +#. Translators: User story status +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:81 taiga/projects/translations.py:100 +#: taiga/projects/translations.py:116 +msgid "In progress" +msgstr "処理中" + +#. Translators: User story status +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:84 taiga/projects/translations.py:102 +#: taiga/projects/translations.py:118 +msgid "Ready for test" +msgstr "テスト待ち" + +#. Translators: User story status +#: taiga/projects/translations.py:87 +msgid "Done" +msgstr "完了" + +#. Translators: User story status +#: taiga/projects/translations.py:90 +msgid "Archived" +msgstr "アーカイブ" + +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:104 taiga/projects/translations.py:120 +msgid "Closed" +msgstr "終了" + +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:106 taiga/projects/translations.py:122 +msgid "Needs Info" +msgstr "情報が必要" + +#. Translators: Issue status +#: taiga/projects/translations.py:124 +msgid "Postponed" +msgstr "延期" + +#. Translators: Issue status +#: taiga/projects/translations.py:126 +msgid "Rejected" +msgstr "拒否" + +#. Translators: Issue type +#: taiga/projects/translations.py:134 +msgid "Bug" +msgstr "バグ" + +#. Translators: Issue type +#: taiga/projects/translations.py:136 +msgid "Question" +msgstr "問い合わせ" + +#. Translators: Issue type +#: taiga/projects/translations.py:138 +msgid "Enhancement" +msgstr "拡張" + +#. Translators: Issue priority +#: taiga/projects/translations.py:146 +msgid "Low" +msgstr "低い" + +#. Translators: Issue priority +#. Translators: Issue severity +#: taiga/projects/translations.py:148 taiga/projects/translations.py:161 +msgid "Normal" +msgstr "通常" + +#. Translators: Issue priority +#: taiga/projects/translations.py:150 +msgid "High" +msgstr "高い" + +#. Translators: Issue severity +#: taiga/projects/translations.py:157 +msgid "Wishlist" +msgstr "やりたい事" + +#. Translators: Issue severity +#: taiga/projects/translations.py:159 +msgid "Minor" +msgstr "マイナー" + +#. Translators: Issue severity +#: taiga/projects/translations.py:163 +msgid "Important" +msgstr "重要" + +#. Translators: Issue severity +#: taiga/projects/translations.py:165 +msgid "Critical" +msgstr "危険" + +#. Translators: User role +#: taiga/projects/translations.py:172 +msgid "UX" +msgstr "UX" + +#. Translators: User role +#: taiga/projects/translations.py:174 +msgid "Design" +msgstr "デザイン" + +#. Translators: User role +#: taiga/projects/translations.py:176 +msgid "Front" +msgstr "フロントエンド" + +#. Translators: User role +#: taiga/projects/translations.py:178 +msgid "Back" +msgstr "バックエンド" + +#. Translators: User role +#: taiga/projects/translations.py:180 +msgid "Product Owner" +msgstr "プロダクトオーナー" + +#. Translators: User role +#: taiga/projects/translations.py:182 +msgid "Stakeholder" +msgstr "" + +#: taiga/projects/userstories/api.py:124 +msgid "You don't have permissions to set this sprint to this user story." +msgstr "" + +#: taiga/projects/userstories/api.py:128 +msgid "You don't have permissions to set this status to this user story." +msgstr "" + +#: taiga/projects/userstories/api.py:218 +#, python-brace-format +msgid "Invalid role id '{role_id}'" +msgstr "" + +#: taiga/projects/userstories/api.py:225 +#, python-brace-format +msgid "Invalid points id '{points_id}'" +msgstr "" + +#: taiga/projects/userstories/api.py:240 +#, python-brace-format +msgid "Generating the user story #{ref} - {subject}" +msgstr "" + +#: taiga/projects/userstories/api.py:301 +msgid "ref param is needed" +msgstr "" + +#: taiga/projects/userstories/api.py:304 +msgid "project or project_slug param is needed" +msgstr "" + +#: taiga/projects/userstories/models.py:41 +msgid "role" +msgstr "役割" + +#: taiga/projects/userstories/models.py:80 +msgid "backlog order" +msgstr "バックログ順" + +#: taiga/projects/userstories/models.py:82 +msgid "sprint order" +msgstr "スプリント順" + +#: taiga/projects/userstories/models.py:84 +msgid "kanban order" +msgstr "" + +#: taiga/projects/userstories/models.py:92 +msgid "finish date" +msgstr "完了日" + +#: taiga/projects/userstories/models.py:107 +msgid "generated from issue" +msgstr "" + +#: taiga/projects/userstories/validators.py:43 +msgid "There's no user story with that id" +msgstr "" + +#: taiga/projects/userstories/validators.py:82 +#: taiga/projects/userstories/validators.py:108 +msgid "" +"Invalid user story status id. The status must belong to the same project." +msgstr "" + +#: taiga/projects/userstories/validators.py:120 +msgid "Invalid milestone id. The milistone must belong to the same project." +msgstr "" + +#: taiga/projects/userstories/validators.py:135 +msgid "" +"Invalid user story ids. All stories must belong to the same project and, if " +"it exists, to the same status and milestone." +msgstr "" + +#: taiga/projects/userstories/validators.py:159 +msgid "The milestone isn't valid for the project" +msgstr "" + +#: taiga/projects/userstories/validators.py:169 +msgid "All the user stories must be from the same project" +msgstr "" + +#: taiga/projects/validators.py:61 +msgid "There's no project with that id" +msgstr "" + +#: taiga/projects/validators.py:142 +msgid "Email address is already taken" +msgstr "" + +#: taiga/projects/validators.py:154 +msgid "Invalid role for the project" +msgstr "" + +#: taiga/projects/validators.py:165 +msgid "The project owner must be admin." +msgstr "" + +#: taiga/projects/validators.py:169 +msgid "At least one user must be an active admin for this project." +msgstr "" + +#: taiga/projects/validators.py:201 +msgid "Invalid role ids. All roles must belong to the same project." +msgstr "" + +#: taiga/projects/validators.py:225 +msgid "Default options" +msgstr "" + +#: taiga/projects/validators.py:226 +msgid "User story's statuses" +msgstr "ユーザーストーリーステータス" + +#: taiga/projects/validators.py:227 +msgid "Points" +msgstr "点数" + +#: taiga/projects/validators.py:228 +msgid "Task's statuses" +msgstr "タスクステータス" + +#: taiga/projects/validators.py:229 +msgid "Issue's statuses" +msgstr "課題ステータス" + +#: taiga/projects/validators.py:230 +msgid "Issue's types" +msgstr "課題タイプ" + +#: taiga/projects/validators.py:231 +msgid "Priorities" +msgstr "優先度" + +#: taiga/projects/validators.py:232 +msgid "Severities" +msgstr "重要度" + +#: taiga/projects/validators.py:233 +msgid "Roles" +msgstr "権限" + +#: taiga/projects/votes/models.py:33 taiga/projects/votes/models.py:34 +#: taiga/projects/votes/models.py:58 +msgid "Votes" +msgstr "投票" + +#: taiga/projects/votes/models.py:57 +msgid "Vote" +msgstr "投票" + +#: taiga/projects/wiki/api.py:77 +msgid "'content' parameter is mandatory" +msgstr "" + +#: taiga/projects/wiki/api.py:80 +msgid "'project_id' parameter is mandatory" +msgstr "" + +#: taiga/projects/wiki/models.py:42 +msgid "last modifier" +msgstr "最終更新者" + +#: taiga/projects/wiki/models.py:75 +msgid "href" +msgstr "" + +#: taiga/timeline/signals.py:63 +msgid "Check the history API for the exact diff" +msgstr "" + +#: taiga/users/admin.py:39 +msgid "Project Member" +msgstr "プロジェクトメンバー" + +#: taiga/users/admin.py:40 +msgid "Project Members" +msgstr "プロジェクトメンバー" + +#: taiga/users/admin.py:50 +msgid "id" +msgstr "ID" + +#: taiga/users/admin.py:81 +msgid "Project Ownership" +msgstr "プロジェクト管理者" + +#: taiga/users/admin.py:82 +msgid "Project Ownerships" +msgstr "プロジェクト管理者" + +#: taiga/users/admin.py:119 +msgid "Personal info" +msgstr "個人情報" + +#: taiga/users/admin.py:122 +msgid "Permissions" +msgstr "アクセス権" + +#: taiga/users/admin.py:123 +msgid "Restrictions" +msgstr "制限事項" + +#: taiga/users/admin.py:125 +msgid "Important dates" +msgstr "" + +#: taiga/users/api.py:123 +msgid "Duplicated email" +msgstr "重複メール" + +#: taiga/users/api.py:125 +msgid "Not valid email" +msgstr "無効なメール" + +#: taiga/users/api.py:165 +msgid "Invalid username or email" +msgstr "" + +#: taiga/users/api.py:174 +msgid "Mail sended successful!" +msgstr "" + +#: taiga/users/api.py:212 +msgid "Current password parameter needed" +msgstr "" + +#: taiga/users/api.py:215 +msgid "New password parameter needed" +msgstr "" + +#: taiga/users/api.py:218 +msgid "Invalid password length at least 6 charaters needed" +msgstr "" + +#: taiga/users/api.py:221 +msgid "Invalid current password" +msgstr "現在のパスワードが無効です" + +#: taiga/users/api.py:268 taiga/users/api.py:274 +msgid "" +"Invalid, are you sure the token is correct and you didn't use it before?" +msgstr "" + +#: taiga/users/api.py:301 taiga/users/api.py:309 taiga/users/api.py:312 +msgid "Invalid, are you sure the token is correct?" +msgstr "" + +#: taiga/users/models.py:95 +msgid "superuser status" +msgstr "管理者の状態" + +#: taiga/users/models.py:96 +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "" + +#: taiga/users/models.py:126 +msgid "username" +msgstr "ユーザー名" + +#: taiga/users/models.py:127 +msgid "" +"Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" +msgstr "" + +#: taiga/users/models.py:130 +msgid "Enter a valid username." +msgstr "有効なユーザー名を入力してください。" + +#: taiga/users/models.py:133 +msgid "active" +msgstr "有効" + +#: taiga/users/models.py:134 +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "" + +#: taiga/users/models.py:140 +msgid "biography" +msgstr "経歴" + +#: taiga/users/models.py:143 +msgid "photo" +msgstr "写真" + +#: taiga/users/models.py:144 +msgid "date joined" +msgstr "参加日" + +#: taiga/users/models.py:146 +msgid "default language" +msgstr "既定の言語" + +#: taiga/users/models.py:148 +msgid "default theme" +msgstr "既定のテーマ" + +#: taiga/users/models.py:150 +msgid "default timezone" +msgstr "既定のタイムゾーン" + +#: taiga/users/models.py:152 +msgid "colorize tags" +msgstr "タグを色付け" + +#: taiga/users/models.py:157 +msgid "email token" +msgstr "Eメールトークン" + +#: taiga/users/models.py:159 +msgid "new email address" +msgstr "新しいEメールアドレス" + +#: taiga/users/models.py:166 +msgid "max number of owned private projects" +msgstr "非公開プロジェクトの最大数" + +#: taiga/users/models.py:169 +msgid "max number of owned public projects" +msgstr "公開プロジェクトの最大数" + +#: taiga/users/models.py:172 +msgid "max number of memberships for each owned private project" +msgstr "非公開プロジェクトごとのメンバーの最大数" + +#: taiga/users/models.py:176 +msgid "max number of memberships for each owned public project" +msgstr "公開プロジェクトごとのメンバーの最大数" + +#: taiga/users/models.py:296 +msgid "permissions" +msgstr "アクセス権" + +#: taiga/users/services.py:51 taiga/users/services.py:68 +msgid "Username or password does not matches user." +msgstr "" + +#: taiga/users/templates/emails/change_email-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Change your email

    \n" +"

    Hello %(full_name)s,
    please confirm your email

    \n" +" Confirm " +"email\n" +"

    You can ignore this message if you did not request.

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/users/templates/emails/change_email-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(full_name)s, please confirm your email\n" +"\n" +"%(url)s\n" +"\n" +"You can ignore this message if you did not request.\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/users/templates/emails/change_email-subject.jinja:1 +msgid "[Taiga] Change email" +msgstr "" + +#: taiga/users/templates/emails/password_recovery-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Recover your password

    \n" +"

    Hello %(full_name)s,
    you asked to recover your password

    \n" +" Recover your password\n" +"

    You can ignore this message if you did not request.

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/users/templates/emails/password_recovery-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(full_name)s, you asked to recover your password\n" +"\n" +"%(url)s\n" +"\n" +"You can ignore this message if you did not request.\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/users/templates/emails/password_recovery-subject.jinja:1 +msgid "[Taiga] Password recovery" +msgstr "" + +#: taiga/users/templates/emails/registered_user-body-html.jinja:6 +msgid "" +"\n" +"     \n" +" " +msgstr "" + +#: taiga/users/templates/emails/registered_user-body-html.jinja:23 +#, python-format +msgid "" +"\n" +" You may remove your account from this service clicking " +"here\n" +" " +msgstr "" + +#: taiga/users/templates/emails/registered_user-body-text.jinja:1 +msgid "" +"\n" +"Thank you for registering in Taiga\n" +"\n" +"We hope you enjoy it\n" +"\n" +"We built Taiga because we wanted the project management tool that sits open " +"on our computers all day long, to serve as a continued reminder of why we " +"love to collaborate, code and design.\n" +"\n" +"We built it to be beautiful, elegant, simple to use and fun - without " +"forsaking flexibility and power.\n" +"\n" +"--\n" +"The taiga Team\n" +msgstr "" + +#: taiga/users/templates/emails/registered_user-body-text.jinja:13 +#, python-format +msgid "" +"\n" +"You may remove your account from this service: %(url)s\n" +msgstr "" + +#: taiga/users/templates/emails/registered_user-subject.jinja:1 +msgid "You've been Taigatized!" +msgstr "" + +#: taiga/users/validators.py:45 +msgid "invalid" +msgstr "無効" + +#: taiga/users/validators.py:56 +msgid "Invalid username. Try with a different one." +msgstr "" + +#: taiga/userstorage/api.py:53 +msgid "" +"Duplicate key value violates unique constraint. Key '{}' already exists." +msgstr "" + +#: taiga/userstorage/models.py:32 +msgid "key" +msgstr "" + +#: taiga/webhooks/models.py:30 taiga/webhooks/models.py:40 +msgid "URL" +msgstr "URL" + +#: taiga/webhooks/models.py:31 +msgid "secret key" +msgstr "秘密鍵" + +#: taiga/webhooks/models.py:41 +msgid "status code" +msgstr "ステータスコード" + +#: taiga/webhooks/models.py:42 +msgid "request data" +msgstr "リクエストデータ" + +#: taiga/webhooks/models.py:43 +msgid "request headers" +msgstr "リクエストヘッダー" + +#: taiga/webhooks/models.py:44 +msgid "response data" +msgstr "レスポンスデータ" + +#: taiga/webhooks/models.py:45 +msgid "response headers" +msgstr "レスポンスヘッダー" + +#: taiga/webhooks/models.py:46 +msgid "duration" +msgstr "期限" diff --git a/taiga/locale/zh-Hans/LC_MESSAGES/django.po b/taiga/locale/zh-Hans/LC_MESSAGES/django.po new file mode 100644 index 00000000..01adcbf9 --- /dev/null +++ b/taiga/locale/zh-Hans/LC_MESSAGES/django.po @@ -0,0 +1,4144 @@ +# taiga-back.taiga. +# Copyright (C) 2014-2016 Taiga Dev Team +# This file is distributed under the same license as the taiga-back package. +# +# Translators: +# gm l , 2016 +# Hanbing Yin , 2016 +# ifelse , 2015 +# Longyang Zhang , 2015 +# Qi Fan , 2016 +# wuwenbin , 2015 +# Yang Yu , 2016 +# yonee , 2015 +# 5791113 , 2016 +# 5791113 , 2016 +msgid "" +msgstr "" +"Project-Id-Version: taiga-back\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-09-28 10:29+0200\n" +"PO-Revision-Date: 2016-11-30 06:50+0000\n" +"Last-Translator: 5791113 \n" +"Language-Team: Chinese Simplified (http://www.transifex.com/taiga-agile-llc/" +"taiga-back/language/zh-Hans/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh-Hans\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: taiga/auth/api.py:102 +msgid "Public register is disabled." +msgstr "注册功能未开放" + +#: taiga/auth/api.py:135 +msgid "invalid register type" +msgstr "无效的注册类型" + +#: taiga/auth/api.py:148 +msgid "invalid login type" +msgstr "无效的登录类型" + +#: taiga/auth/services.py:76 +msgid "Username is already in use." +msgstr "用户名已经被使用" + +#: taiga/auth/services.py:79 +msgid "Email is already in use." +msgstr "电子邮件已经被使用" + +#: taiga/auth/services.py:95 +msgid "Token not matches any valid invitation." +msgstr "令牌不合法" + +#: taiga/auth/services.py:123 +msgid "User is already registered." +msgstr "用户已注册" + +#: taiga/auth/services.py:147 +msgid "This user is already a member of the project." +msgstr "该用户已经是此项目成员。" + +#: taiga/auth/services.py:173 +msgid "Error on creating new user." +msgstr "无法创建新用户" + +#: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 +#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 +#: taiga/projects/api.py:385 +msgid "Invalid token" +msgstr "无效令牌" + +#: taiga/auth/validators.py:37 taiga/users/validators.py:44 +msgid "invalid username" +msgstr "无效用户名" + +#: taiga/auth/validators.py:42 taiga/users/validators.py:50 +msgid "" +"Required. 255 characters or fewer. Letters, numbers and /./-/_ characters'" +msgstr "必填，长度小于255的数字、英文字母、“-”、“_”" + +#: taiga/base/api/fields.py:294 +msgid "This field is required." +msgstr "此字段是必需的。" + +#: taiga/base/api/fields.py:295 taiga/base/api/relations.py:337 +msgid "Invalid value." +msgstr "无效值。" + +#: taiga/base/api/fields.py:479 +#, python-format +msgid "'%s' value must be either True or False." +msgstr "'%s' 值必须为True或False。" + +#: taiga/base/api/fields.py:543 +msgid "" +"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +msgstr "输入一个有效的字符，由字母、数字、下划线或横线组成" + +#: taiga/base/api/fields.py:558 +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "请选择一个有效的选项。%(value)s 不是一个可用的选项。" + +#: taiga/base/api/fields.py:621 +msgid "You email domain is not allowed" +msgstr "不允许您的邮件域名" + +#: taiga/base/api/fields.py:630 +msgid "Enter a valid email address." +msgstr "请输入合法的邮件地址。" + +#: taiga/base/api/fields.py:672 +#, python-format +msgid "Date has wrong format. Use one of these formats instead: %s" +msgstr "日期格式错误。使用以下一种格式替代：%s" + +#: taiga/base/api/fields.py:736 +#, python-format +msgid "Datetime has wrong format. Use one of these formats instead: %s" +msgstr "日期格式错误。使用以下一种格式替代：%s" + +#: taiga/base/api/fields.py:806 +#, python-format +msgid "Time has wrong format. Use one of these formats instead: %s" +msgstr "时间格式错误。使用以下一种格式替代：%s" + +#: taiga/base/api/fields.py:863 +msgid "Enter a whole number." +msgstr "输入一个整数" + +#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#, python-format +msgid "Ensure this value is less than or equal to %(limit_value)s." +msgstr "确认此数值应小于或等于 %(limit_value)s" + +#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#, python-format +msgid "Ensure this value is greater than or equal to %(limit_value)s." +msgstr "确认此数值应大于或等于 %(limit_value)s" + +#: taiga/base/api/fields.py:895 +#, python-format +msgid "\"%s\" value must be a float." +msgstr "'%s' 值必须为 浮点数。" + +#: taiga/base/api/fields.py:916 +msgid "Enter a number." +msgstr "输入一个数字" + +#: taiga/base/api/fields.py:919 +#, python-format +msgid "Ensure that there are no more than %s digits in total." +msgstr "确保总数不超过%s个数字" + +#: taiga/base/api/fields.py:920 +#, python-format +msgid "Ensure that there are no more than %s decimal places." +msgstr "确保小数不超过%s位" + +#: taiga/base/api/fields.py:921 +#, python-format +msgid "Ensure that there are no more than %s digits before the decimal point." +msgstr "确保小数点前不超过%s位数字" + +#: taiga/base/api/fields.py:988 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "未提交任何文件。请检查表单的编码类型" + +#: taiga/base/api/fields.py:989 +msgid "No file was submitted." +msgstr "没有文件提交" + +#: taiga/base/api/fields.py:990 +msgid "The submitted file is empty." +msgstr "提交的文件是空的" + +#: taiga/base/api/fields.py:991 +#, python-format +msgid "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr "确保文件名不超过 %(max)d 个字符 (当前 %(length)d 个)" + +#: taiga/base/api/fields.py:992 +msgid "Please either submit a file or check the clear checkbox, not both." +msgstr "请提交文件或选中清除复选框，二选一" + +#: taiga/base/api/fields.py:1032 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "请上传一张有效的图片。所上传的不是图片或已损坏" + +#: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 +#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 +#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 +#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 +#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 +#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 +#: taiga/webhooks/api.py:71 +msgid "Blocked element" +msgstr "冻结的元素" + +#: taiga/base/api/pagination.py:214 +msgid "Page is not 'last', nor can it be converted to an int." +msgstr "页面不是‘最后’一个， 也不能转换成整数。" + +#: taiga/base/api/pagination.py:218 +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "无效页面 (%(page_number)s): %(message)s" + +#: taiga/base/api/permissions.py:66 +msgid "Invalid permission definition." +msgstr "无效的授权定义" + +#: taiga/base/api/relations.py:247 +#, python-format +msgid "Invalid pk '%s' - object does not exist." +msgstr "无效主键 '%s' - 对象不存在" + +#: taiga/base/api/relations.py:248 +#, python-format +msgid "Incorrect type. Expected pk value, received %s." +msgstr "错误的类型。期望收到主键， 但是收到了'%s'" + +#: taiga/base/api/relations.py:336 +#, python-format +msgid "Object with %s=%s does not exist." +msgstr "没有满足条件的结果: %s=%s" + +#: taiga/base/api/relations.py:372 +msgid "Invalid hyperlink - No URL match" +msgstr "无效的超链接 - 无匹配的URL地址" + +#: taiga/base/api/relations.py:373 +msgid "Invalid hyperlink - Incorrect URL match" +msgstr "无效的超链接 - 错误的URL匹配" + +#: taiga/base/api/relations.py:374 +msgid "Invalid hyperlink due to configuration error" +msgstr "无效的超链接 - 配置错误" + +#: taiga/base/api/relations.py:375 +msgid "Invalid hyperlink - object does not exist." +msgstr "无效的超链接 - 对象不存在" + +#: taiga/base/api/relations.py:376 +#, python-format +msgid "Incorrect type. Expected url string, received %s." +msgstr "错误的数据类型。期望收到URL， 但是收到了 %s" + +#: taiga/base/api/serializers.py:324 +msgid "Invalid data" +msgstr "无效的数据" + +#: taiga/base/api/serializers.py:416 +msgid "No input provided" +msgstr "没提供输入数据" + +#: taiga/base/api/serializers.py:579 +msgid "Cannot create a new item, only existing items may be updated." +msgstr "不能创建新项目，可能只是现有项目被修改。" + +#: taiga/base/api/serializers.py:590 +msgid "Expected a list of items." +msgstr "期望一个项目列表" + +#: taiga/base/api/views.py:126 +msgid "Not found" +msgstr "找不到" + +#: taiga/base/api/views.py:129 +msgid "Permission denied" +msgstr "无此权限" + +#: taiga/base/api/views.py:477 +msgid "Server application error" +msgstr "服务器端错误" + +#: taiga/base/connectors/exceptions.py:26 +msgid "Connection error." +msgstr "连接错误" + +#: taiga/base/exceptions.py:79 +msgid "Malformed request." +msgstr "错误请求" + +#: taiga/base/exceptions.py:84 +msgid "Incorrect authentication credentials." +msgstr "用户名密码验证错误" + +#: taiga/base/exceptions.py:89 +msgid "Authentication credentials were not provided." +msgstr "密码未提供" + +#: taiga/base/exceptions.py:94 +msgid "You do not have permission to perform this action." +msgstr "你未被授权做此操作" + +#: taiga/base/exceptions.py:99 +#, python-format +msgid "Method '%s' not allowed." +msgstr "不允许用此方法：'%s'" + +#: taiga/base/exceptions.py:107 +msgid "Could not satisfy the request's Accept header" +msgstr "请求的Header头不允许" + +#: taiga/base/exceptions.py:116 +#, python-format +msgid "Unsupported media type '%s' in request." +msgstr "媒体类型'%s'不支持" + +#: taiga/base/exceptions.py:124 +msgid "Request was throttled." +msgstr "请求被限制" + +#: taiga/base/exceptions.py:125 +#, python-format +msgid "Expected available in %d second%s." +msgstr "预期可在%d 秒%s." + +#: taiga/base/exceptions.py:139 +msgid "Unexpected error" +msgstr "异常错误" + +#: taiga/base/exceptions.py:151 +msgid "Not found." +msgstr "未找到" + +#: taiga/base/exceptions.py:156 +msgid "Method not supported for this endpoint." +msgstr "请求方法不支持" + +#: taiga/base/exceptions.py:164 taiga/base/exceptions.py:172 +msgid "Wrong arguments." +msgstr "错误参数" + +#: taiga/base/exceptions.py:176 +msgid "Data validation error" +msgstr "数据验证错误" + +#: taiga/base/exceptions.py:188 +msgid "Integrity Error for wrong or invalid arguments" +msgstr "参数缺失或非法" + +#: taiga/base/exceptions.py:195 +msgid "Precondition error" +msgstr "前提条件错误" + +#: taiga/base/exceptions.py:219 +msgid "No room left for more projects." +msgstr "没空间添加新项目了" + +#: taiga/base/filters.py:81 taiga/base/filters.py:462 +msgid "Error in filter params types." +msgstr "参数类型错误" + +#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/projects/filters.py:64 +msgid "'project' must be an integer value." +msgstr "'project'必须是一个整数值" + +#: taiga/base/templates/emails/base-body-html.jinja:6 +msgid "Taiga" +msgstr "Taiga" + +#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/hero-body-html.jinja:380 +#: taiga/base/templates/emails/updates-body-html.jinja:442 +msgid "Follow us on Twitter" +msgstr "在推特上关注我们" + +#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/hero-body-html.jinja:380 +#: taiga/base/templates/emails/updates-body-html.jinja:442 +msgid "Twitter" +msgstr "Twitter" + +#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/hero-body-html.jinja:381 +#: taiga/base/templates/emails/updates-body-html.jinja:443 +msgid "Get the code on GitHub" +msgstr "从Github上获取代码" + +#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/hero-body-html.jinja:381 +#: taiga/base/templates/emails/updates-body-html.jinja:443 +msgid "GitHub" +msgstr "Github" + +#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/hero-body-html.jinja:382 +#: taiga/base/templates/emails/updates-body-html.jinja:444 +msgid "Visit our website" +msgstr "访问我们的网站" + +#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/hero-body-html.jinja:382 +#: taiga/base/templates/emails/updates-body-html.jinja:444 +msgid "Taiga.io" +msgstr "Taiga.io" + +#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/hero-body-html.jinja:397 +#: taiga/base/templates/emails/updates-body-html.jinja:459 +#, python-format +msgid "" +"\n" +" Taiga Support:\n" +" %(support_url)s\n" +"
    \n" +" Contact us:\n" +" \n" +" %(support_email)s\n" +" \n" +"
    \n" +" Mailing list:\n" +" \n" +" %(mailing_list_url)s\n" +" \n" +" " +msgstr "" +"\n" +" 帮助:\n" +" %(support_url)s\n" +"
    \n" +" 联系我们:\n" +" \n" +" %(support_email)s\n" +" \n" +"
    \n" +" 邮件列表:\n" +" \n" +" %(mailing_list_url)s\n" +" \n" +" " + +#: taiga/base/templates/emails/hero-body-html.jinja:6 +msgid "You have been Taigatized" +msgstr "您已成为Taiga的一员" + +#: taiga/base/templates/emails/hero-body-html.jinja:359 +msgid "" +"\n" +"

    You have been Taigatized!" +"

    \n" +"

    Welcome to Taiga, an Open " +"Source, Agile Project Management Tool

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

    您已经成为Taiga的一员！\n" +"

    欢迎您加入Taiga这个开源" +"的，敏捷项目管理工具大家庭

    \n" +" " + +#: taiga/base/templates/emails/updates-body-html.jinja:6 +msgid "[Taiga] Updates" +msgstr "[Taiga] 更新" + +#: taiga/base/templates/emails/updates-body-html.jinja:417 +msgid "Updates" +msgstr "更新" + +#: taiga/base/templates/emails/updates-body-html.jinja:423 +#, python-format +msgid "" +"\n" +"

    comment:" +"

    \n" +"

    " +"%(comment)s

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

    评论:" +"

    \n" +"

    " +"%(comment)s

    \n" +" " + +#: taiga/base/templates/emails/updates-body-text.jinja:6 +#, python-format +msgid "" +"\n" +" Comment: %(comment)s\n" +" " +msgstr "" +"\n" +" 评论: %(comment)s\n" +" " + +#: taiga/export_import/api.py:127 +msgid "We needed at least one role" +msgstr "我们至少需要1个角色" + +#: taiga/export_import/api.py:323 +msgid "Needed dump file" +msgstr "需要备份文件" + +#: taiga/export_import/api.py:333 +msgid "Invalid dump format" +msgstr "非法的备份文件格式" + +#: taiga/export_import/services/store.py:718 +#: taiga/export_import/services/store.py:736 +msgid "error importing project data" +msgstr "无法导入项目数据" + +#: taiga/export_import/services/store.py:743 +msgid "error importing roles" +msgstr "角色导入错误" + +#: taiga/export_import/services/store.py:748 +msgid "error importing memberships" +msgstr "成员关系导入错误" + +#: taiga/export_import/services/store.py:759 +msgid "error importing lists of project attributes" +msgstr "项目属性列表导入错误" + +#: taiga/export_import/services/store.py:763 +msgid "error importing default project attributes values" +msgstr "默认项目属性值导入错误" + +#: taiga/export_import/services/store.py:774 +msgid "error importing custom attributes" +msgstr "客户化属性导入错误" + +#: taiga/export_import/services/store.py:778 +msgid "error importing sprints" +msgstr "sprints导入错误" + +#: taiga/export_import/services/store.py:782 +msgid "error importing issues" +msgstr "问题导入错误" + +#: taiga/export_import/services/store.py:786 +msgid "error importing user stories" +msgstr "用户故事导入错误" + +#: taiga/export_import/services/store.py:790 +msgid "error importing epics" +msgstr "史诗导入错误" + +#: taiga/export_import/services/store.py:794 +msgid "error importing tasks" +msgstr "任务导入错误" + +#: taiga/export_import/services/store.py:798 +msgid "error importing wiki pages" +msgstr "维基页面导入错误" + +#: taiga/export_import/services/store.py:802 +msgid "error importing wiki links" +msgstr "维基链接导入错误" + +#: taiga/export_import/services/store.py:806 +msgid "error importing tags" +msgstr "标签导入错误" + +#: taiga/export_import/services/store.py:810 +msgid "error importing timelines" +msgstr "时间线导入错误" + +#: taiga/export_import/services/store.py:832 +msgid "unexpected error importing project" +msgstr "导入项目发生未知错误" + +#: taiga/export_import/tasks.py:62 taiga/export_import/tasks.py:63 +msgid "Error generating project dump" +msgstr "生成项目备份文件出错" + +#: taiga/export_import/tasks.py:91 +#, python-brace-format +msgid "" +"\n" +"\n" +"Error loading dump by {user_full_name} <{user_email}>:\"\n" +"\n" +"\n" +"REASON:\n" +"-------\n" +"{reason}\n" +"\n" +"DETAILS:\n" +"--------\n" +"{details}\n" +"\n" +"TRACE ERROR:\n" +"------------" +msgstr "" +"\n" +"\n" +"按名字读取备份错误：{user_full_name} <{user_email}>\n" +"\n" +"原因：\n" +"---------\n" +"{reason}\n" +"\n" +"细节：\n" +"---------\n" +"{details}\n" +"\n" +"错误跟踪：\n" +"---------" + +#: taiga/export_import/tasks.py:120 +msgid "Error loading project dump" +msgstr "读取项目备份错误" + +#: taiga/export_import/tasks.py:121 +msgid "Error loading your project dump file" +msgstr "读取你的项目备份文件错误" + +#: taiga/export_import/tasks.py:135 +msgid " -- no detail info --" +msgstr "-- 无详细信息 --" + +#: taiga/export_import/templates/emails/dump_project-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Project dump generated

    \n" +"

    Hello %(user)s,

    \n" +"

    Your dump from project %(project)s has been correctly generated.\n" +"

    You can download it here:

    \n" +" Download the dump file\n" +"

    This file will be deleted on %(deletion_date)s.

    \n" +"

    The Taiga Team

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

    项目备份

    \n" +"

    您好%(user)s,

    \n" +"

    %(project)s 的备份文件已经生成。

    \n" +"

    您可以从此处下载下载:

    \n" +" 下" +"载备份文件\n" +"

    %(deletion_date)s后备份文件将删除

    \n" +"

    Taiga团队

    \n" +" " + +#: taiga/export_import/templates/emails/dump_project-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your dump from project %(project)s has been correctly generated. You can " +"download it here:\n" +"\n" +"%(url)s\n" +"\n" +"This file will be deleted on %(deletion_date)s.\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"您好%(user)s,\n" +"\n" +"%(project)s的备份文件已经成功生成. 您可以从此处下载:\n" +"\n" +"%(url)s\n" +"\n" +"备份文件将在%(deletion_date)s后删除.\n" +"\n" +"---\n" +"Taiga团队\n" + +#: taiga/export_import/templates/emails/dump_project-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your project dump has been generated" +msgstr "[%(project)s] 您的项目备份文件已经生成" + +#: taiga/export_import/templates/emails/export_error-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    %(error_message)s

    \n" +"

    Hello %(user)s,

    \n" +"

    Your project %(project)s has not been exported correctly.

    \n" +"

    The Taiga system administrators have been informed.
    Please, try " +"it again or contact with the support team at\n" +" %(support_email)s

    \n" +"

    The Taiga Team

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

    %(error_message)s

    \n" +"

    您好%(user)s,

    \n" +"

    %(project)s项目导出失败

    \n" +"

    已经通知系统管理员.
    请重试，或向Taiga支持团队寻求帮助\n" +" %(support_email)s

    \n" +"

    Taiga团队

    \n" +" " + +#: taiga/export_import/templates/emails/export_error-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"%(error_message)s\n" +"Your project %(project)s has not been exported correctly.\n" +"\n" +"The Taiga system administrators have been informed.\n" +"\n" +"Please, try it again or contact with the support team at %(support_email)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"您好%(user)s,\n" +"\n" +"%(error_message)s\n" +"%(project)s项目导出失败.\n" +"\n" +"已经通知系统管理员.\n" +"\n" +"请重试或联系Taiga支持团队%(support_email)s\n" +"\n" +"---\n" +"Taiga团队\n" + +#: taiga/export_import/templates/emails/export_error-subject.jinja:1 +#, python-format +msgid "[%(project)s] %(error_subject)s" +msgstr "[%(project)s] %(error_subject)s" + +#: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    %(error_message)s

    \n" +"

    Hello %(user)s,

    \n" +"

    Your project has not been importer correctly.

    \n" +"

    The Taiga system administrators have been informed.
    Please, try " +"it again or contact with the support team at\n" +" %(support_email)s

    \n" +"

    The Taiga Team

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

    %(error_message)s

    \n" +"

    您好%(user)s,

    \n" +"

    您的项目导出失败。

    \n" +"

    已经通知系统管理员
    请重试，或联系支持团队\n" +" %(support_email)s

    \n" +"

    Taiga团队

    \n" +" " + +#: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"%(error_message)s\n" +"\n" +"Your project has not been importer correctly.\n" +"\n" +"The Taiga system administrators have been informed.\n" +"\n" +"Please, try it again or contact with the support team at %(support_email)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"您好%(user)s,\n" +"\n" +"%(error_message)s\n" +"\n" +"您的项目导出失败。\n" +"\n" +"已经通知系统管理员。\n" +"\n" +"请重试，或联系支持团队%(support_email)s\n" +"\n" +"---\n" +"Taiga团队\n" + +#: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#, python-format +msgid "[Taiga] %(error_subject)s" +msgstr "[Taiga] %(error_subject)s" + +#: taiga/export_import/templates/emails/load_dump-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Project dump imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your project dump has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

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

    项目导出成功

    \n" +"

    您好%(user)s,

    \n" +"

    您的项目备份文件已经成导出

    \n" +" 跳转至%(project)s\n" +"

    Taiga团队

    \n" +" " + +#: taiga/export_import/templates/emails/load_dump-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your project dump has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"您好%(user)s,\n" +"\n" +"您的项目备份文件已经被成功导出。\n" +"\n" +"您可以从下面地址浏览项目%(project)s:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"Taiga团队\n" + +#: taiga/export_import/templates/emails/load_dump-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your project dump has been imported" +msgstr "[%(project)s] 项目备份文件已经被导出" + +#: taiga/export_import/validators/fields.py:144 +msgid "{}=\"{}\" not found in this project" +msgstr "{}=\"{}\" 在这个项目没找到" + +#: taiga/export_import/validators/validators.py:150 +#: taiga/projects/custom_attributes/validators.py:109 +msgid "Invalid content. It must be {\"key\": \"value\",...}" +msgstr "内容非法. 正确格式 {\"key\": \"value\",...}" + +#: taiga/export_import/validators/validators.py:165 +#: taiga/projects/custom_attributes/validators.py:124 +msgid "It contain invalid custom fields." +msgstr "包含非法的自定义栏目" + +#: taiga/export_import/validators/validators.py:245 +#: taiga/projects/validators.py:52 +msgid "Name duplicated for the project" +msgstr "项目名称重复" + +#: taiga/external_apps/api.py:43 taiga/external_apps/api.py:70 +#: taiga/external_apps/api.py:77 +msgid "Authentication required" +msgstr "需要身份认证" + +#: taiga/external_apps/models.py:35 +#: taiga/projects/custom_attributes/models.py:36 +#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 +#: taiga/projects/models.py:512 taiga/projects/models.py:545 +#: taiga/projects/models.py:581 taiga/projects/models.py:603 +#: taiga/projects/models.py:637 taiga/projects/models.py:657 +#: taiga/projects/models.py:677 taiga/projects/models.py:709 +#: taiga/projects/models.py:729 taiga/users/admin.py:54 +#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +msgid "name" +msgstr "名称" + +#: taiga/external_apps/models.py:37 +msgid "Icon url" +msgstr "图标地址" + +#: taiga/external_apps/models.py:38 +msgid "web" +msgstr "网页" + +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/projects/custom_attributes/models.py:37 +#: taiga/projects/epics/models.py:55 +#: taiga/projects/history/templatetags/functions.py:25 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 +#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/userstories/models.py:95 +msgid "description" +msgstr "描述" + +#: taiga/external_apps/models.py:41 +msgid "Next url" +msgstr "下一个URL" + +#: taiga/external_apps/models.py:43 +msgid "secret key for ciphering the application tokens" +msgstr "密钥" + +#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 +#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +msgid "user" +msgstr "用户" + +#: taiga/external_apps/models.py:61 +msgid "application" +msgstr "应用" + +#: taiga/feedback/models.py:25 taiga/users/models.py:137 +msgid "full name" +msgstr "全名" + +#: taiga/feedback/models.py:27 taiga/users/models.py:132 +msgid "email address" +msgstr "邮件地址" + +#: taiga/feedback/models.py:29 +msgid "comment" +msgstr "评论" + +#: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/custom_attributes/models.py:46 +#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 +#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 +#: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 +#: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 +msgid "created date" +msgstr "创建日期" + +#: taiga/feedback/templates/emails/feedback_notification-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Feedback

    \n" +"

    Taiga has received feedback from %(full_name)s <%(email)s>

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

    反馈

    \n" +"

    Taiga收到%(full_name)s <%(email)s>的反馈

    \n" +" " + +#: taiga/feedback/templates/emails/feedback_notification-body-html.jinja:9 +#, python-format +msgid "" +"\n" +"

    Comment

    \n" +"

    %(comment)s

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

    评论

    \n" +"

    %(comment)s

    \n" +" " + +#: taiga/feedback/templates/emails/feedback_notification-body-html.jinja:18 +#: taiga/projects/admin.py:106 taiga/users/admin.py:120 +msgid "Extra info" +msgstr "更多信息" + +#: taiga/feedback/templates/emails/feedback_notification-body-text.jinja:1 +#, python-format +msgid "" +"---------\n" +"- From: %(full_name)s <%(email)s>\n" +"---------\n" +"- Comment:\n" +"%(comment)s\n" +"---------" +msgstr "" +"---------\n" +"- 来自: %(full_name)s <%(email)s>\n" +"---------\n" +"- 评论:\n" +"%(comment)s\n" +"---------" + +#: taiga/feedback/templates/emails/feedback_notification-body-text.jinja:8 +msgid "- Extra info:" +msgstr " - 更多信息：" + +#: taiga/feedback/templates/emails/feedback_notification-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[Taiga] Feedback from %(full_name)s <%(email)s>\n" +msgstr "" +"\n" +"[Taiga] 反馈来自%(full_name)s <%(email)s>\n" + +#: taiga/hooks/api.py:54 +msgid "The payload is not a valid json" +msgstr "内容不是一个合法的JSON" + +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 +#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 +#: taiga/projects/userstories/api.py:273 +msgid "The project doesn't exist" +msgstr "项目不存在" + +#: taiga/hooks/api.py:66 +msgid "Bad signature" +msgstr "签名错误" + +#: taiga/hooks/event_hooks.py:66 +#, python-brace-format +msgid "" +"[@{user_name}]({user_url} \"See @{user_name}'s {platform} profile\") says in " +"[{platform}#{number}]({comment_url} \"Go to comment\"):\n" +"\n" +"\"{comment_message}\"" +msgstr "" +"[@{user_name}]({user_url} \"查看@{user_name}'s {platform} profile\") 来自 " +"[{platform}#{number}]({comment_url} \"跳转至评论\"):\n" +"\n" +"\"{comment_message}\"" + +#: taiga/hooks/event_hooks.py:71 +#, python-brace-format +msgid "" +"Comment From {platform}:\n" +"\n" +"> {comment_message}" +msgstr "" +"评论来自 {platform}:\n" +"\n" +"> {comment_message}" + +#: taiga/hooks/event_hooks.py:84 +msgid "Invalid issue comment information" +msgstr "无效的问题评论信息" + +#: taiga/hooks/event_hooks.py:103 +#, python-brace-format +msgid "" +"Issue created by [@{user_name}]({user_url} \"See @{user_name}'s {platform} " +"profile\") from [{platform}#{number}]({url} \"Go to issue\")." +msgstr "" +"问题创建自 [@{user_name}]({user_url} \"See @{user_name}'s {platform} profile" +"\") from [{platform}#{number}]({url} \"跳转至特性\")." + +#: taiga/hooks/event_hooks.py:107 +#, python-brace-format +msgid "Issue created from {platform}." +msgstr "问题创建自{platform}." + +#: taiga/hooks/event_hooks.py:120 +msgid "Invalid issue information" +msgstr "无效的问题信息" + +#: taiga/hooks/event_hooks.py:149 taiga/hooks/event_hooks.py:171 +msgid "unknown user" +msgstr "未知用户" + +#: taiga/hooks/event_hooks.py:156 +#, python-brace-format +msgid "" +"{user_text} changed the status from [{platform} commit]({commit_url} \"See " +"commit '{commit_id} - {commit_message}'\")\n" +"\n" +" - Status: **{src_status}** → **{dst_status}**" +msgstr "" +"{user_text} 改变状态 [{platform} commit]({commit_url} \"查看提交 " +"'{commit_id} - {commit_message}'\")\n" +"\n" +" - 状态: **{src_status}** → **{dst_status}**" + +#: taiga/hooks/event_hooks.py:161 +#, python-brace-format +msgid "" +"Changed status from {platform} commit.\n" +"\n" +" - Status: **{src_status}** → **{dst_status}**" +msgstr "" +"改变状态，从 {platform} 提交.\n" +"\n" +" - 状态: **{src_status}** → **{dst_status}**" + +#: taiga/hooks/event_hooks.py:179 +#, python-brace-format +msgid "" +"This {type_name} has been mentioned by {user_text} in the [{platform} commit]" +"({commit_url} \"See commit '{commit_id} - {commit_message}'\") " +"\"{commit_message}\"" +msgstr "" +"这个{type_name}已经被{user_text}提到，从这个[{platform} commit]({commit_url} " +"\"查看提交 '{commit_id} - {commit_message}'\") \"{commit_message}\"" + +#: taiga/hooks/event_hooks.py:184 +#, python-brace-format +msgid "" +"This issue has been mentioned in the {platform} commit \"{commit_message}\"" +msgstr "在 {platform} 的提交\"{commit_message}\"中提到这个特性" + +#: taiga/hooks/event_hooks.py:206 +msgid "The referenced element doesn't exist" +msgstr "引用的元素不存在" + +#: taiga/hooks/event_hooks.py:222 +msgid "The status doesn't exist" +msgstr "状态不存在" + +#: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 +msgid "View project" +msgstr "查看项目" + +#: taiga/permissions/choices.py:24 taiga/permissions/choices.py:36 +msgid "View milestones" +msgstr "查看里程碑" + +#: taiga/permissions/choices.py:25 taiga/permissions/choices.py:41 +msgid "View epic" +msgstr "查看史诗" + +#: taiga/permissions/choices.py:26 +msgid "View user stories" +msgstr "查看用户故事" + +#: taiga/permissions/choices.py:27 taiga/permissions/choices.py:53 +msgid "View tasks" +msgstr "查看任务" + +#: taiga/permissions/choices.py:28 taiga/permissions/choices.py:59 +msgid "View issues" +msgstr "查看问题" + +#: taiga/permissions/choices.py:29 taiga/permissions/choices.py:65 +msgid "View wiki pages" +msgstr "查看维基页" + +#: taiga/permissions/choices.py:30 taiga/permissions/choices.py:71 +msgid "View wiki links" +msgstr "查看维基链接" + +#: taiga/permissions/choices.py:37 +msgid "Add milestone" +msgstr "新增里程碑" + +#: taiga/permissions/choices.py:38 +msgid "Modify milestone" +msgstr "修改里程碑" + +#: taiga/permissions/choices.py:39 +msgid "Delete milestone" +msgstr "删除里程碑" + +#: taiga/permissions/choices.py:42 +msgid "Add epic" +msgstr "添加史诗" + +#: taiga/permissions/choices.py:43 +msgid "Modify epic" +msgstr "修改史诗" + +#: taiga/permissions/choices.py:44 +msgid "Comment epic" +msgstr "评论史诗" + +#: taiga/permissions/choices.py:45 +msgid "Delete epic" +msgstr "删除史诗" + +#: taiga/permissions/choices.py:47 +msgid "View user story" +msgstr "查看用户故事" + +#: taiga/permissions/choices.py:48 +msgid "Add user story" +msgstr "新增用户故事" + +#: taiga/permissions/choices.py:49 +msgid "Modify user story" +msgstr "修改用户故事" + +#: taiga/permissions/choices.py:50 +msgid "Comment user story" +msgstr "评论用户故事" + +#: taiga/permissions/choices.py:51 +msgid "Delete user story" +msgstr "删除用户故事" + +#: taiga/permissions/choices.py:54 +msgid "Add task" +msgstr "新增任务" + +#: taiga/permissions/choices.py:55 +msgid "Modify task" +msgstr "修改任务" + +#: taiga/permissions/choices.py:56 +msgid "Comment task" +msgstr "评论任务" + +#: taiga/permissions/choices.py:57 +msgid "Delete task" +msgstr "删除任务" + +#: taiga/permissions/choices.py:60 +msgid "Add issue" +msgstr "新增问题" + +#: taiga/permissions/choices.py:61 +msgid "Modify issue" +msgstr "修改问题" + +#: taiga/permissions/choices.py:62 +msgid "Comment issue" +msgstr "评论问题" + +#: taiga/permissions/choices.py:63 +msgid "Delete issue" +msgstr "删除问题" + +#: taiga/permissions/choices.py:66 +msgid "Add wiki page" +msgstr "新增维基页" + +#: taiga/permissions/choices.py:67 +msgid "Modify wiki page" +msgstr "修改维基页" + +#: taiga/permissions/choices.py:68 +msgid "Comment wiki page" +msgstr "评论维基页" + +#: taiga/permissions/choices.py:69 +msgid "Delete wiki page" +msgstr "删除维基页" + +#: taiga/permissions/choices.py:72 +msgid "Add wiki link" +msgstr "新增维基链接" + +#: taiga/permissions/choices.py:73 +msgid "Modify wiki link" +msgstr "修改维基页" + +#: taiga/permissions/choices.py:74 +msgid "Delete wiki link" +msgstr "删除维基链接" + +#: taiga/permissions/choices.py:78 +msgid "Modify project" +msgstr "修改项目" + +#: taiga/permissions/choices.py:79 +msgid "Delete project" +msgstr "删除项目" + +#: taiga/permissions/choices.py:80 +msgid "Add member" +msgstr "增加新成员" + +#: taiga/permissions/choices.py:81 +msgid "Remove member" +msgstr "删除成员" + +#: taiga/permissions/choices.py:82 +msgid "Admin project values" +msgstr "管理项目" + +#: taiga/permissions/choices.py:83 +msgid "Admin roles" +msgstr "管理角色" + +#: taiga/projects/admin.py:100 +msgid "Privacity" +msgstr "私有" + +#: taiga/projects/admin.py:112 +msgid "Modules" +msgstr "模块" + +#: taiga/projects/admin.py:120 +msgid "Default values" +msgstr "预设值" + +#: taiga/projects/admin.py:126 +msgid "Activity" +msgstr "动态" + +#: taiga/projects/admin.py:131 +msgid "Fans" +msgstr "粉丝" + +#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 +#: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 +#: taiga/users/admin.py:69 taiga/userstorage/models.py:27 +msgid "owner" +msgstr "所有者" + +#: taiga/projects/admin.py:200 +#, python-brace-format +msgid "{count} successfully made public." +msgstr "{count} 成功公开。" + +#: taiga/projects/admin.py:201 +msgid "Make public" +msgstr "公开" + +#: taiga/projects/admin.py:215 +#, python-brace-format +msgid "{count} successfully made private." +msgstr "{count} 成功的私有。" + +#: taiga/projects/admin.py:216 +msgid "Make private" +msgstr "私有" + +#: taiga/projects/admin.py:246 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "删除选中的%(verbose_name_plural)s" + +#: taiga/projects/api.py:150 taiga/users/api.py:237 +msgid "Incomplete arguments" +msgstr "不完整的参数" + +#: taiga/projects/api.py:154 taiga/users/api.py:242 +msgid "Invalid image format" +msgstr "非法的图片格式" + +#: taiga/projects/api.py:215 +msgid "Not valid template name" +msgstr "非法的模板名称" + +#: taiga/projects/api.py:218 +msgid "Not valid template description" +msgstr "无效的模板说明" + +#: taiga/projects/api.py:344 +msgid "Invalid user id" +msgstr "无效用户ID" + +#: taiga/projects/api.py:350 +msgid "The user doesn't exist" +msgstr "用户不存在" + +#: taiga/projects/api.py:354 +msgid "The user must be already a project member" +msgstr "用户必须属于某一个项目" + +#: taiga/projects/api.py:701 +msgid "" +"The project must have an owner and at least one of the users must be an " +"active admin" +msgstr "该项目必须有一个所有者，至少一个用户必须是一个积极的管理员" + +#: taiga/projects/api.py:735 +msgid "You don't have permisions to see that." +msgstr "你无权访问" + +#: taiga/projects/attachments/api.py:54 +msgid "Partial updates are not supported" +msgstr "不支持部分更新" + +#: taiga/projects/attachments/api.py:69 +msgid "Object id issue isn't exists" +msgstr "此问题不存在" + +#: taiga/projects/attachments/api.py:72 +msgid "Project ID not matches between object and project" +msgstr "" + +#: taiga/projects/attachments/models.py:41 +#: taiga/projects/custom_attributes/models.py:43 +#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 +#: taiga/projects/models.py:522 taiga/projects/models.py:559 +#: taiga/projects/models.py:587 taiga/projects/models.py:613 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/notifications/models.py:74 +#: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 +#: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +msgid "project" +msgstr "项目" + +#: taiga/projects/attachments/models.py:43 +msgid "content type" +msgstr "内容类别" + +#: taiga/projects/attachments/models.py:45 +msgid "object id" +msgstr "" + +#: taiga/projects/attachments/models.py:51 +#: taiga/projects/custom_attributes/models.py:48 +#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 +#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 +#: taiga/userstorage/models.py:31 +msgid "modified date" +msgstr "修改日期" + +#: taiga/projects/attachments/models.py:56 +msgid "attached file" +msgstr "附加文件" + +#: taiga/projects/attachments/models.py:58 +msgid "sha1" +msgstr "SHA1" + +#: taiga/projects/attachments/models.py:60 +msgid "is deprecated" +msgstr "已废弃" + +#: taiga/projects/attachments/models.py:62 +#: taiga/projects/custom_attributes/models.py:41 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 +#: taiga/projects/models.py:516 taiga/projects/models.py:549 +#: taiga/projects/models.py:583 taiga/projects/models.py:607 +#: taiga/projects/models.py:639 taiga/projects/models.py:659 +#: taiga/projects/models.py:681 taiga/projects/models.py:711 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +msgid "order" +msgstr "次序" + +#: taiga/projects/choices.py:23 +msgid "AppearIn" +msgstr "AppearIn" + +#: taiga/projects/choices.py:24 +msgid "Jitsi" +msgstr "Jitsi" + +#: taiga/projects/choices.py:25 +msgid "Custom" +msgstr "自定" + +#: taiga/projects/choices.py:26 +msgid "Talky" +msgstr "Talky" + +#: taiga/projects/choices.py:35 +msgid "This project is blocked due to payment failure" +msgstr "这个项目因为交付失败被封锁" + +#: taiga/projects/choices.py:36 +msgid "This project is blocked by admin staff" +msgstr "这个项目被管理员封锁" + +#: taiga/projects/choices.py:37 +msgid "This project is blocked because the owner left" +msgstr "这个因为所有者离开被封锁" + +#: taiga/projects/choices.py:38 +msgid "This project is blocked while it's deleted" +msgstr "这个项目因为删除被封锁" + +#: taiga/projects/custom_attributes/choices.py:28 +msgid "Text" +msgstr "单行文字" + +#: taiga/projects/custom_attributes/choices.py:29 +msgid "Multi-Line Text" +msgstr "多行文字" + +#: taiga/projects/custom_attributes/choices.py:30 +msgid "Date" +msgstr "日期" + +#: taiga/projects/custom_attributes/choices.py:31 +msgid "Url" +msgstr "链接" + +#: taiga/projects/custom_attributes/models.py:40 +#: taiga/projects/issues/models.py:45 +msgid "type" +msgstr "类型" + +#: taiga/projects/custom_attributes/models.py:95 +msgid "values" +msgstr "值" + +#: taiga/projects/custom_attributes/models.py:105 +msgid "epic" +msgstr "史诗" + +#: taiga/projects/custom_attributes/models.py:121 +#: taiga/projects/tasks/models.py:35 taiga/projects/userstories/models.py:38 +msgid "user story" +msgstr "用户故事" + +#: taiga/projects/custom_attributes/models.py:137 +msgid "task" +msgstr "任务" + +#: taiga/projects/custom_attributes/models.py:153 +msgid "issue" +msgstr "问题" + +#: taiga/projects/custom_attributes/validators.py:58 +msgid "Already exists one with the same name." +msgstr "已经存在" + +#: taiga/projects/epics/api.py:92 +msgid "You don't have permissions to set this status to this epic." +msgstr "你无权设置这个史诗的状态" + +#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 +msgid "ref" +msgstr "参照" + +#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 +msgid "status" +msgstr "状态" + +#: taiga/projects/epics/models.py:45 +msgid "epics order" +msgstr "史诗次序" + +#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 +msgid "subject" +msgstr "主题" + +#: taiga/projects/epics/models.py:58 taiga/projects/models.py:520 +#: taiga/projects/models.py:555 taiga/projects/models.py:611 +#: taiga/projects/models.py:641 taiga/projects/models.py:661 +#: taiga/projects/models.py:685 taiga/projects/models.py:713 +#: taiga/users/models.py:139 +msgid "color" +msgstr "颜色" + +#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 +msgid "assigned to" +msgstr "指派给" + +#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +msgid "is client requirement" +msgstr "客户需求" + +#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +msgid "is team requirement" +msgstr "团队需求" + +#: taiga/projects/epics/models.py:69 +msgid "user stories" +msgstr "用户故事" + +#: taiga/projects/epics/validators.py:37 +msgid "There's no epic with that id" +msgstr "指定ID无史诗" + +#: taiga/projects/history/api.py:93 +msgid "comment is required" +msgstr "需要评论" + +#: taiga/projects/history/api.py:96 +msgid "deleted comments can't be edited" +msgstr "删除的评论无法编辑" + +#: taiga/projects/history/api.py:130 +msgid "Comment already deleted" +msgstr "评论已删除" + +#: taiga/projects/history/api.py:151 +msgid "Comment not deleted" +msgstr "评论未删除" + +#: taiga/projects/history/choices.py:31 +msgid "Change" +msgstr "变更" + +#: taiga/projects/history/choices.py:32 +msgid "Create" +msgstr "创建" + +#: taiga/projects/history/choices.py:33 +msgid "Delete" +msgstr "删除" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#, python-format +msgid "%(role)s role points" +msgstr "%(role)s 角色权重" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:194 +msgid "from" +msgstr "来自" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:180 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:200 +msgid "to" +msgstr "至" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +msgid "Added new attachment" +msgstr "添加新的附件" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +msgid "Updated attachment" +msgstr "更新附件" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +msgid "deprecated" +msgstr "已废弃" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +msgid "not deprecated" +msgstr "未废弃" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +msgid "Deleted attachment" +msgstr "删除附件：" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +msgid "added" +msgstr "已加入" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +msgid "removed" +msgstr "移除" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 +msgid "Unassigned" +msgstr "未指派" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:212 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +msgid "-deleted-" +msgstr "-删除-" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +msgid "to:" +msgstr "发送给:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +msgid "from:" +msgstr "来自:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +msgid "Added" +msgstr "已添加" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +msgid "Changed" +msgstr "已变更" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +msgid "Deleted" +msgstr "已删除" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +msgid "added:" +msgstr "已添加:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +msgid "removed:" +msgstr "已移除:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +msgid "From:" +msgstr "来自:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +msgid "To:" +msgstr "发送给:" + +#: taiga/projects/history/templatetags/functions.py:26 +#: taiga/projects/wiki/models.py:38 +msgid "content" +msgstr "内容" + +#: taiga/projects/history/templatetags/functions.py:27 +#: taiga/projects/mixins/blocked.py:33 +msgid "blocked note" +msgstr "封锁的笔记" + +#: taiga/projects/history/templatetags/functions.py:28 +msgid "sprint" +msgstr "冲刺任务" + +#: taiga/projects/issues/api.py:156 +msgid "You don't have permissions to set this sprint to this issue." +msgstr "您没有权限设置此冲刺到这一问题。" + +#: taiga/projects/issues/api.py:160 +msgid "You don't have permissions to set this status to this issue." +msgstr "你无权设置此状态到这个问题。" + +#: taiga/projects/issues/api.py:164 +msgid "You don't have permissions to set this severity to this issue." +msgstr "您没有权限设置此严重程度这一问题。" + +#: taiga/projects/issues/api.py:168 +msgid "You don't have permissions to set this priority to this issue." +msgstr "您没有权限设置此优先级这一问题。" + +#: taiga/projects/issues/api.py:172 +msgid "You don't have permissions to set this type to this issue." +msgstr "您没有权限设置此类型这一问题。" + +#: taiga/projects/issues/models.py:41 +msgid "severity" +msgstr "严重程度" + +#: taiga/projects/issues/models.py:43 +msgid "priority" +msgstr "优先级" + +#: taiga/projects/issues/models.py:48 taiga/projects/tasks/models.py:46 +#: taiga/projects/userstories/models.py:65 +msgid "milestone" +msgstr "里程碑" + +#: taiga/projects/issues/models.py:57 taiga/projects/tasks/models.py:53 +msgid "finished date" +msgstr "完成日期" + +#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 +#: taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "外部引用" + +#: taiga/projects/likes/models.py:36 +msgid "Like" +msgstr "点赞" + +#: taiga/projects/likes/models.py:37 +msgid "Likes" +msgstr "点赞" + +#: taiga/projects/milestones/models.py:41 taiga/projects/models.py:147 +#: taiga/projects/models.py:514 taiga/projects/models.py:547 +#: taiga/projects/models.py:605 taiga/projects/models.py:679 +#: taiga/projects/models.py:731 taiga/projects/wiki/models.py:36 +#: taiga/users/admin.py:58 taiga/users/models.py:294 +msgid "slug" +msgstr "代称" + +#: taiga/projects/milestones/models.py:46 +msgid "estimated start date" +msgstr "预估开始日期" + +#: taiga/projects/milestones/models.py:47 +msgid "estimated finish date" +msgstr "预估结束日期" + +#: taiga/projects/milestones/models.py:54 taiga/projects/models.py:518 +#: taiga/projects/models.py:551 taiga/projects/models.py:609 +#: taiga/projects/models.py:683 +msgid "is closed" +msgstr "是关闭的" + +#: taiga/projects/milestones/models.py:56 +msgid "disponibility" +msgstr "不受约束" + +#: taiga/projects/milestones/models.py:80 +msgid "The estimated start must be previous to the estimated finish." +msgstr "预估的开始日期必须早于完成日期" + +#: taiga/projects/milestones/validators.py:33 +msgid "There's no milestone with that id" +msgstr "此ID无里程碑" + +#: taiga/projects/mixins/blocked.py:31 +msgid "is blocked" +msgstr "封锁" + +#: taiga/projects/mixins/ordering.py:49 +#, python-brace-format +msgid "'{param}' parameter is mandatory" +msgstr "'{param}' 参数必填" + +#: taiga/projects/mixins/ordering.py:53 +msgid "'project' parameter is mandatory" +msgstr "'project' 参数必填" + +#: taiga/projects/models.py:76 +msgid "email" +msgstr "电子邮件" + +#: taiga/projects/models.py:78 +msgid "create at" +msgstr "创建自" + +#: taiga/projects/models.py:80 taiga/users/models.py:154 +msgid "token" +msgstr "令牌" + +#: taiga/projects/models.py:86 +msgid "invitation extra text" +msgstr "需要更多的文本内容" + +#: taiga/projects/models.py:89 taiga/projects/models.py:735 +msgid "user order" +msgstr "用户故事次序" + +#: taiga/projects/models.py:105 +msgid "The user is already member of the project" +msgstr "该用户已经是此项目成员。" + +#: taiga/projects/models.py:112 +msgid "default epic status" +msgstr "默认史诗状态" + +#: taiga/projects/models.py:116 +msgid "default US status" +msgstr "默认用户故事状态" + +#: taiga/projects/models.py:119 +msgid "default points" +msgstr "默认点数" + +#: taiga/projects/models.py:123 +msgid "default task status" +msgstr "默认任务状态" + +#: taiga/projects/models.py:126 +msgid "default priority" +msgstr "默认优先级" + +#: taiga/projects/models.py:129 +msgid "default severity" +msgstr "默认严重程度" + +#: taiga/projects/models.py:133 +msgid "default issue status" +msgstr "默认问题状态" + +#: taiga/projects/models.py:137 +msgid "default issue type" +msgstr "默认问题类别" + +#: taiga/projects/models.py:153 +msgid "logo" +msgstr "标志" + +#: taiga/projects/models.py:163 +msgid "members" +msgstr "成员" + +#: taiga/projects/models.py:166 +msgid "total of milestones" +msgstr "里程碑总数" + +#: taiga/projects/models.py:167 +msgid "total story points" +msgstr "总故事点数" + +#: taiga/projects/models.py:170 taiga/projects/models.py:746 +msgid "active epics panel" +msgstr "活动史诗面板" + +#: taiga/projects/models.py:172 taiga/projects/models.py:748 +msgid "active backlog panel" +msgstr "活动积压面板" + +#: taiga/projects/models.py:174 taiga/projects/models.py:750 +msgid "active kanban panel" +msgstr "活动看板面板" + +#: taiga/projects/models.py:176 taiga/projects/models.py:752 +msgid "active wiki panel" +msgstr "活动维基面板" + +#: taiga/projects/models.py:178 taiga/projects/models.py:754 +msgid "active issues panel" +msgstr "活动问题面板" + +#: taiga/projects/models.py:181 taiga/projects/models.py:757 +msgid "videoconference system" +msgstr "视频会议系统" + +#: taiga/projects/models.py:183 taiga/projects/models.py:759 +msgid "videoconference extra data" +msgstr "视像会议的额外数据" + +#: taiga/projects/models.py:189 +msgid "creation template" +msgstr "创建模板" + +#: taiga/projects/models.py:192 taiga/users/admin.py:62 +msgid "is private" +msgstr "私有的" + +#: taiga/projects/models.py:194 +msgid "anonymous permissions" +msgstr "匿名权限" + +#: taiga/projects/models.py:196 +msgid "user permissions" +msgstr "用户权限" + +#: taiga/projects/models.py:199 +msgid "is featured" +msgstr "被推荐" + +#: taiga/projects/models.py:202 +msgid "is looking for people" +msgstr "招募成员" + +#: taiga/projects/models.py:204 +msgid "loking for people note" +msgstr "" + +#: taiga/projects/models.py:218 +msgid "project transfer token" +msgstr "项目转让令牌" + +#: taiga/projects/models.py:222 +msgid "blocked code" +msgstr "" + +#: taiga/projects/models.py:226 taiga/projects/notifications/models.py:66 +msgid "updated date time" +msgstr "更新的日期时间" + +#: taiga/projects/models.py:229 taiga/projects/models.py:241 +#: taiga/projects/votes/models.py:30 +msgid "count" +msgstr "计数" + +#: taiga/projects/models.py:232 +msgid "fans last week" +msgstr "上周粉丝" + +#: taiga/projects/models.py:235 +msgid "fans last month" +msgstr "上月粉丝" + +#: taiga/projects/models.py:238 +msgid "fans last year" +msgstr "去年粉丝" + +#: taiga/projects/models.py:244 +msgid "activity last week" +msgstr "上周活动" + +#: taiga/projects/models.py:247 +msgid "activity last month" +msgstr "上月活动" + +#: taiga/projects/models.py:250 +msgid "activity last year" +msgstr "去年活动" + +#: taiga/projects/models.py:501 +msgid "modules config" +msgstr "模块配置" + +#: taiga/projects/models.py:553 +msgid "is archived" +msgstr "已归档" + +#: taiga/projects/models.py:557 +msgid "work in progress limit" +msgstr "工作进度限制" + +#: taiga/projects/models.py:585 taiga/userstorage/models.py:33 +msgid "value" +msgstr "值" + +#: taiga/projects/models.py:743 +msgid "default owner's role" +msgstr "默认所有者角色" + +#: taiga/projects/models.py:761 +msgid "default options" +msgstr "默认选项" + +#: taiga/projects/models.py:762 +msgid "epic statuses" +msgstr "史诗状态" + +#: taiga/projects/models.py:763 +msgid "us statuses" +msgstr "用户故事状态" + +#: taiga/projects/models.py:764 taiga/projects/userstories/models.py:44 +#: taiga/projects/userstories/models.py:77 +msgid "points" +msgstr "点数" + +#: taiga/projects/models.py:765 +msgid "task statuses" +msgstr "任务状态" + +#: taiga/projects/models.py:766 +msgid "issue statuses" +msgstr "问题状态" + +#: taiga/projects/models.py:767 +msgid "issue types" +msgstr "问题类型" + +#: taiga/projects/models.py:768 +msgid "priorities" +msgstr "优先级" + +#: taiga/projects/models.py:769 +msgid "severities" +msgstr "严重程度" + +#: taiga/projects/models.py:770 +msgid "roles" +msgstr "角色" + +#: taiga/projects/notifications/choices.py:30 +msgid "Involved" +msgstr "涉入" + +#: taiga/projects/notifications/choices.py:31 +msgid "All" +msgstr "所有" + +#: taiga/projects/notifications/choices.py:32 +msgid "None" +msgstr "无" + +#: taiga/projects/notifications/models.py:64 +msgid "created date time" +msgstr "创建日期时间" + +#: taiga/projects/notifications/models.py:68 +msgid "history entries" +msgstr "历史记录条目" + +#: taiga/projects/notifications/models.py:71 +msgid "notify users" +msgstr "通知用户" + +#: taiga/projects/notifications/models.py:93 +#: taiga/projects/notifications/models.py:94 +msgid "Watched" +msgstr "关注" + +#: taiga/projects/notifications/services.py:65 +#: taiga/projects/notifications/services.py:79 +msgid "Notify exists for specified user and project" +msgstr "通知已存在" + +#: taiga/projects/notifications/services.py:426 +msgid "Invalid value for notify level" +msgstr "此通知级别该值非法" + +#: taiga/projects/notifications/templates/emails/epics/epic-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Epic updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a epic on %(project)s\n" +"

    Epic #%(ref)s %(subject)s

    \n" +" See epic\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Epic updated\n" +"Hello %(user)s, %(changer)s has updated a epic on %(project)s\n" +"See epic #%(ref)s %(subject)s at %(url)s\n" +msgstr "" +"\n" +"史诗更新\n" +"您好，%(user)s, %(changer)s 更新了%(project)s项目的史诗\n" +"查看史诗#%(ref)s %(subject)s 从 %(url)s\n" + +#: taiga/projects/notifications/templates/emails/epics/epic-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the epic #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 更新史诗 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/epics/epic-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New epic created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new epic on " +"%(project)s

    \n" +"

    Epic #%(ref)s %(subject)s

    \n" +" See epic\n" +"

    The Taiga Team

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

    新史诗创建

    \n" +"

    Hello %(user)s,
    %(changer)s 创建了一个史诗在 %(project)s

    \n" +"

    史诗 #%(ref)s %(subject)s

    \n" +" 查看史诗\n" +"

    Taiga团队

    \n" +" " + +#: taiga/projects/notifications/templates/emails/epics/epic-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New epic created\n" +"Hello %(user)s, %(changer)s has created a new epic on %(project)s\n" +"See epic #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the epic #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 创建史诗#%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/epics/epic-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Epic deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a epic on %(project)s\n" +"

    Epic #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Epic deleted\n" +"Hello %(user)s, %(changer)s has deleted a epic on %(project)s\n" +"Epic #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/epics/epic-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the epic #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 删除史诗 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Issue updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated an issue on %(project)s\n" +"

    Issue #%(ref)s %(subject)s

    \n" +" See issue\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Issue updated\n" +"Hello %(user)s, %(changer)s has updated an issue on %(project)s\n" +"See issue #%(ref)s %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 更新问题 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New issue created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new issue on " +"%(project)s

    \n" +"

    Issue #%(ref)s %(subject)s

    \n" +" See issue\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New issue created\n" +"Hello %(user)s, %(changer)s has created a new issue on %(project)s\n" +"See issue #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 新增问题 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Issue deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted an issue on %(project)s\n" +"

    Issue #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Issue deleted\n" +"Hello %(user)s, %(changer)s has deleted an issue on %(project)s\n" +"Issue #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 更新问题 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Sprint updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated an sprint on " +"%(project)s

    \n" +"

    Sprint %(name)s

    \n" +" See sprint\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Sprint updated\n" +"Hello %(user)s, %(changer)s has updated a sprint on %(project)s\n" +"See sprint %(name)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the sprint \"%(milestone)s\"\n" +msgstr "" +"\n" +"[%(project)s] 更新冲刺任务 \"%(milestone)s\"\n" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New sprint created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new sprint on " +"%(project)s

    \n" +"

    Sprint %(name)s

    \n" +" See " +"sprint\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New sprint created\n" +"Hello %(user)s, %(changer)s has created a new sprint on %(project)s\n" +"See sprint %(name)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the sprint \"%(milestone)s\"\n" +msgstr "" +"\n" +"[%(project)s] 新增冲刺任务\"%(milestone)s\"\n" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Sprint deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted an sprint on " +"%(project)s

    \n" +"

    Sprint %(name)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Sprint deleted\n" +"Hello %(user)s, %(changer)s has deleted an sprint on %(project)s\n" +"Sprint %(name)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the Sprint \"%(milestone)s\"\n" +msgstr "" +"\n" +"[%(project)s] 删除冲刺任务 \"%(milestone)s\"\n" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Task updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a task on %(project)s\n" +"

    Task #%(ref)s %(subject)s

    \n" +" See task\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Task updated\n" +"Hello %(user)s, %(changer)s has updated a task on %(project)s\n" +"See task #%(ref)s %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the task #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 更新任务 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New task created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new task on " +"%(project)s

    \n" +"

    Task #%(ref)s %(subject)s

    \n" +" See task\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New task created\n" +"Hello %(user)s, %(changer)s has created a new task on %(project)s\n" +"See task #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the task #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 新增任务 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Task deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a task on %(project)s\n" +"

    Task #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Task deleted\n" +"Hello %(user)s, %(changer)s has deleted a task on %(project)s\n" +"Task #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the task #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 删除任务 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    User Story updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a user story on " +"%(project)s

    \n" +"

    User Story #%(ref)s %(subject)s

    \n" +" See user story\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"User story updated\n" +"Hello %(user)s, %(changer)s has updated a user story on %(project)s\n" +"See user story #%(ref)s %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the US #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 更新用户故事 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New user story created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new user story on " +"%(project)s

    \n" +"

    User Story #%(ref)s %(subject)s

    \n" +" See user story\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New user story created\n" +"Hello %(user)s, %(changer)s has created a new user story on %(project)s\n" +"See user story #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the US #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 新增用户故事 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    User Story deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a user story on " +"%(project)s

    \n" +"

    User Story #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"User Story deleted\n" +"Hello %(user)s, %(changer)s has deleted a user story on %(project)s\n" +"User Story #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the US #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] 删除用户故事 #%(ref)s \"%(subject)s\"\n" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Wiki Page updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a wiki page on " +"%(project)s

    \n" +"

    Wiki page %(page)s

    \n" +" See Wiki Page\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Wiki Page updated\n" +"\n" +"Hello %(user)s, %(changer)s has updated a wiki page on %(project)s\n" +"\n" +"See wiki page %(page)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the Wiki Page \"%(page)s\"\n" +msgstr "" +"\n" +"[%(project)s] 更新维基页 \"%(page)s\"\n" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New wiki page created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new wiki page on " +"%(project)s

    \n" +"

    Wiki page %(page)s

    \n" +" See " +"wiki page\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New wiki page created\n" +"\n" +"Hello %(user)s, %(changer)s has created a new wiki page on %(project)s\n" +"\n" +"See wiki page %(page)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the Wiki Page \"%(page)s\"\n" +msgstr "" +"\n" +"[%(project)s] 创建维基页 \"%(page)s\"\n" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Wiki page deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a wiki page on " +"%(project)s

    \n" +"

    Wiki page %(page)s

    \n" +"

    The Taiga Team

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

    维基页删除

    \n" +"

    您好，%(user)s,
    %(changer)s 删除了%(project)s项目的维基页

    \n" +"

    维基页 %(page)s

    \n" +"

    Taiga团队

    \n" +" " + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Wiki page deleted\n" +"\n" +"Hello %(user)s, %(changer)s has deleted a wiki page on %(project)s\n" +"\n" +"Wiki page %(page)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"维基页删除\n" +"\n" +"您好 %(user)s, %(changer)s 删除了%(project)s项目的维基页 \n" +"\n" +"维基页%(page)s\n" +"\n" +"---\n" +"Taiga团队\n" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the Wiki Page \"%(page)s\"\n" +msgstr "" +"\n" +"[%(project)s] 删除维基页 \"%(page)s\"\n" + +#: taiga/projects/notifications/validators.py:48 +msgid "Watchers contains invalid users" +msgstr "观察者保护无效用户" + +#: taiga/projects/occ/mixins.py:37 +msgid "The version must be an integer" +msgstr "版本号必须是个整数值" + +#: taiga/projects/occ/mixins.py:60 +msgid "The version parameter is not valid" +msgstr "版本号参数无效" + +#: taiga/projects/occ/mixins.py:76 +msgid "The version doesn't match with the current one" +msgstr "版本号与当前版本不匹配" + +#: taiga/projects/occ/mixins.py:95 +msgid "version" +msgstr "版本" + +#: taiga/projects/permissions.py:44 +msgid "" +"You can't leave the project if you are the owner or there are no more admins" +msgstr "因没有其他项目管理者，项目所有者不能离开项目" + +#: taiga/projects/services/members.py:118 +msgid "Project without owner" +msgstr "项目没有所有者" + +#: taiga/projects/services/members.py:123 +msgid "You have reached your current limit of memberships for private projects" +msgstr "你已经达到了私有项目的最大成员数目" + +#: taiga/projects/services/members.py:127 +msgid "You have reached your current limit of memberships for public projects" +msgstr "你已经达到了公开项目的最大成员数目" + +#: taiga/projects/services/projects.py:94 +#: taiga/projects/services/projects.py:134 taiga/users/services.py:589 +msgid "You can't have more private projects" +msgstr "你拥有的私有项目已到上限" + +#: taiga/projects/services/projects.py:98 +#: taiga/projects/services/projects.py:138 taiga/users/services.py:592 +msgid "" +"This project reaches your current limit of memberships for private projects" +msgstr "该项目已达到你设置的私有项目最大成员数" + +#: taiga/projects/services/projects.py:102 +#: taiga/projects/services/projects.py:142 taiga/users/services.py:596 +msgid "You can't have more public projects" +msgstr "你拥有的公开项目已到上限" + +#: taiga/projects/services/projects.py:106 +#: taiga/projects/services/projects.py:146 taiga/users/services.py:599 +msgid "" +"This project reaches your current limit of memberships for public projects" +msgstr "该项目已达到你设置的公开项目最大成员数" + +#: taiga/projects/services/stats.py:197 +msgid "Future sprint" +msgstr "未来的冲刺任务" + +#: taiga/projects/services/stats.py:217 +msgid "Project End" +msgstr "项目结束" + +#: taiga/projects/services/transfer.py:62 +#: taiga/projects/services/transfer.py:69 +#: taiga/projects/services/transfer.py:72 taiga/users/api.py:186 +#: taiga/users/api.py:191 +msgid "Token is invalid" +msgstr "令牌无效" + +#: taiga/projects/services/transfer.py:67 +msgid "Token has expired" +msgstr "令牌已经过期" + +#: taiga/projects/tagging/fields.py:52 +#, python-brace-format +msgid "Invalid tag '{value}'. The color is not a valid HEX color or null." +msgstr "无效标签 '{value}'，该颜色不是一个合法的HEX颜色。" + +#: taiga/projects/tagging/fields.py:55 +#, python-brace-format +msgid "" +"Invalid tag '{value}'. it must be the name or a pair '[\"name\", \"hex color/" +"\" | null]'." +msgstr "" +"无效标签 '{value}'. 它必须是或部分是 '[\"name\", \"hex color/\" | null]'。" + +#: taiga/projects/tagging/fields.py:77 +#, python-brace-format +msgid "Invalid tag '{value}'. It must be the tag name." +msgstr "无效标签'{value}'. 它必须为标签名称。" + +#: taiga/projects/tagging/models.py:27 +msgid "tags" +msgstr "标签" + +#: taiga/projects/tagging/models.py:35 +msgid "tags colors" +msgstr "标签颜色" + +#: taiga/projects/tagging/validators.py:47 +#: taiga/projects/tagging/validators.py:74 +msgid "This tag already exists." +msgstr "该标签已存在" + +#: taiga/projects/tagging/validators.py:54 +#: taiga/projects/tagging/validators.py:81 +msgid "The color is not a valid HEX color." +msgstr "该颜色不是一个合法的HEX颜色" + +#: taiga/projects/tagging/validators.py:67 +#: taiga/projects/tagging/validators.py:101 +#: taiga/projects/tagging/validators.py:114 +#: taiga/projects/tagging/validators.py:121 +msgid "The tag doesn't exist." +msgstr "该标签不存在" + +#: taiga/projects/tasks/api.py:97 taiga/projects/tasks/api.py:106 +msgid "You don't have permissions to set this sprint to this task." +msgstr "你无权对这个任务设置该冲刺任务。" + +#: taiga/projects/tasks/api.py:100 +msgid "You don't have permissions to set this user story to this task." +msgstr "你无权对这个任务设置该用户故事。" + +#: taiga/projects/tasks/api.py:103 +msgid "You don't have permissions to set this status to this task." +msgstr "你无权对这个任务设置该状态。" + +#: taiga/projects/tasks/models.py:58 +msgid "us order" +msgstr "用户故事次序" + +#: taiga/projects/tasks/models.py:60 +msgid "taskboard order" +msgstr "任务板次序" + +#: taiga/projects/tasks/models.py:68 +msgid "is iocaine" +msgstr "负予全新任务" + +#: taiga/projects/tasks/validators.py:59 +msgid "Invalid milestone id." +msgstr "无效的里程碑ID" + +#: taiga/projects/tasks/validators.py:70 +msgid "Invalid task status id." +msgstr "无效的任务状态ID" + +#: taiga/projects/tasks/validators.py:83 +msgid "Invalid user story id." +msgstr "无效的用户故事ID" + +#: taiga/projects/tasks/validators.py:107 +msgid "Invalid task status id. The status must belong to the same project." +msgstr "任务状态ID无效，该状态必须属于同一项目。" + +#: taiga/projects/tasks/validators.py:121 +msgid "Invalid user story id. The user story must belong to the same project." +msgstr "用户故事ID无效，该用户故事必须属于同一项目。" + +#: taiga/projects/tasks/validators.py:133 +msgid "Invalid milestone id. The milestone must belong to the same project." +msgstr "里程碑ID无效，该里程碑必须属于同一项目" + +#: taiga/projects/tasks/validators.py:150 +msgid "" +"Invalid task ids. All tasks must belong to the same project and, if it " +"exists, to the same status, user story and/or milestone." +msgstr "任务ID无效，所有任务必须属于同一项目。" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:6 +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:4 +msgid "someone" +msgstr "某人" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:11 +#, python-format +msgid "" +"\n" +"

    You have been invited to Taiga!

    \n" +"

    Hi! %(full_name)s has sent you an invitation to join project " +"%(project)s in Taiga.
    Taiga is a Free, open Source Agile Project " +"Management Tool.

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

    您被邀请加入Taiga

    \n" +"

    您好! %(full_name)s 邀请您加入%(project)s 项目。
    Taiga is a " +"Free, open Source Agile Project Management Tool.

    \n" +" " + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:17 +#, python-format +msgid "" +"\n" +"

    And now a few words from the jolly good fellow or sistren
    " +"who thought so kindly as to invite you

    \n" +"

    %(extra)s

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

    And now a few words from the jolly good fellow or sistren
    " +"who thought so kindly as to invite you

    \n" +"

    %(extra)s

    \n" +" " + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:24 +msgid "Accept your invitation to Taiga" +msgstr "接受加入Taiga的邀请" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:24 +msgid "Accept your invitation" +msgstr "接受你的邀请" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:25 +msgid "The Taiga Team" +msgstr "Taiga团队" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:6 +#, python-format +msgid "" +"\n" +"You, or someone you know, has invited you to Taiga\n" +"\n" +"Hi! %(full_name)s has sent you an invitation to join a project called " +"%(project)s which is being managed on Taiga, a Free, open Source Agile " +"Project Management Tool.\n" +msgstr "" +"\n" +"You, or someone you know, has invited you to Taiga\n" +"\n" +"Hi! %(full_name)s has sent you an invitation to join a project called " +"%(project)s which is being managed on Taiga, a Free, open Source Agile " +"Project Management Tool.\n" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:12 +#, python-format +msgid "" +"\n" +"And now a few words from the jolly good fellow or sistren who thought so " +"kindly as to invite you:\n" +"\n" +"%(extra)s\n" +" " +msgstr "" +"\n" +"And now a few words from the jolly good fellow or sistren who thought so " +"kindly as to invite you:\n" +"\n" +"%(extra)s\n" +" " + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:18 +msgid "Accept your invitation to Taiga following this link:" +msgstr "接受加入Taiga邀请，从此链接:" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:20 +msgid "" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"---\n" +"Taiga团队\n" + +#: taiga/projects/templates/emails/membership_invitation-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[Taiga] Invitation to join to the project '%(project)s'\n" +msgstr "" +"\n" +"[Taiga] 邀请您加入项目 '%(project)s'\n" + +#: taiga/projects/templates/emails/membership_notification-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    You have been added to a project

    \n" +"

    Hello %(full_name)s,
    you have been added to the project " +"%(project)s

    \n" +" Go to " +"project\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/projects/templates/emails/membership_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"You have been added to a project\n" +"Hello %(full_name)s,you have been added to the project %(project)s\n" +"\n" +"See project at %(url)s\n" +msgstr "" +"\n" +"您已经加入项目\n" +"您好%(full_name)s，你已经加入%(project)s项目\n" +"\n" +"查看项目 %(url)s\n" + +#: taiga/projects/templates/emails/membership_notification-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[Taiga] Added to the project '%(project)s'\n" +msgstr "" +"\n" +"[Taiga] 新增项目'%(project)s'\n" + +#: taiga/projects/templates/emails/transfer_accept-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(old_owner_name)s,

    \n" +"

    %(new_owner_name)s has accepted your offer and will become the " +"new project owner for \"%(project_name)s\".

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

    您好%(old_owner_name)s,

    \n" +"

    %(new_owner_name)s已经接受您的请求，将成为 \"%(project_name)s\"项" +"目的所有者。

    \n" +" " + +#: taiga/projects/templates/emails/transfer_accept-body-html.jinja:10 +#, python-format +msgid "

    %(new_owner_name)s says:

    " +msgstr "

    %(new_owner_name)s 说:

    " + +#: taiga/projects/templates/emails/transfer_accept-body-html.jinja:14 +msgid "" +"\n" +"

    From now on, your new status for this project will be \"admin\".\n" +" " +msgstr "" +"\n" +"

    从现在开始, 你将成为该项目的\"admin\"。

    \n" +" " + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(old_owner_name)s,\n" +"%(new_owner_name)s has accepted your offer and will become the new project " +"owner for \"%(project_name)s\".\n" +msgstr "" +"\n" +"您好 %(old_owner_name)s,\n" +"%(new_owner_name)s 已经接受您的转让请求，将会成为\"%(project_name)s\"项目的所" +"有者。\n" + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:7 +#, python-format +msgid "%(new_owner_name)s says:" +msgstr "%(new_owner_name)s 说:" + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:11 +msgid "" +"\n" +"From now on, your new status for this project will be \"admin\".\n" +msgstr "" +"\n" +"从现在开始, 你将成为该项目的\"admin\"。\n" + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:16 +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:19 +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:13 +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:18 +msgid "" +"\n" +"The Taiga Team\n" +msgstr "" +"\n" +"Taiga团队\n" + +#: taiga/projects/templates/emails/transfer_accept-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer offer accepted!\n" +msgstr "" +"\n" +"[%(project)s] 项目所有权转让请求被接受！\n" + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(owner_name)s,

    \n" +"

    %(rejecter_name)s has declined your offer and will not become the " +"new project owner for \"%(project_name)s\".

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

    您好，%(owner_name)s,

    \n" +"

    %(rejecter_name)s 已经拒绝了你的请求，不会接受\"%(project_name)s" +"\"项目的所有权。

    \n" +" " + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:10 +#, python-format +msgid "" +"\n" +"

    %(rejecter_name)s says:

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

    %(rejecter_name)s 说:

    \n" +" " + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:16 +msgid "" +"\n" +"

    If you want, you can still try to transfer the project ownership to a " +"different person.

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

    如果你想, 你可以继续尝试将所有权转让给其他人。

    \n" +" " + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:21 +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:22 +msgid "Request transfer to a different person" +msgstr "请求转让给其他人" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(owner_name)s,\n" +"%(rejecter_name)s has declined your offer and will not become the new " +"project owner for \"%(project_name)s\".\n" +msgstr "" +"\n" +"您好 %(owner_name)s,\n" +"%(rejecter_name)s 已经拒绝将\"%(project_name)s\"项目的所有权，转让给你。\n" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:7 +#, python-format +msgid "%(rejecter_name)s says:" +msgstr "%(rejecter_name)s 说:" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:11 +msgid "" +"\n" +"If you want, you can still try to transfer the project ownership to a " +"different person.\n" +msgstr "" +"\n" +"如果你想, 你可以继续尝试将所有权转让给其他人。\n" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:15 +msgid "Request transfer to a different person:" +msgstr "请求转让给其他人:" + +#: taiga/projects/templates/emails/transfer_reject-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer declined\n" +msgstr "" +"\n" +"[%(project)s] 拒绝项目所有权转让\n" + +#: taiga/projects/templates/emails/transfer_request-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(owner_name)s,

    \n" +"

    %(requester_name)s has requested to become the project owner for " +"\"%(project_name)s\".

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

    您好%(owner_name)s,

    \n" +"

    %(requester_name)s 请求成为\"%(project_name)s\"项目的所有者。\n" +" " + +#: taiga/projects/templates/emails/transfer_request-body-html.jinja:9 +msgid "" +"\n" +"

    Please, click on \"Continue\" if you would like to start the " +"project transfer from the administration panel.

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

    如果你想转让项目所有权，请点击 \"Continue\" 继续。

    \n" +" " + +#: taiga/projects/templates/emails/transfer_request-body-html.jinja:14 +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:22 +msgid "Continue" +msgstr "继续" + +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(owner_name)s,\n" +"%(requester_name)s has requested to become the project owner for " +"\"%(project_name)s\".\n" +msgstr "" +"\n" +"您好 %(owner_name)s,\n" +"%(requester_name)s 已经请求成为\"%(project_name)s\"项目的所有者.\n" + +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:6 +msgid "" +"\n" +"Please, go to your project settings if you would like to start the project " +"transfer from the administration panel.\n" +msgstr "" +"\n" +"如果想从控制面板转让项目所有权，请跳转到项目设置。\n" + +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:10 +msgid "Go to your project settings:" +msgstr "跳转至项目设置:" + +#: taiga/projects/templates/emails/transfer_request-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer request\n" +msgstr "" +"\n" +"[%(project)s] 项目所有权转让请求\n" + +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(receiver_name)s,

    \n" +"

    %(owner_name)s, the current project owner at \"%(project_name)s\" " +"would like you to become the new project owner.

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

    您好 %(receiver_name)s,

    \n" +"

    %(owner_name)s, 拥有 \"%(project_name)s的所有权，\" 希望将该所有权" +"转让给您.

    \n" +" " + +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:10 +#, python-format +msgid "" +"\n" +"

    %(owner_name)s says:

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

    %(owner_name)s 说:

    \n" +" " + +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:17 +msgid "" +"\n" +"

    Please, click on \"Continue\" to either accept or reject this " +"proposal.

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

    请点击 \"Continue\" 继续，或其他拒绝.

    \n" +" " + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(receiver_name)s,\n" +"%(owner_name)s, the current project owner at \"%(project_name)s\" would like " +"you to become the new project owner.\n" +msgstr "" +"\n" +"您好 %(receiver_name)s,\n" +"%(owner_name)s, 项目\"%(project_name)s\" 的所有者想将项目所有权转让给您。\n" + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:6 +#, python-format +msgid "%(owner_name)s says:" +msgstr "%(owner_name)s 说:" + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:11 +msgid "" +"\n" +"Please, go to the following link to either accept or reject this proposal.\n" +msgstr "" +"\n" +"请访问下面的链接接受或拒绝该建议。

    \n" + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:15 +msgid "Accept or reject the project ownership transfer:" +msgstr "接受或拒绝该项目所有权的转让:" + +#: taiga/projects/templates/emails/transfer_start-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer offer\n" +msgstr "" +"\n" +"[%(project)s] 项目所有权转让请求\n" + +#. Translators: Name of scrum project template. +#: taiga/projects/translations.py:30 +msgid "Scrum" +msgstr "冲刺" + +#. Translators: Description of scrum project template. +#: taiga/projects/translations.py:32 +msgid "" +"The agile product backlog in Scrum is a prioritized features list, " +"containing short descriptions of all functionality desired in the product. " +"When applying Scrum, it's not necessary to start a project with a lengthy, " +"upfront effort to document all requirements. The Scrum product backlog is " +"then allowed to grow and change as more is learned about the product and its " +"customers" +msgstr "" +"The agile product backlog in Scrum is a prioritized features list, " +"containing short descriptions of all functionality desired in the product. " +"When applying Scrum, it's not necessary to start a project with a lengthy, " +"upfront effort to document all requirements. The Scrum product backlog is " +"then allowed to grow and change as more is learned about the product and its " +"customers" + +#. Translators: Name of kanban project template. +#: taiga/projects/translations.py:35 +msgid "Kanban" +msgstr "看板" + +#. Translators: Description of kanban project template. +#: taiga/projects/translations.py:37 +msgid "" +"Kanban is a method for managing knowledge work with an emphasis on just-in-" +"time delivery while not overloading the team members. In this approach, the " +"process, from definition of a task to its delivery to the customer, is " +"displayed for participants to see and team members pull work from a queue." +msgstr "" +"Kanban is a method for managing knowledge work with an emphasis on just-in-" +"time delivery while not overloading the team members. In this approach, the " +"process, from definition of a task to its delivery to the customer, is " +"displayed for participants to see and team members pull work from a queue." + +#. Translators: User story point value (value = undefined) +#: taiga/projects/translations.py:45 +msgid "?" +msgstr "?" + +#. Translators: User story point value (value = 0) +#: taiga/projects/translations.py:47 +msgid "0" +msgstr "0" + +#. Translators: User story point value (value = 0.5) +#: taiga/projects/translations.py:49 +msgid "1/2" +msgstr "1/2" + +#. Translators: User story point value (value = 1) +#: taiga/projects/translations.py:51 +msgid "1" +msgstr "1" + +#. Translators: User story point value (value = 2) +#: taiga/projects/translations.py:53 +msgid "2" +msgstr "2" + +#. Translators: User story point value (value = 3) +#: taiga/projects/translations.py:55 +msgid "3" +msgstr "3" + +#. Translators: User story point value (value = 5) +#: taiga/projects/translations.py:57 +msgid "5" +msgstr "5" + +#. Translators: User story point value (value = 8) +#: taiga/projects/translations.py:59 +msgid "8" +msgstr "8" + +#. Translators: User story point value (value = 10) +#: taiga/projects/translations.py:61 +msgid "10" +msgstr "10" + +#. Translators: User story point value (value = 13) +#: taiga/projects/translations.py:63 +msgid "13" +msgstr "13" + +#. Translators: User story point value (value = 20) +#: taiga/projects/translations.py:65 +msgid "20" +msgstr "20" + +#. Translators: User story point value (value = 40) +#: taiga/projects/translations.py:67 +msgid "40" +msgstr "40" + +#. Translators: User story status +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:75 taiga/projects/translations.py:98 +#: taiga/projects/translations.py:114 +msgid "New" +msgstr "新建" + +#. Translators: User story status +#: taiga/projects/translations.py:78 +msgid "Ready" +msgstr "准备好" + +#. Translators: User story status +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:81 taiga/projects/translations.py:100 +#: taiga/projects/translations.py:116 +msgid "In progress" +msgstr "进行中" + +#. Translators: User story status +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:84 taiga/projects/translations.py:102 +#: taiga/projects/translations.py:118 +msgid "Ready for test" +msgstr "待测试" + +#. Translators: User story status +#: taiga/projects/translations.py:87 +msgid "Done" +msgstr "完成" + +#. Translators: User story status +#: taiga/projects/translations.py:90 +msgid "Archived" +msgstr "归档" + +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:104 taiga/projects/translations.py:120 +msgid "Closed" +msgstr "已关闭" + +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:106 taiga/projects/translations.py:122 +msgid "Needs Info" +msgstr "需要更多信息" + +#. Translators: Issue status +#: taiga/projects/translations.py:124 +msgid "Postponed" +msgstr "推迟" + +#. Translators: Issue status +#: taiga/projects/translations.py:126 +msgid "Rejected" +msgstr "拒绝" + +#. Translators: Issue type +#: taiga/projects/translations.py:134 +msgid "Bug" +msgstr "缺陷" + +#. Translators: Issue type +#: taiga/projects/translations.py:136 +msgid "Question" +msgstr "疑问" + +#. Translators: Issue type +#: taiga/projects/translations.py:138 +msgid "Enhancement" +msgstr "增强" + +#. Translators: Issue priority +#: taiga/projects/translations.py:146 +msgid "Low" +msgstr "低" + +#. Translators: Issue priority +#. Translators: Issue severity +#: taiga/projects/translations.py:148 taiga/projects/translations.py:161 +msgid "Normal" +msgstr "中" + +#. Translators: Issue priority +#: taiga/projects/translations.py:150 +msgid "High" +msgstr "高" + +#. Translators: Issue severity +#: taiga/projects/translations.py:157 +msgid "Wishlist" +msgstr "收藏" + +#. Translators: Issue severity +#: taiga/projects/translations.py:159 +msgid "Minor" +msgstr "次要" + +#. Translators: Issue severity +#: taiga/projects/translations.py:163 +msgid "Important" +msgstr "重要" + +#. Translators: Issue severity +#: taiga/projects/translations.py:165 +msgid "Critical" +msgstr "关键" + +#. Translators: User role +#: taiga/projects/translations.py:172 +msgid "UX" +msgstr "用户体验" + +#. Translators: User role +#: taiga/projects/translations.py:174 +msgid "Design" +msgstr "设计" + +#. Translators: User role +#: taiga/projects/translations.py:176 +msgid "Front" +msgstr "字体" + +#. Translators: User role +#: taiga/projects/translations.py:178 +msgid "Back" +msgstr "后退" + +#. Translators: User role +#: taiga/projects/translations.py:180 +msgid "Product Owner" +msgstr "产品所有者" + +#. Translators: User role +#: taiga/projects/translations.py:182 +msgid "Stakeholder" +msgstr "相关人员" + +#: taiga/projects/userstories/api.py:124 +msgid "You don't have permissions to set this sprint to this user story." +msgstr "你无权对这个用户故事设置此冲刺任务。" + +#: taiga/projects/userstories/api.py:128 +msgid "You don't have permissions to set this status to this user story." +msgstr "你无权对这个用户故事设置此状态。" + +#: taiga/projects/userstories/api.py:218 +#, python-brace-format +msgid "Invalid role id '{role_id}'" +msgstr "无效的角色ID '{role_id}'" + +#: taiga/projects/userstories/api.py:225 +#, python-brace-format +msgid "Invalid points id '{points_id}'" +msgstr "无效的点数ID '{points_id}'" + +#: taiga/projects/userstories/api.py:240 +#, python-brace-format +msgid "Generating the user story #{ref} - {subject}" +msgstr "生成用户故事#{ref} - {subject}" + +#: taiga/projects/userstories/api.py:301 +msgid "ref param is needed" +msgstr "ref 参数必需" + +#: taiga/projects/userstories/api.py:304 +msgid "project or project_slug param is needed" +msgstr "project 或project_slug 参数必需" + +#: taiga/projects/userstories/models.py:41 +msgid "role" +msgstr "角色" + +#: taiga/projects/userstories/models.py:80 +msgid "backlog order" +msgstr "待办任务先后次序" + +#: taiga/projects/userstories/models.py:82 +msgid "sprint order" +msgstr "冲刺任务次序" + +#: taiga/projects/userstories/models.py:84 +msgid "kanban order" +msgstr "看板次序" + +#: taiga/projects/userstories/models.py:92 +msgid "finish date" +msgstr "完成日期" + +#: taiga/projects/userstories/models.py:107 +msgid "generated from issue" +msgstr "从问题派生" + +#: taiga/projects/userstories/validators.py:43 +msgid "There's no user story with that id" +msgstr "该ID无用户故事" + +#: taiga/projects/userstories/validators.py:82 +#: taiga/projects/userstories/validators.py:108 +msgid "" +"Invalid user story status id. The status must belong to the same project." +msgstr "用户故事ID无效，所有用户故事必须属于同一项目" + +#: taiga/projects/userstories/validators.py:120 +msgid "Invalid milestone id. The milistone must belong to the same project." +msgstr "里程碑ID无效，此里程碑必须属于同一项目" + +#: taiga/projects/userstories/validators.py:135 +msgid "" +"Invalid user story ids. All stories must belong to the same project and, if " +"it exists, to the same status and milestone." +msgstr "用户故事ID无效，所有用户故事必须属于同一项目" + +#: taiga/projects/userstories/validators.py:159 +msgid "The milestone isn't valid for the project" +msgstr "此里程碑在该项目无效" + +#: taiga/projects/userstories/validators.py:169 +msgid "All the user stories must be from the same project" +msgstr "所有用户故事必须从属于一个同一项目" + +#: taiga/projects/validators.py:61 +msgid "There's no project with that id" +msgstr "该ID无对应项目" + +#: taiga/projects/validators.py:142 +msgid "Email address is already taken" +msgstr "电子邮件已经被使用" + +#: taiga/projects/validators.py:154 +msgid "Invalid role for the project" +msgstr "此角色在该项目无效" + +#: taiga/projects/validators.py:165 +msgid "The project owner must be admin." +msgstr "项目所有者必须是管理者" + +#: taiga/projects/validators.py:169 +msgid "At least one user must be an active admin for this project." +msgstr "一个项目至少有一名活跃的管理者" + +#: taiga/projects/validators.py:201 +msgid "Invalid role ids. All roles must belong to the same project." +msgstr "角色ID无效，所有角色必须属于同一项目" + +#: taiga/projects/validators.py:225 +msgid "Default options" +msgstr "默认选项" + +#: taiga/projects/validators.py:226 +msgid "User story's statuses" +msgstr "用户故事状态" + +#: taiga/projects/validators.py:227 +msgid "Points" +msgstr "点数" + +#: taiga/projects/validators.py:228 +msgid "Task's statuses" +msgstr "任务状态" + +#: taiga/projects/validators.py:229 +msgid "Issue's statuses" +msgstr "问题状态" + +#: taiga/projects/validators.py:230 +msgid "Issue's types" +msgstr "问题类型" + +#: taiga/projects/validators.py:231 +msgid "Priorities" +msgstr "优先级" + +#: taiga/projects/validators.py:232 +msgid "Severities" +msgstr "严重程度" + +#: taiga/projects/validators.py:233 +msgid "Roles" +msgstr "角色" + +#: taiga/projects/votes/models.py:33 taiga/projects/votes/models.py:34 +#: taiga/projects/votes/models.py:58 +msgid "Votes" +msgstr "投票数" + +#: taiga/projects/votes/models.py:57 +msgid "Vote" +msgstr "投票" + +#: taiga/projects/wiki/api.py:77 +msgid "'content' parameter is mandatory" +msgstr "'content' 参数必需" + +#: taiga/projects/wiki/api.py:80 +msgid "'project_id' parameter is mandatory" +msgstr "'project_id' 参数必需" + +#: taiga/projects/wiki/models.py:42 +msgid "last modifier" +msgstr "最后修改者" + +#: taiga/projects/wiki/models.py:75 +msgid "href" +msgstr "" + +#: taiga/timeline/signals.py:63 +msgid "Check the history API for the exact diff" +msgstr "检查确切的 diff 的历史记录 API" + +#: taiga/users/admin.py:39 +msgid "Project Member" +msgstr "项目成员" + +#: taiga/users/admin.py:40 +msgid "Project Members" +msgstr "项目成员" + +#: taiga/users/admin.py:50 +msgid "id" +msgstr "id" + +#: taiga/users/admin.py:81 +msgid "Project Ownership" +msgstr "项目所有权" + +#: taiga/users/admin.py:82 +msgid "Project Ownerships" +msgstr "项目所有权" + +#: taiga/users/admin.py:119 +msgid "Personal info" +msgstr "个人信息" + +#: taiga/users/admin.py:122 +msgid "Permissions" +msgstr "权限" + +#: taiga/users/admin.py:123 +msgid "Restrictions" +msgstr "限制" + +#: taiga/users/admin.py:125 +msgid "Important dates" +msgstr "重要日期" + +#: taiga/users/api.py:123 +msgid "Duplicated email" +msgstr "重复的邮件地址" + +#: taiga/users/api.py:125 +msgid "Not valid email" +msgstr "无效的邮件地址" + +#: taiga/users/api.py:165 +msgid "Invalid username or email" +msgstr "用户名称或邮件地址无效" + +#: taiga/users/api.py:174 +msgid "Mail sended successful!" +msgstr "邮件发送成功！" + +#: taiga/users/api.py:212 +msgid "Current password parameter needed" +msgstr "输入当前密码" + +#: taiga/users/api.py:215 +msgid "New password parameter needed" +msgstr "输入新密码" + +#: taiga/users/api.py:218 +msgid "Invalid password length at least 6 charaters needed" +msgstr "无效密码，长度至少6位" + +#: taiga/users/api.py:221 +msgid "Invalid current password" +msgstr "当前密码无效" + +#: taiga/users/api.py:268 taiga/users/api.py:274 +msgid "" +"Invalid, are you sure the token is correct and you didn't use it before?" +msgstr "无效，请确定令牌正确，之前使用过？" + +#: taiga/users/api.py:301 taiga/users/api.py:309 taiga/users/api.py:312 +msgid "Invalid, are you sure the token is correct?" +msgstr "无效，请确定令牌正确？" + +#: taiga/users/models.py:95 +msgid "superuser status" +msgstr "超级用户状态" + +#: taiga/users/models.py:96 +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "选定此用户拥有所有权限，而不用显式将他们分配。" + +#: taiga/users/models.py:126 +msgid "username" +msgstr "用户名" + +#: taiga/users/models.py:127 +msgid "" +"Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" +msgstr "必填，长度小于30的英文字母、数字、“.”、“-”、“_”" + +#: taiga/users/models.py:130 +msgid "Enter a valid username." +msgstr "输入一个合法的用户名" + +#: taiga/users/models.py:133 +msgid "active" +msgstr "活跃" + +#: taiga/users/models.py:134 +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "指定是否此用户为活跃用户。取消选择这而不是删除帐户。" + +#: taiga/users/models.py:140 +msgid "biography" +msgstr "个人简介" + +#: taiga/users/models.py:143 +msgid "photo" +msgstr "照片" + +#: taiga/users/models.py:144 +msgid "date joined" +msgstr "加入日期" + +#: taiga/users/models.py:146 +msgid "default language" +msgstr "默认语言" + +#: taiga/users/models.py:148 +msgid "default theme" +msgstr "默认主题" + +#: taiga/users/models.py:150 +msgid "default timezone" +msgstr "默认时区" + +#: taiga/users/models.py:152 +msgid "colorize tags" +msgstr "彩色标签" + +#: taiga/users/models.py:157 +msgid "email token" +msgstr "电子邮件密码" + +#: taiga/users/models.py:159 +msgid "new email address" +msgstr "新邮件地址" + +#: taiga/users/models.py:166 +msgid "max number of owned private projects" +msgstr "最大私有项目数" + +#: taiga/users/models.py:169 +msgid "max number of owned public projects" +msgstr "最大公开项目数" + +#: taiga/users/models.py:172 +msgid "max number of memberships for each owned private project" +msgstr "私有项目最大成员数" + +#: taiga/users/models.py:176 +msgid "max number of memberships for each owned public project" +msgstr "公开项目最大成员数" + +#: taiga/users/models.py:296 +msgid "permissions" +msgstr "权限" + +#: taiga/users/services.py:51 taiga/users/services.py:68 +msgid "Username or password does not matches user." +msgstr "用户名或密码错误。" + +#: taiga/users/templates/emails/change_email-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Change your email

    \n" +"

    Hello %(full_name)s,
    please confirm your email

    \n" +" Confirm " +"email\n" +"

    You can ignore this message if you did not request.

    \n" +"

    The Taiga Team

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

    邮件地址变更

    \n" +"

    您好 %(full_name)s,
    请确认邮件地址

    \n" +" 确认\n" +"

    如果不是是提出的申请，可以忽略这封邮件。

    \n" +"

    Taiga团队

    \n" +" " + +#: taiga/users/templates/emails/change_email-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(full_name)s, please confirm your email\n" +"\n" +"%(url)s\n" +"\n" +"You can ignore this message if you did not request.\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"您好%(full_name)s, 请求确认您的邮件地址\n" +"\n" +"%(url)s\n" +"\n" +"如果不是你提出的申请，可以忽略这封邮件。\n" +"---\n" +"Taiga团队\n" + +#: taiga/users/templates/emails/change_email-subject.jinja:1 +msgid "[Taiga] Change email" +msgstr "[Taiga] 变更电邮地址" + +#: taiga/users/templates/emails/password_recovery-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Recover your password

    \n" +"

    Hello %(full_name)s,
    you asked to recover your password

    \n" +" Recover your password\n" +"

    You can ignore this message if you did not request.

    \n" +"

    The Taiga Team

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

    重置密码

    \n" +"

    您好 %(full_name)s,
    您申请进行密码重置

    \n" +" 重置" +"\n" +"

    如果不是是提出的申请，可以忽略这封邮件。

    \n" +"

    Taiga团队

    \n" +" " + +#: taiga/users/templates/emails/password_recovery-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(full_name)s, you asked to recover your password\n" +"\n" +"%(url)s\n" +"\n" +"You can ignore this message if you did not request.\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"您好 %(full_name)s, 你申请进行重置密码，点击下面链接进行重置\n" +"\n" +"%(url)s\n" +"\n" +"如果提出的申请，可以忽略这封邮件。\n" +"\n" +"---\n" +"Taiga团队\n" + +#: taiga/users/templates/emails/password_recovery-subject.jinja:1 +msgid "[Taiga] Password recovery" +msgstr "[Taiga] 找回密码" + +#: taiga/users/templates/emails/registered_user-body-html.jinja:6 +msgid "" +"\n" +"     \n" +" " +msgstr "" +"\n" +" \n" +" " + +#: taiga/users/templates/emails/registered_user-body-html.jinja:23 +#, python-format +msgid "" +"\n" +" You may remove your account from this service clicking " +"here\n" +" " +msgstr "" +"\n" +" 你可以注销账户从下面的服务 点击\n" +" " + +#: taiga/users/templates/emails/registered_user-body-text.jinja:1 +msgid "" +"\n" +"Thank you for registering in Taiga\n" +"\n" +"We hope you enjoy it\n" +"\n" +"We built Taiga because we wanted the project management tool that sits open " +"on our computers all day long, to serve as a continued reminder of why we " +"love to collaborate, code and design.\n" +"\n" +"We built it to be beautiful, elegant, simple to use and fun - without " +"forsaking flexibility and power.\n" +"\n" +"--\n" +"The taiga Team\n" +msgstr "" +"\n" +"Thank you for registering in Taiga\n" +"\n" +"We hope you enjoy it\n" +"\n" +"We built Taiga because we wanted the project management tool that sits open " +"on our computers all day long, to serve as a continued reminder of why we " +"love to collaborate, code and design.\n" +"\n" +"We built it to be beautiful, elegant, simple to use and fun - without " +"forsaking flexibility and power.\n" +"\n" +"--\n" +"The taiga Team\n" + +#: taiga/users/templates/emails/registered_user-body-text.jinja:13 +#, python-format +msgid "" +"\n" +"You may remove your account from this service: %(url)s\n" +msgstr "" +"\n" +"您可以注销您的账户，通过: %(url)s\n" + +#: taiga/users/templates/emails/registered_user-subject.jinja:1 +msgid "You've been Taigatized!" +msgstr "您已成为Taiga的一员" + +#: taiga/users/validators.py:45 +msgid "invalid" +msgstr "无效的" + +#: taiga/users/validators.py:56 +msgid "Invalid username. Try with a different one." +msgstr "无效用户名，请尝试其他的。" + +#: taiga/userstorage/api.py:53 +msgid "" +"Duplicate key value violates unique constraint. Key '{}' already exists." +msgstr "重复的键值违反唯一约束。键 '{}' 已经存在。" + +#: taiga/userstorage/models.py:32 +msgid "key" +msgstr "键" + +#: taiga/webhooks/models.py:30 taiga/webhooks/models.py:40 +msgid "URL" +msgstr "网址" + +#: taiga/webhooks/models.py:31 +msgid "secret key" +msgstr "密钥" + +#: taiga/webhooks/models.py:41 +msgid "status code" +msgstr "状态码" + +#: taiga/webhooks/models.py:42 +msgid "request data" +msgstr "请求数据" + +#: taiga/webhooks/models.py:43 +msgid "request headers" +msgstr "请求Header头" + +#: taiga/webhooks/models.py:44 +msgid "response data" +msgstr "响应数据" + +#: taiga/webhooks/models.py:45 +msgid "response headers" +msgstr "响应Header头" + +#: taiga/webhooks/models.py:46 +msgid "duration" +msgstr "持续时间" From a7287df03943b32ca7f5ba717eb9f3be90762a5c Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 29 Nov 2016 10:50:09 +0100 Subject: [PATCH 064/144] Issue 4530: some searches without results --- CHANGELOG.md | 5 +-- taiga/base/filters.py | 4 +-- taiga/projects/filters.py | 8 ++--- .../migrations/0057_auto_20161129_0945.py | 35 +++++++++++++++++++ .../migrations/0005_auto_20161201_1628.py | 20 +++++++++++ taiga/projects/wiki/models.py | 2 +- taiga/projects/wiki/validators.py | 3 ++ taiga/searches/services.py | 14 ++++---- taiga/users/filters.py | 4 +-- taiga/users/services.py | 6 ++-- 10 files changed, 80 insertions(+), 21 deletions(-) create mode 100644 taiga/projects/migrations/0057_auto_20161129_0945.py create mode 100644 taiga/projects/wiki/migrations/0005_auto_20161201_1628.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b5a5fc6..344e5b8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,15 +5,16 @@ ### Features - Contact with the project: if the projects have this module enabled Taiga users can contact them. -- Memberships API endpoints now allows using usernames and emails instead of using only emails. -- Contacts API search by free text: consulting the username, full name and email. - Ability to create rich text custom fields in Epics, User Stories, Tasks and Isues. +- Full text search now use simple as tolenizer so search with non-english text are allowed. - i18n: - Add japanese (ja) translation. - Add chinese simplified (zh-Hans) translation. ### Misc - API: + - Memberships API endpoints now allows using usernames and emails instead of using only emails. + - Contacts API allow full text search (by the username, full name or email). - Filter milestones, user stories and tasks by estimated_start and estimated_finish dates. - Add project_extra_info to epics, tasks, milestones, issues and wiki pages endpoints. - Lots of small and not so small bugfixes. diff --git a/taiga/base/filters.py b/taiga/base/filters.py index 80c7e280..4c330178 100644 --- a/taiga/base/filters.py +++ b/taiga/base/filters.py @@ -552,11 +552,11 @@ class QFilter(FilterBackend): if q: table = queryset.model._meta.db_table where_clause = (""" - to_tsvector('english_nostop', + to_tsvector('simple', coalesce({table}.subject, '') || ' ' || coalesce(array_to_string({table}.tags, ' '), '') || ' ' || coalesce({table}.ref) || ' ' || - coalesce({table}.description, '')) @@ to_tsquery('english_nostop', %s) + coalesce({table}.description, '')) @@ to_tsquery('simple', %s) """.format(table=table)) queryset = queryset.extra(where=[where_clause], params=[to_tsquery(q)]) diff --git a/taiga/projects/filters.py b/taiga/projects/filters.py index fe720f97..c4e4f90b 100644 --- a/taiga/projects/filters.py +++ b/taiga/projects/filters.py @@ -94,14 +94,14 @@ class QFilterBackend(FilterBackend): # NOTE: See migtration 0033_text_search_indexes q = request.QUERY_PARAMS.get('q', None) if q: - tsquery = "to_tsquery('english_nostop', %s)" + tsquery = "to_tsquery('simple', %s)" tsquery_params = [to_tsquery(q)] tsvector = """ - setweight(to_tsvector('english_nostop', + setweight(to_tsvector('simple', coalesce(projects_project.name, '')), 'A') || - setweight(to_tsvector('english_nostop', + setweight(to_tsvector('simple', coalesce(inmutable_array_to_string(projects_project.tags), '')), 'B') || - setweight(to_tsvector('english_nostop', + setweight(to_tsvector('simple', coalesce(projects_project.description, '')), 'C') """ diff --git a/taiga/projects/migrations/0057_auto_20161129_0945.py b/taiga/projects/migrations/0057_auto_20161129_0945.py new file mode 100644 index 00000000..0e161a4f --- /dev/null +++ b/taiga/projects/migrations/0057_auto_20161129_0945.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2016-11-29 09:45 +from __future__ import unicode_literals + +from django.db import migrations + + +DROP_INDEX = """ + DROP INDEX IF EXISTS projects_project_textquery_idx; +""" + + +# NOTE: This index is needed by taiga.projects.filters.QFilter +CREATE_INDEX = """ + CREATE INDEX projects_project_textquery_idx + ON projects_project + USING gin((setweight(to_tsvector('simple', + coalesce(projects_project.name, '')), 'A') || + setweight(to_tsvector('simple', + coalesce(inmutable_array_to_string(projects_project.tags), '')), 'B') || + setweight(to_tsvector('simple', + coalesce(projects_project.description, '')), 'C'))); +""" + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0056_auto_20161110_1518'), + ] + + operations = [ + migrations.RunSQL([DROP_INDEX, CREATE_INDEX], + [DROP_INDEX]), + ] diff --git a/taiga/projects/wiki/migrations/0005_auto_20161201_1628.py b/taiga/projects/wiki/migrations/0005_auto_20161201_1628.py new file mode 100644 index 00000000..87723645 --- /dev/null +++ b/taiga/projects/wiki/migrations/0005_auto_20161201_1628.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2016-12-01 16:28 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wiki', '0004_auto_20160928_0540'), + ] + + operations = [ + migrations.AlterField( + model_name='wikipage', + name='slug', + field=models.SlugField(allow_unicode=True, max_length=500, verbose_name='slug'), + ), + ] diff --git a/taiga/projects/wiki/models.py b/taiga/projects/wiki/models.py index 1c51fff0..7b913107 100644 --- a/taiga/projects/wiki/models.py +++ b/taiga/projects/wiki/models.py @@ -33,7 +33,7 @@ class WikiPage(OCCModelMixin, WatchedModelMixin, models.Model): project = models.ForeignKey("projects.Project", null=False, blank=False, related_name="wiki_pages", verbose_name=_("project")) slug = models.SlugField(max_length=500, db_index=True, null=False, blank=False, - verbose_name=_("slug")) + verbose_name=_("slug"), allow_unicode=True) content = models.TextField(null=False, blank=True, verbose_name=_("content")) owner = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, diff --git a/taiga/projects/wiki/validators.py b/taiga/projects/wiki/validators.py index 033fac1b..9c5601f5 100644 --- a/taiga/projects/wiki/validators.py +++ b/taiga/projects/wiki/validators.py @@ -17,12 +17,15 @@ # along with this program. If not, see . from taiga.base.api import validators +from taiga.base.api import serializers from taiga.projects.notifications.validators import WatchersValidator from . import models class WikiPageValidator(WatchersValidator, validators.ModelValidator): + slug = serializers.CharField() + class Meta: model = models.WikiPage read_only_fields = ('modified_date', 'created_date', 'owner') diff --git a/taiga/searches/services.py b/taiga/searches/services.py index adda60bb..5bc6159b 100644 --- a/taiga/searches/services.py +++ b/taiga/searches/services.py @@ -55,23 +55,23 @@ def search_issues(project, text): def search_wiki_pages(project, text): model = apps.get_model("wiki", "WikiPage") queryset = model.objects.filter(project_id=project.pk) - tsquery = "to_tsquery('english_nostop', %s)" + tsquery = "to_tsquery('simple', %s)" tsvector = """ - setweight(to_tsvector('english_nostop', coalesce(wiki_wikipage.slug)), 'A') || - setweight(to_tsvector('english_nostop', coalesce(wiki_wikipage.content)), 'B') + setweight(to_tsvector('simple', coalesce(wiki_wikipage.slug)), 'A') || + setweight(to_tsvector('simple', coalesce(wiki_wikipage.content)), 'B') """ return _search_by_query(queryset, tsquery, tsvector, text) def _search_items(queryset, table, text): - tsquery = "to_tsquery('english_nostop', %s)" + tsquery = "to_tsquery('simple', %s)" tsvector = """ - setweight(to_tsvector('english_nostop', + setweight(to_tsvector('simple', coalesce({table}.subject) || ' ' || coalesce({table}.ref)), 'A') || - setweight(to_tsvector('english_nostop', coalesce(inmutable_array_to_string({table}.tags))), 'B') || - setweight(to_tsvector('english_nostop', coalesce({table}.description)), 'C') + setweight(to_tsvector('simple', coalesce(inmutable_array_to_string({table}.tags))), 'B') || + setweight(to_tsvector('simple', coalesce({table}.description)), 'C') """.format(table=table) return _search_by_query(queryset, tsquery, tsvector, text) diff --git a/taiga/users/filters.py b/taiga/users/filters.py index 03f7b10e..2c7e47f9 100644 --- a/taiga/users/filters.py +++ b/taiga/users/filters.py @@ -29,10 +29,10 @@ class ContactsFilterBackend(PermissionBasedFilterBackend): if q: table = qs.model._meta.db_table where_clause = (""" - to_tsvector('english_nostop', + to_tsvector('simple', coalesce({table}.username, '') || ' ' || coalesce({table}.full_name) || ' ' || - coalesce({table}.email, '')) @@ to_tsquery('english_nostop', %s) + coalesce({table}.email, '')) @@ to_tsquery('simple', %s) """.format(table=table)) qs = qs.extra(where=[where_clause], params=[to_tsquery(q)]) diff --git a/taiga/users/services.py b/taiga/users/services.py index 4b49353e..14a3802a 100644 --- a/taiga/users/services.py +++ b/taiga/users/services.py @@ -312,7 +312,7 @@ def get_watched_list(for_user, from_user, type=None, q=None): if q: filters_sql += """ AND ( - to_tsvector('english_nostop', coalesce(subject,'') || ' ' ||coalesce(entities.name,'') || ' ' ||coalesce(to_char(ref, '999'),'')) @@ to_tsquery('english_nostop', %(q)s) + to_tsvector('simple', coalesce(subject,'') || ' ' ||coalesce(entities.name,'') || ' ' ||coalesce(to_char(ref, '999'),'')) @@ to_tsquery('simple', %(q)s) ) """ @@ -412,7 +412,7 @@ def get_liked_list(for_user, from_user, type=None, q=None): if q: filters_sql += """ AND ( - to_tsvector('english_nostop', coalesce(subject,'') || ' ' ||coalesce(entities.name,'') || ' ' ||coalesce(to_char(ref, '999'),'')) @@ to_tsquery('english_nostop', %(q)s) + to_tsvector('simple', coalesce(subject,'') || ' ' ||coalesce(entities.name,'') || ' ' ||coalesce(to_char(ref, '999'),'')) @@ to_tsquery('simple', %(q)s) ) """ @@ -495,7 +495,7 @@ def get_voted_list(for_user, from_user, type=None, q=None): if q: filters_sql += """ AND ( - to_tsvector('english_nostop', coalesce(subject,'') || ' ' ||coalesce(entities.name,'') || ' ' ||coalesce(to_char(ref, '999'),'')) @@ to_tsquery('english_nostop', %(q)s) + to_tsvector('simple', coalesce(subject,'') || ' ' ||coalesce(entities.name,'') || ' ' ||coalesce(to_char(ref, '999'),'')) @@ to_tsquery('simple', %(q)s) ) """ From db9fdf06b6c4c9d3d79ca1e6cf7f9f1b88174ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 1 Dec 2016 18:42:38 +0100 Subject: [PATCH 065/144] Add missed migration --- .../migrations/0012_auto_20161201_1628.py | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 taiga/projects/custom_attributes/migrations/0012_auto_20161201_1628.py diff --git a/taiga/projects/custom_attributes/migrations/0012_auto_20161201_1628.py b/taiga/projects/custom_attributes/migrations/0012_auto_20161201_1628.py new file mode 100644 index 00000000..cab03195 --- /dev/null +++ b/taiga/projects/custom_attributes/migrations/0012_auto_20161201_1628.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2016-12-01 16:28 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('custom_attributes', '0011_json_to_jsonb'), + ] + + operations = [ + migrations.AlterField( + model_name='epiccustomattribute', + name='type', + field=models.CharField(choices=[('text', 'Text'), ('multiline', 'Multi-Line Text'), ('richtext', 'Rich text'), ('date', 'Date'), ('url', 'Url')], default='text', max_length=16, verbose_name='type'), + ), + migrations.AlterField( + model_name='issuecustomattribute', + name='type', + field=models.CharField(choices=[('text', 'Text'), ('multiline', 'Multi-Line Text'), ('richtext', 'Rich text'), ('date', 'Date'), ('url', 'Url')], default='text', max_length=16, verbose_name='type'), + ), + migrations.AlterField( + model_name='taskcustomattribute', + name='type', + field=models.CharField(choices=[('text', 'Text'), ('multiline', 'Multi-Line Text'), ('richtext', 'Rich text'), ('date', 'Date'), ('url', 'Url')], default='text', max_length=16, verbose_name='type'), + ), + migrations.AlterField( + model_name='userstorycustomattribute', + name='type', + field=models.CharField(choices=[('text', 'Text'), ('multiline', 'Multi-Line Text'), ('richtext', 'Rich text'), ('date', 'Date'), ('url', 'Url')], default='text', max_length=16, verbose_name='type'), + ), + ] From f1356e5e80aa3094fc1dba3bb94133b2e87c2c24 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 2 Dec 2016 12:53:38 +0100 Subject: [PATCH 066/144] issue 4809: sorting with some fields with filters leads to incomplete lists with duplicates on multiple pages --- taiga/base/filters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/taiga/base/filters.py b/taiga/base/filters.py index 4c330178..346f3f54 100644 --- a/taiga/base/filters.py +++ b/taiga/base/filters.py @@ -105,7 +105,8 @@ class OrderByFilterMixin(QueryParamsFilterMixin): if raw_fieldname in ["owner", "-owner", "assigned_to", "-assigned_to"]: raw_fieldname = "{}__full_name".format(raw_fieldname) - return super().filter_queryset(request, queryset.order_by(raw_fieldname), view) + # We need to add a default order if raw_fieldname gives rows with the same value + return super().filter_queryset(request, queryset.order_by(raw_fieldname, "-id"), view) class FilterBackend(OrderByFilterMixin): From 9791fb256ba5bbe9e9b4ab7897de856653da5ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 13 Dec 2016 10:44:28 +0100 Subject: [PATCH 067/144] Remove alt text for the logo img in email templates --- taiga/base/templates/emails/base-body-html.jinja | 6 +++--- taiga/base/templates/emails/hero-body-html.jinja | 2 +- taiga/base/templates/emails/updates-body-html.jinja | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/taiga/base/templates/emails/base-body-html.jinja b/taiga/base/templates/emails/base-body-html.jinja index c566f25a..6f644f0a 100644 --- a/taiga/base/templates/emails/base-body-html.jinja +++ b/taiga/base/templates/emails/base-body-html.jinja @@ -398,9 +398,9 @@
    + {% block body %}{% endblock %}
    -

    {{ attr.name }}

    -
    - {{ _("to") }}
    - {{ attr.value|linebreaksbr }} -
    +

    {{ attr.name }}

    +

    {{ mdrender(project, attr.value_diff) }}

    +

    {{ attr.name }}

    		 - {{ _("from") }}
    - {{ attr.changes.value.0|linebreaksbr }} -
    {{ _("to") }}
    - {{ attr.changes.value.1|linebreaksbr }} + {{ attr.value|linebreaksbr }}
    +

    {{ attr.name }}

    +

    {{ mdrender(project, attr.value_diff) }}

    +
    +

    {{ attr.name }}

    +     		+ {{ _("from") }}
    + {{ attr.changes.value.0|linebreaksbr }} +
    + {{ _("to") }}
    + {{ attr.changes.value.1|linebreaksbr }} +
    \n" +"

    Thank you for registering in Taiga

    \n" +"

    We hope you enjoy it

    \n" +"

    We built Taiga because we wanted the project management tool " +"that sits open on our computers all day long, to serve as a continued " +"reminder of why we love to collaborate, code and design.

    \n" +"

    We built it to be beautiful, elegant, simple to use and fun - " +"without forsaking flexibility and power.

    \n" +" The taiga Team\n" +"     		\n" +"

    Thank you for registering in Taiga

    \n" +"

    We hope you enjoy it

    \n" +"

    We built Taiga because we wanted the project management tool " +"that sits open on our computers all day long, to serve as a continued " +"reminder of why we love to collaborate, code and design.

    \n" +"

    We built it to be beautiful, elegant, simple to use and fun - " +"without forsaking flexibility and power.

    \n" +" The taiga Team\n" +"     		\n" +"

    Thank you for registering in Taiga

    \n" +"

    We hope you enjoy it

    \n" +"

    We built Taiga because we wanted the project management tool " +"that sits open on our computers all day long, to serve as a continued " +"reminder of why we love to collaborate, code and design.

    \n" +"

    We built it to be beautiful, elegant, simple to use and fun - " +"without forsaking flexibility and power.

    \n" +" The taiga Team\n" +"
    diff --git a/taiga/base/templates/emails/hero-body-html.jinja b/taiga/base/templates/emails/hero-body-html.jinja index 2f7d720e..c9bc1035 100644 --- a/taiga/base/templates/emails/hero-body-html.jinja +++ b/taiga/base/templates/emails/hero-body-html.jinja @@ -354,7 +354,7 @@ diff --git a/taiga/base/templates/emails/hero-body-html.jinja b/taiga/base/templates/emails/hero-body-html.jinja index c9bc1035..fb2285f3 100644 --- a/taiga/base/templates/emails/hero-body-html.jinja +++ b/taiga/base/templates/emails/hero-body-html.jinja @@ -354,7 +354,7 @@ \n" +" " +msgstr "" +"\n" +" \n" +" " + +#: taiga/users/templates/emails/registered_user-body-html.jinja:23 +#, python-format +msgid "" +"\n" +" You may remove your account from this service clicking " +"here\n" +" " +msgstr "" +"\n" +" 이 서비스에서 귀하의 계정을 삭제할 수 있습니다. 여기를 클릭하세요.\n" +" " + +#: taiga/users/templates/emails/registered_user-body-text.jinja:1 +msgid "" +"\n" +"Thank you for registering in Taiga\n" +"\n" +"We hope you enjoy it\n" +"\n" +"We built Taiga because we wanted the project management tool that sits open " +"on our computers all day long, to serve as a continued reminder of why we " +"love to collaborate, code and design.\n" +"\n" +"We built it to be beautiful, elegant, simple to use and fun - without " +"forsaking flexibility and power.\n" +"\n" +"--\n" +"The taiga Team\n" +msgstr "" +"\n" +"타이가에 가입해주셔서 감사합니다.\n" +"\n" +"우리는 당신이 즐기길 원합니다.\n" +"\n" +"우리는 타이가를 컴퓨터에 하루 종일 열려있는 프로젝트 관리 도구로, 왜 우리가 " +"협업과 코드와 디자인을 사랑하는지 계속해서 다시금 떠올릴 수 있도록 만들었습니" +"다.\n" +"\n" +"우리는 아름답고, 우아하고, 간결하며 재미있게 사용할 수 있도록 만들었습니다. " +"- 유연성과 강력함을 버리지 않고 말이죠.\n" +"\n" +"-\n" +"타이가 팀\n" + +#: taiga/users/templates/emails/registered_user-body-text.jinja:13 +#, python-format +msgid "" +"\n" +"You may remove your account from this service: %(url)s\n" +msgstr "" +"\n" +"이 서비스에서 귀하의 계정을 삭제할 수 있습니다: %(url)s\n" + +#: taiga/users/templates/emails/registered_user-subject.jinja:1 +msgid "You've been Taigatized!" +msgstr "타이가화 되었습니다!" + +#: taiga/users/validators.py:45 +msgid "invalid" +msgstr "유효하지 않음" + +#: taiga/users/validators.py:56 +msgid "Invalid username. Try with a different one." +msgstr "유효하지 않은 아이디입니다. 다른 것으로 다시 시도해주세요." + +#: taiga/userstorage/api.py:53 +msgid "" +"Duplicate key value violates unique constraint. Key '{}' already exists." +msgstr "키 값이 고유 제한 조건을 위반합니다. '{}'키가 이미 있습니다." + +#: taiga/userstorage/models.py:32 +msgid "key" +msgstr "키" + +#: taiga/webhooks/models.py:30 taiga/webhooks/models.py:40 +msgid "URL" +msgstr "URL" + +#: taiga/webhooks/models.py:31 +msgid "secret key" +msgstr "비밀 키" + +#: taiga/webhooks/models.py:41 +msgid "status code" +msgstr "상태 코드" + +#: taiga/webhooks/models.py:42 +msgid "request data" +msgstr "요청 데이터" + +#: taiga/webhooks/models.py:43 +msgid "request headers" +msgstr "요청 헤더" + +#: taiga/webhooks/models.py:44 +msgid "response data" +msgstr "응답 데이터" + +#: taiga/webhooks/models.py:45 +msgid "response headers" +msgstr "응답 헤더" + +#: taiga/webhooks/models.py:46 +msgid "duration" +msgstr "지속시간" From 0d3adc5d2f1ee02799bdd959c125b30decf71850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 13 Jan 2017 14:23:57 +0100 Subject: [PATCH 087/144] Add svg thumbnail generation --- CHANGELOG.md | 3 ++- requirements.txt | 1 + taiga/base/utils/thumbnails.py | 18 +++++++++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bb83701..570f8314 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,12 @@ - Ability to create rich text custom fields in Epics, User Stories, Tasks and Isues. - Full text search now use simple as tokenizer so search with non-english text are allowed. - Duplicate project: allows creating a new project based on the structure of another (status, tags, colors, default values...) +- Add thumbnails for PSD files. +- Add thumbnails for SVG files (Cario lib is needed). - i18n: - Add japanese (ja) translation. - Add korean (ko) translation. - Add chinese simplified (zh-Hans) translation. -- Add thumbnails for PSD files. ### Misc - API: diff --git a/requirements.txt b/requirements.txt index 670e9ace..7ff142ab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,3 +34,4 @@ python-dateutil==2.6.0 netaddr==0.7.18 serpy==0.1.1 psd-tools==1.4 +CairoSVG==2.0.1 diff --git a/taiga/base/utils/thumbnails.py b/taiga/base/utils/thumbnails.py index e28aff0c..a7e87e54 100644 --- a/taiga/base/utils/thumbnails.py +++ b/taiga/base/utils/thumbnails.py @@ -26,12 +26,28 @@ from taiga.base.utils.urls import get_absolute_url from easy_thumbnails.files import get_thumbnailer from easy_thumbnails.exceptions import InvalidImageFormatError from PIL import Image +from PIL.PngImagePlugin import PngImageFile +from io import BytesIO +# SVG thumbnail generator +try: + from cairosvg.surface import PNGSurface + + def svg_image_factory(data, *args): + png_data = PNGSurface.convert(data.read()) + return PngImageFile(BytesIO(png_data)) + + Image.register_mime("SVG", "image/svg+xml") + Image.register_extension("SVG", ".svg") + Image.register_open("SVG", svg_image_factory) +except Exception: + pass + +# PSD thumbnail generator def psd_image_factory(data, *args): return PSDImage.from_stream(data).as_PIL() - Image.init() Image.register_open("PSD", psd_image_factory) From 32ff6e67e709e8597674427a629dc6dc6bd71d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 17 Jan 2017 14:18:18 +0100 Subject: [PATCH 088/144] Adding support for preview svg and psd images --- CHANGELOG.md | 4 ++-- settings/common.py | 3 +++ taiga/projects/attachments/serializers.py | 6 ++++++ taiga/projects/attachments/services.py | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 570f8314..bbc26535 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ - Ability to create rich text custom fields in Epics, User Stories, Tasks and Isues. - Full text search now use simple as tokenizer so search with non-english text are allowed. - Duplicate project: allows creating a new project based on the structure of another (status, tags, colors, default values...) -- Add thumbnails for PSD files. -- Add thumbnails for SVG files (Cario lib is needed). +- Add thumbnails and preview for PSD files. +- Add thumbnails and preview for SVG files (Cario lib is needed). - i18n: - Add japanese (ja) translation. - Add korean (ko) translation. diff --git a/settings/common.py b/settings/common.py index 0f5911f9..b4c9e002 100644 --- a/settings/common.py +++ b/settings/common.py @@ -483,6 +483,7 @@ THN_LOGO_BIG_SIZE = 300 # 300x300 pixels THN_TIMELINE_IMAGE_SIZE = 640 # 640x??? pixels THN_CARD_IMAGE_WIDTH = 300 # 300 pixels THN_CARD_IMAGE_HEIGHT = 200 # 200 pixels +THN_PREVIEW_IMAGE_WIDTH = 800 # 800 pixels THN_AVATAR_SMALL = "avatar" THN_AVATAR_BIG = "big-avatar" @@ -490,6 +491,7 @@ THN_LOGO_SMALL = "logo-small" THN_LOGO_BIG = "logo-big" THN_ATTACHMENT_TIMELINE = "timeline-image" THN_ATTACHMENT_CARD = "card-image" +THN_ATTACHMENT_PREVIEW = "preview-image" THUMBNAIL_ALIASES = { "": { @@ -499,6 +501,7 @@ THUMBNAIL_ALIASES = { THN_LOGO_BIG: {"size": (THN_LOGO_BIG_SIZE, THN_LOGO_BIG_SIZE), "crop": True}, THN_ATTACHMENT_TIMELINE: {"size": (THN_TIMELINE_IMAGE_SIZE, 0), "crop": True}, THN_ATTACHMENT_CARD: {"size": (THN_CARD_IMAGE_WIDTH, THN_CARD_IMAGE_HEIGHT), "crop": True}, + THN_ATTACHMENT_PREVIEW: {"size": (THN_PREVIEW_IMAGE_WIDTH, 0), "crop": False}, }, } diff --git a/taiga/projects/attachments/serializers.py b/taiga/projects/attachments/serializers.py index ce8893b7..17176466 100644 --- a/taiga/projects/attachments/serializers.py +++ b/taiga/projects/attachments/serializers.py @@ -42,6 +42,7 @@ class AttachmentSerializer(serializers.LightSerializer): sha1 = Field() url = MethodField("get_url") thumbnail_card_url = MethodField("get_thumbnail_card_url") + preview_url = MethodField("get_preview_url") def get_url(self, obj): return obj.attached_file.url @@ -49,6 +50,11 @@ class AttachmentSerializer(serializers.LightSerializer): def get_thumbnail_card_url(self, obj): return services.get_card_image_thumbnail_url(obj) + def get_preview_url(self, obj): + if obj.name.endswith(".psd"): + return services.get_attachment_image_preview_url(obj) + return self.get_url(obj) + class BasicAttachmentsInfoSerializerMixin(serializers.LightSerializer): """ diff --git a/taiga/projects/attachments/services.py b/taiga/projects/attachments/services.py index b3305552..80f4afc3 100644 --- a/taiga/projects/attachments/services.py +++ b/taiga/projects/attachments/services.py @@ -28,3 +28,8 @@ def get_card_image_thumbnail_url(attachment): if attachment.attached_file: return get_thumbnail_url(attachment.attached_file, settings.THN_ATTACHMENT_CARD) return None + +def get_attachment_image_preview_url(attachment): + if attachment.attached_file: + return get_thumbnail_url(attachment.attached_file, settings.THN_ATTACHMENT_PREVIEW) + return None From 2ab743a44e13a37796d1dbb276577b50a5ed6a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 17 Jan 2017 11:56:10 +0100 Subject: [PATCH 089/144] Add from_comment field to attachments and allow attach files from comments --- .../0007_attachment_from_comment.py | 20 ++++++ taiga/projects/attachments/models.py | 1 + taiga/projects/attachments/permissions.py | 16 +++-- taiga/projects/attachments/serializers.py | 1 + taiga/projects/attachments/validators.py | 2 +- .../test_attachment_resources.py | 64 +++++++++++++++++++ 6 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 taiga/projects/attachments/migrations/0007_attachment_from_comment.py diff --git a/taiga/projects/attachments/migrations/0007_attachment_from_comment.py b/taiga/projects/attachments/migrations/0007_attachment_from_comment.py new file mode 100644 index 00000000..00482ec4 --- /dev/null +++ b/taiga/projects/attachments/migrations/0007_attachment_from_comment.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-01-17 07:45 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('attachments', '0006_auto_20160617_1233'), + ] + + operations = [ + migrations.AddField( + model_name='attachment', + name='from_comment', + field=models.BooleanField(default=False, verbose_name='from_comment'), + ), + ] diff --git a/taiga/projects/attachments/models.py b/taiga/projects/attachments/models.py index a5110a4b..0e7449d9 100644 --- a/taiga/projects/attachments/models.py +++ b/taiga/projects/attachments/models.py @@ -58,6 +58,7 @@ class Attachment(models.Model): sha1 = models.CharField(default="", max_length=40, verbose_name=_("sha1"), blank=True) is_deprecated = models.BooleanField(default=False, verbose_name=_("is deprecated")) + from_comment = models.BooleanField(default=False, verbose_name=_("from_comment")) description = models.TextField(null=False, blank=True, verbose_name=_("description")) order = models.IntegerField(default=0, null=False, blank=False, verbose_name=_("order")) diff --git a/taiga/projects/attachments/permissions.py b/taiga/projects/attachments/permissions.py index 4c7a7915..d949ade2 100644 --- a/taiga/projects/attachments/permissions.py +++ b/taiga/projects/attachments/permissions.py @@ -27,10 +27,16 @@ class IsAttachmentOwnerPerm(PermissionComponent): return request.user == obj.owner return False +class CommentAttachmentPerm(PermissionComponent): + def check_permissions(self, request, view, obj=None): + if obj.from_comment: + return True + return False + class EpicAttachmentPermission(TaigaResourcePermission): retrieve_perms = HasProjectPerm('view_epics') | IsAttachmentOwnerPerm() - create_perms = HasProjectPerm('modify_epic') + create_perms = HasProjectPerm('modify_epic') | (CommentAttachmentPerm() & HasProjectPerm('comment_epic')) update_perms = HasProjectPerm('modify_epic') | IsAttachmentOwnerPerm() partial_update_perms = HasProjectPerm('modify_epic') | IsAttachmentOwnerPerm() destroy_perms = HasProjectPerm('modify_epic') | IsAttachmentOwnerPerm() @@ -39,7 +45,7 @@ class EpicAttachmentPermission(TaigaResourcePermission): class UserStoryAttachmentPermission(TaigaResourcePermission): retrieve_perms = HasProjectPerm('view_us') | IsAttachmentOwnerPerm() - create_perms = HasProjectPerm('modify_us') + create_perms = HasProjectPerm('modify_us') | (CommentAttachmentPerm() & HasProjectPerm('comment_us')) update_perms = HasProjectPerm('modify_us') | IsAttachmentOwnerPerm() partial_update_perms = HasProjectPerm('modify_us') | IsAttachmentOwnerPerm() destroy_perms = HasProjectPerm('modify_us') | IsAttachmentOwnerPerm() @@ -48,7 +54,7 @@ class UserStoryAttachmentPermission(TaigaResourcePermission): class TaskAttachmentPermission(TaigaResourcePermission): retrieve_perms = HasProjectPerm('view_tasks') | IsAttachmentOwnerPerm() - create_perms = HasProjectPerm('modify_task') + create_perms = HasProjectPerm('modify_task') | (CommentAttachmentPerm() & HasProjectPerm('comment_task')) update_perms = HasProjectPerm('modify_task') | IsAttachmentOwnerPerm() partial_update_perms = HasProjectPerm('modify_task') | IsAttachmentOwnerPerm() destroy_perms = HasProjectPerm('modify_task') | IsAttachmentOwnerPerm() @@ -57,7 +63,7 @@ class TaskAttachmentPermission(TaigaResourcePermission): class IssueAttachmentPermission(TaigaResourcePermission): retrieve_perms = HasProjectPerm('view_issues') | IsAttachmentOwnerPerm() - create_perms = HasProjectPerm('modify_issue') + create_perms = HasProjectPerm('modify_issue') | (CommentAttachmentPerm() & HasProjectPerm('comment_issue')) update_perms = HasProjectPerm('modify_issue') | IsAttachmentOwnerPerm() partial_update_perms = HasProjectPerm('modify_issue') | IsAttachmentOwnerPerm() destroy_perms = HasProjectPerm('modify_issue') | IsAttachmentOwnerPerm() @@ -66,7 +72,7 @@ class IssueAttachmentPermission(TaigaResourcePermission): class WikiAttachmentPermission(TaigaResourcePermission): retrieve_perms = HasProjectPerm('view_wiki_pages') | IsAttachmentOwnerPerm() - create_perms = HasProjectPerm('modify_wiki_page') + create_perms = HasProjectPerm('modify_wiki_page') | (CommentAttachmentPerm() & HasProjectPerm('comment_wiki_page')) update_perms = HasProjectPerm('modify_wiki_page') | IsAttachmentOwnerPerm() partial_update_perms = HasProjectPerm('modify_wiki_page') | IsAttachmentOwnerPerm() destroy_perms = HasProjectPerm('modify_wiki_page') | IsAttachmentOwnerPerm() diff --git a/taiga/projects/attachments/serializers.py b/taiga/projects/attachments/serializers.py index 17176466..398dabdd 100644 --- a/taiga/projects/attachments/serializers.py +++ b/taiga/projects/attachments/serializers.py @@ -35,6 +35,7 @@ class AttachmentSerializer(serializers.LightSerializer): url = Field() description = Field() is_deprecated = Field() + from_comment = Field() created_date = Field() modified_date = Field() object_id = Field() diff --git a/taiga/projects/attachments/validators.py b/taiga/projects/attachments/validators.py index 72355ce4..2ed32e11 100644 --- a/taiga/projects/attachments/validators.py +++ b/taiga/projects/attachments/validators.py @@ -29,5 +29,5 @@ class AttachmentValidator(validators.ModelValidator): model = models.Attachment fields = ("id", "project", "owner", "name", "attached_file", "size", "description", "is_deprecated", "created_date", - "modified_date", "object_id", "order", "sha1") + "modified_date", "object_id", "order", "sha1", "from_comment") read_only_fields = ("owner", "created_date", "modified_date", "sha1") diff --git a/tests/integration/resources_permissions/test_attachment_resources.py b/tests/integration/resources_permissions/test_attachment_resources.py index 456c96f2..02afaa2e 100644 --- a/tests/integration/resources_permissions/test_attachment_resources.py +++ b/tests/integration/resources_permissions/test_attachment_resources.py @@ -1027,3 +1027,67 @@ def test_wiki_attachment_list(client, data, data_wiki): results = helper_test_http_method_and_count(client, 'get', url, None, users) assert results == [(200, 2), (200, 2), (200, 2), (200, 4), (200, 4)] + + +def test_create_attachment_by_external_user_without_comment_permission(client): + issue = f.create_issue() + user = f.UserFactory() + + assert issue.owner != user + assert issue.project.owner != user + + url = reverse("issue-attachments-list") + + data = {"description": "test", + "object_id": issue.pk, + "project": issue.project.id, + "attached_file": SimpleUploadedFile("test.txt", b"test"), + "from_comment": True} + + client.login(user) + response = client.post(url, data) + assert response.status_code == 403 + + +def test_create_attachment_by_external_user_with_comment_permission_but_without_from_comment_flag(client): + project = f.ProjectFactory(public_permissions=['comment_issue']) + issue = f.create_issue(project=project) + + user = f.UserFactory() + + assert issue.owner != user + assert issue.project.owner != user + + url = reverse("issue-attachments-list") + + data = {"description": "test", + "object_id": issue.pk, + "project": issue.project.id, + "attached_file": SimpleUploadedFile("test.txt", b"test"), + "from_comment": False} + + client.login(user) + response = client.post(url, data) + assert response.status_code == 403 + + +def test_create_attachment_by_external_user_with_comment_permission_and_with_from_comment_flag(client): + project = f.ProjectFactory(public_permissions=['comment_issue']) + issue = f.create_issue(project=project) + + user = f.UserFactory() + + assert issue.owner != user + assert issue.project.owner != user + + url = reverse("issue-attachments-list") + + data = {"description": "test", + "object_id": issue.pk, + "project": issue.project.id, + "attached_file": SimpleUploadedFile("test.txt", b"test"), + "from_comment": True} + + client.login(user) + response = client.post(url, data) + assert response.status_code == 201 From 49033f323a16d79218b9fceeb34eef0f23b75ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Fri, 20 Jan 2017 09:49:04 +0100 Subject: [PATCH 090/144] [i18n] Update locales --- taiga/locale/ca/LC_MESSAGES/django.po | 12 +- taiga/locale/de/LC_MESSAGES/django.po | 12 +- taiga/locale/en/LC_MESSAGES/django.po | 10 +- taiga/locale/es/LC_MESSAGES/django.po | 193 +++++++++++++++++---- taiga/locale/fi/LC_MESSAGES/django.po | 12 +- taiga/locale/fr/LC_MESSAGES/django.po | 12 +- taiga/locale/it/LC_MESSAGES/django.po | 12 +- taiga/locale/ja/LC_MESSAGES/django.po | 12 +- taiga/locale/ko/LC_MESSAGES/django.po | 19 +- taiga/locale/nb/LC_MESSAGES/django.po | 12 +- taiga/locale/nl/LC_MESSAGES/django.po | 12 +- taiga/locale/pl/LC_MESSAGES/django.po | 12 +- taiga/locale/pt_BR/LC_MESSAGES/django.po | 12 +- taiga/locale/ru/LC_MESSAGES/django.po | 12 +- taiga/locale/sv/LC_MESSAGES/django.po | 12 +- taiga/locale/tr/LC_MESSAGES/django.po | 12 +- taiga/locale/zh-Hans/LC_MESSAGES/django.po | 12 +- taiga/locale/zh-Hant/LC_MESSAGES/django.po | 12 +- taiga/projects/attachments/models.py | 2 +- 19 files changed, 303 insertions(+), 101 deletions(-) diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index 59cd9ec1..b26631a2 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ca/)\n" @@ -773,7 +773,7 @@ msgstr "" msgid "web" msgstr "" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1287,7 +1287,11 @@ msgstr "" msgid "is deprecated" msgstr "està obsolet " -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/de/LC_MESSAGES/django.po b/taiga/locale/de/LC_MESSAGES/django.po index f22e7047..3e67770d 100644 --- a/taiga/locale/de/LC_MESSAGES/django.po +++ b/taiga/locale/de/LC_MESSAGES/django.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/de/)\n" @@ -924,7 +924,7 @@ msgstr "Icon URL" msgid "web" msgstr "Web" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1440,7 +1440,11 @@ msgstr "SHA1" msgid "is deprecated" msgstr "wurde verworfen" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/en/LC_MESSAGES/django.po b/taiga/locale/en/LC_MESSAGES/django.po index e95da197..972c5c1c 100644 --- a/taiga/locale/en/LC_MESSAGES/django.po +++ b/taiga/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" "PO-Revision-Date: 2015-03-25 20:09+0100\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Taiga Dev Team \n" @@ -762,7 +762,7 @@ msgstr "" msgid "web" msgstr "" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1260,7 +1260,11 @@ msgstr "" msgid "is deprecated" msgstr "" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/es/LC_MESSAGES/django.po b/taiga/locale/es/LC_MESSAGES/django.po index 98b2b4d1..c1e697bb 100644 --- a/taiga/locale/es/LC_MESSAGES/django.po +++ b/taiga/locale/es/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the taiga-back package. # # Translators: -# David Barragán , 2015-2016 +# David Barragán , 2015-2017 # Esther Moreno , 2015 # Gustavo Díaz Jaimes , 2015 # Hector Colina , 2015 @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/es/)\n" @@ -447,6 +447,27 @@ msgid "" " \n" " " msgstr "" +"\n" +" Ayuda de Taiga:\n" +" %(support_url)s\n" +"
    \n" +" Contacta con " +"nosotros:\n" +" \n" +" %(support_email)s\n" +" \n" +"
    \n" +" Lista de correo:" +"\n" +" \n" +" %(mailing_list_url)s\n" +" \n" +" " #: taiga/base/templates/emails/hero-body-html.jinja:6 msgid "You have been Taigatized" @@ -565,7 +586,7 @@ msgstr "error importando los enlaces del wiki" #: taiga/export_import/services/store.py:806 msgid "error importing tags" -msgstr "error importando las etiquetas" +msgstr "error importando los tags" #: taiga/export_import/services/store.py:810 msgid "error importing timelines" @@ -905,7 +926,7 @@ msgstr "URL del icono" msgid "web" msgstr "web" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1035,6 +1056,11 @@ msgid "" "\n" "\"{comment_message}\"" msgstr "" +"[@{user_name}]({user_url} \"Ver el perfil de @{user_name} en {platform}\") " +"dice en el comentario [{platform}#{number}]({comment_url} \"Ir al comentario" +"\"):\n" +"\n" +"\"{comment_message}\"" #: taiga/hooks/event_hooks.py:71 #, python-brace-format @@ -1057,6 +1083,9 @@ msgid "" "Issue created by [@{user_name}]({user_url} \"See @{user_name}'s {platform} " "profile\") from [{platform}#{number}]({url} \"Go to issue\")." msgstr "" +"Petición creada por [@{user_name}]({user_url} \"Ver el perfil de " +"@{user_name} en {platform}\") desde [{platform}#{number}]({url} \"Ir a la " +"petición\")." #: taiga/hooks/event_hooks.py:107 #, python-brace-format @@ -1079,6 +1108,10 @@ msgid "" "\n" " - Status: **{src_status}** → **{dst_status}**" msgstr "" +"{user_text} cambió el estado desde un [commit en {platform}]({commit_url} " +"\"Vel el commit '{commit_id} - {commit_message}'\")\n" +"\n" +" - Estado: **{src_status}** → **{dst_status}**" #: taiga/hooks/event_hooks.py:161 #, python-brace-format @@ -1087,6 +1120,9 @@ msgid "" "\n" " - Status: **{src_status}** → **{dst_status}**" msgstr "" +"Cambiado el estado desde un commit de {platform}.\n" +"\n" +" - Estado: **{src_status}** → **{dst_status}**" #: taiga/hooks/event_hooks.py:179 #, python-brace-format @@ -1095,12 +1131,17 @@ msgid "" "({commit_url} \"See commit '{commit_id} - {commit_message}'\") " "\"{commit_message}\"" msgstr "" +"Esta {type_name} ha sido mencionada por {user_text} en el [commit de " +"{platform}]({commit_url} \"Ver commit '{commit_id} - {commit_message}'\") " +"\"{commit_message}\"" #: taiga/hooks/event_hooks.py:184 #, python-brace-format msgid "" "This issue has been mentioned in the {platform} commit \"{commit_message}\"" msgstr "" +"Esta pertición ha sido mencionada en el commit de {platform} " +"\"{commit_message}\"" #: taiga/hooks/event_hooks.py:206 msgid "The referenced element doesn't exist" @@ -1372,7 +1413,7 @@ msgstr "La actualización parcial no está soportada." #: taiga/projects/attachments/api.py:69 msgid "Object id issue isn't exists" -msgstr "" +msgstr "El 'Object id' de la petición no existe" #: taiga/projects/attachments/api.py:72 msgid "Project ID not matches between object and project" @@ -1423,7 +1464,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "está desactualizado" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 @@ -1475,6 +1520,11 @@ msgid "" "written to %(project_name)s\n" " " msgstr "" +"\n" +" %(full_name)s ha " +"escrito a %(project_name)s\n" +" " #: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 #, python-format @@ -1488,6 +1538,14 @@ msgid "" "not be affected.\n" " " msgstr "" +"\n" +" Estás recibiendo este mensaje porque perteneces al grupo de " +"administradores del proyecto %(project_name)s. Si no quieres que nadie más " +"de la comunidad de Taiga pueda contactar con tu proyecto, actualiza la configuración de tu proyecto " +"en el panel de administración deshabilitando esta funcionalidad. El resto de " +"comunicaciones entre los miembros del proyecto no se verán afectadas por " +"este cambio." #: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 #, python-format @@ -1495,6 +1553,8 @@ msgid "" "\n" "%(full_name)s has written to %(project_name)s\n" msgstr "" +"\n" +"%(full_name)s ha escrito a %(project_name)s\n" #: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 #, python-format @@ -1506,6 +1566,13 @@ msgid "" "%(project_settings_url)s to prevent such contacts. Regular communications " "amongst members of the project will not be affected.\n" msgstr "" +"\n" +"Estás recibiendo este mensaje porque perteneces al grupo de administradores " +"del proyecto %(project_name)s. Si no quieres que nadie más de la comunidad " +"de Taiga pueda contactar con tu proyecto, actualiza la configuración de tu " +"proyecto en el panel de administración en %(project_settings_url)s " +"deshabilitando esta funcionalidad. El resto de comunicaciones entre los " +"miembros del proyecto no se verán afectadas por este cambio.\n" #: taiga/projects/contact/templates/emails/contact_notification-subject.jinja:1 #, python-format @@ -1513,6 +1580,8 @@ msgid "" "\n" "[Taiga] %(full_name)s has sent a message to the project %(project_name)s\n" msgstr "" +"\n" +"[Taiga] %(full_name)s ha enviado un mensaje al proyecto %(project_name)s\n" #: taiga/projects/custom_attributes/choices.py:29 msgid "Text" @@ -1524,7 +1593,7 @@ msgstr "Texto multilínea" #: taiga/projects/custom_attributes/choices.py:31 msgid "Rich text" -msgstr "" +msgstr "Texto enriquecido" #: taiga/projects/custom_attributes/choices.py:32 msgid "Date" @@ -1841,7 +1910,7 @@ msgstr "" #: taiga/projects/milestones/validators.py:33 msgid "There's no milestone with that id" -msgstr "" +msgstr "No hay milestones con este id" #: taiga/projects/mixins/blocked.py:31 msgid "is blocked" @@ -1849,11 +1918,11 @@ msgstr "está bloqueada" #: taiga/projects/mixins/by_ref.py:32 msgid "ref param is needed" -msgstr "" +msgstr "el parametro ref es necesario" #: taiga/projects/mixins/by_ref.py:35 msgid "project or project__slug param is needed" -msgstr "" +msgstr "el parámetro project o project__slug es necesario" #: taiga/projects/mixins/ordering.py:49 #, python-brace-format @@ -1938,7 +2007,7 @@ msgstr "puntos de historia totales" #: taiga/projects/models.py:172 taiga/projects/models.py:751 msgid "active contact" -msgstr "" +msgstr "activar contacto" #: taiga/projects/models.py:174 taiga/projects/models.py:753 msgid "active epics panel" @@ -1994,7 +2063,7 @@ msgstr "está buscando a gente" #: taiga/projects/models.py:208 taiga/projects/models.py:765 msgid "looking for people note" -msgstr "" +msgstr "notas sobre la búsqueda de gente" #: taiga/projects/models.py:222 msgid "project transfer token" @@ -2100,19 +2169,19 @@ msgstr "roles" #: taiga/projects/models.py:782 msgid "epic custom attributes" -msgstr "" +msgstr "atributos personalizados de épicas" #: taiga/projects/models.py:783 msgid "us custom attributes" -msgstr "" +msgstr "atributos personalizados de histórias" #: taiga/projects/models.py:784 msgid "task custom attributes" -msgstr "" +msgstr "atributos personalizados de tareas" #: taiga/projects/models.py:785 msgid "issue custom attributes" -msgstr "" +msgstr "atributos personalizados de peticiones" #: taiga/projects/notifications/choices.py:30 msgid "Involved" @@ -2165,6 +2234,14 @@ msgid "" "%(subject)s in Taiga\">See epic\n" " " msgstr "" +"\n" +"

    Épica actualizada

    \n" +"

    Hola %(user)s,
    %(changer)s ha actualizado una épica en " +"%(project)s

    \n" +"

    Épica #%(ref)s %(subject)s

    \n" +" Ver épica\n" +" " #: taiga/projects/notifications/templates/emails/epics/epic-change-body-text.jinja:3 #, python-format @@ -2174,6 +2251,10 @@ msgid "" "Hello %(user)s, %(changer)s has updated a epic on %(project)s\n" "See epic #%(ref)s %(subject)s at %(url)s\n" msgstr "" +"\n" +"Épica actualizada\n" +"Hola %(user)s, %(changer)s ha actualizado una épica en %(project)s\n" +"Ver épica #%(ref)s %(subject)s en %(url)s\n" #: taiga/projects/notifications/templates/emails/epics/epic-change-subject.jinja:1 #, python-format @@ -2181,6 +2262,8 @@ msgid "" "\n" "[%(project)s] Updated the epic #%(ref)s \"%(subject)s\"\n" msgstr "" +"\n" +"[%(project)s] Actualizada la épica #%(ref)s \"%(subject)s\"\n" #: taiga/projects/notifications/templates/emails/epics/epic-create-body-html.jinja:4 #, python-format @@ -2195,6 +2278,14 @@ msgid "" "

    The Taiga Team

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

    Nueva épica creada

    \n" +"

    Hola %(user)s,
    %(changer)s ha creado una nueva épica en " +"%(project)s

    \n" +"

    Épica #%(ref)s %(subject)s

    \n" +" Ver épica\n" +"

    El equipo de Taiga

    " #: taiga/projects/notifications/templates/emails/epics/epic-create-body-text.jinja:1 #, python-format @@ -2207,6 +2298,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"Nueva épica creada\n" +"Hola %(user)s, %(changer)s ha creado una nueva épica en %(project)s\n" +"Ver épica #%(ref)s %(subject)s en %(url)s\n" +"\n" +"---\n" +"El equipo de Taiga\n" #: taiga/projects/notifications/templates/emails/epics/epic-create-subject.jinja:1 #, python-format @@ -2214,6 +2312,8 @@ msgid "" "\n" "[%(project)s] Created the epic #%(ref)s \"%(subject)s\"\n" msgstr "" +"\n" +"[%(project)s] Creada la épica #%(ref)s \"%(subject)s\"\n" #: taiga/projects/notifications/templates/emails/epics/epic-delete-body-html.jinja:4 #, python-format @@ -2226,6 +2326,13 @@ msgid "" "

    The Taiga Team

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

    Épica borrada

    \n" +"

    Hola %(user)s,
    %(changer)s ha borrado una épica en %(project)s\n" +"

    Épica #%(ref)s %(subject)s

    \n" +"

    El equipo de Taiga

    \n" +" " #: taiga/projects/notifications/templates/emails/epics/epic-delete-body-text.jinja:1 #, python-format @@ -2238,6 +2345,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"Épica borrada\n" +"Hola %(user)s, %(changer)s ha borrado una épica en %(project)s\n" +"Épica #%(ref)s %(subject)s\n" +"\n" +"---\n" +"El equipo de Taiga\n" #: taiga/projects/notifications/templates/emails/epics/epic-delete-subject.jinja:1 #, python-format @@ -2245,6 +2359,8 @@ msgid "" "\n" "[%(project)s] Deleted the epic #%(ref)s \"%(subject)s\"\n" msgstr "" +"\n" +"[%(project)s] Borrada la épica #%(ref)s \"%(subject)s\"\n" #: taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja:4 #, python-format @@ -2994,7 +3110,7 @@ msgstr "Ha alcanzado el limite de miembros para proyectos públicos" #: taiga/projects/services/members.py:148 msgid "You have reached the current limit of pending memberships" -msgstr "" +msgstr "Ha alcanzado el límite actual de invitaciones pendientes" #: taiga/projects/services/projects.py:101 #: taiga/projects/services/projects.py:141 taiga/users/services.py:589 @@ -3043,6 +3159,7 @@ msgstr "El token ha expirado" #, python-brace-format msgid "Invalid tag '{value}'. The color is not a valid HEX color or null." msgstr "" +"Etiqueta '{value}' inválida. El color no es un valor HEX válido o null." #: taiga/projects/tagging/fields.py:55 #, python-brace-format @@ -3057,14 +3174,16 @@ msgstr "" #, python-brace-format msgid "Invalid tag '{value}'. It must be the tag name." msgstr "" +"'{value}' no es un tag válido. tiene que ser nombre o '[\"name\", \"hex " +"color/\" | null]'." #: taiga/projects/tagging/models.py:27 msgid "tags" -msgstr "etiquetas" +msgstr "tags" #: taiga/projects/tagging/models.py:35 msgid "tags colors" -msgstr "colores de etiquetas" +msgstr "colores de tags" #: taiga/projects/tagging/validators.py:47 #: taiga/projects/tagging/validators.py:74 @@ -3109,7 +3228,7 @@ msgstr "tiene iocaína" #: taiga/projects/tasks/validators.py:59 msgid "Invalid milestone id." -msgstr "" +msgstr "invalido id de milestone." #: taiga/projects/tasks/validators.py:70 msgid "Invalid task status id." @@ -3117,25 +3236,30 @@ msgstr "Estado de la tarea tiene un id que no es válido" #: taiga/projects/tasks/validators.py:83 msgid "Invalid user story id." -msgstr "" +msgstr "inválido id de historia de usuario." #: taiga/projects/tasks/validators.py:107 msgid "Invalid task status id. The status must belong to the same project." msgstr "" +"Invalido id de estado de tarea. El estado debe pertenecer al mismo proyecto." #: taiga/projects/tasks/validators.py:121 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" +"Invalido id de historia de usuario. La historia debe pertenecer al mismo " +"proyecto." #: taiga/projects/tasks/validators.py:133 msgid "Invalid milestone id. The milestone must belong to the same project." -msgstr "" +msgstr "Invalido id de milestone. El estado debe pertenecer al mismo proyecto." #: taiga/projects/tasks/validators.py:150 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." msgstr "" +"Inválidos ids de tareas. Todas las tareas deben pertenecer al msimo proyecto " +"y, si existe, al mismo estado, historia de usuario y/o milestone." #: taiga/projects/templates/emails/membership_invitation-body-html.jinja:6 #: taiga/projects/templates/emails/membership_invitation-body-text.jinja:4 @@ -3851,12 +3975,12 @@ msgstr "" #: taiga/projects/userstories/api.py:221 #, python-brace-format msgid "Invalid role id '{role_id}'" -msgstr "" +msgstr "Inválido id de rol '{role_id}'" #: taiga/projects/userstories/api.py:228 #, python-brace-format msgid "Invalid points id '{points_id}'" -msgstr "" +msgstr "Inválido id de punto de historia '{points_id}'" #: taiga/projects/userstories/api.py:243 #, python-brace-format @@ -3877,7 +4001,7 @@ msgstr "orden en el sprint" #: taiga/projects/userstories/models.py:84 msgid "kanban order" -msgstr "" +msgstr "orden kanban" #: taiga/projects/userstories/models.py:92 msgid "finish date" @@ -3896,24 +4020,28 @@ msgstr "No existe ninguna historia de usuario con este id" msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" +"Invalido id de estado de historia de usuario. El estado debe pertenecer al " +"mismo proyecto." #: taiga/projects/userstories/validators.py:120 msgid "Invalid milestone id. The milistone must belong to the same project." -msgstr "" +msgstr "Invalido id de milestone. El estado debe pertenecer al mismo proyecto." #: taiga/projects/userstories/validators.py:135 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" +"Inválidos ids de historias de usuario. Todas las historias deben pertenecer " +"al msimo proyecto y, si existe, al mismo estado y milestone." #: taiga/projects/userstories/validators.py:159 msgid "The milestone isn't valid for the project" -msgstr "" +msgstr "El milestone no es válido para este proyecto" #: taiga/projects/userstories/validators.py:169 msgid "All the user stories must be from the same project" -msgstr "" +msgstr "Todas las historias de usuario deben ser del mismo proyecto" #: taiga/projects/validators.py:63 msgid "There's no project with that id" @@ -3921,7 +4049,7 @@ msgstr "No existe ningún proyecto con este id" #: taiga/projects/validators.py:145 msgid "The user yet exists in the project" -msgstr "" +msgstr "El usuario aún existe en el proyecto" #: taiga/projects/validators.py:155 msgid "Invalid role for the project" @@ -3929,7 +4057,7 @@ msgstr "Rol inválido para el proyecto" #: taiga/projects/validators.py:170 taiga/projects/validators.py:225 msgid "The user must be a valid contact" -msgstr "" +msgstr "El usuario debe ser un contacto válido" #: taiga/projects/validators.py:191 msgid "The project owner must be admin." @@ -3943,6 +4071,7 @@ msgstr "" #: taiga/projects/validators.py:240 msgid "Invalid role ids. All roles must belong to the same project." msgstr "" +"'role ids' inválidos. Todos los roles deben pertenecer al mismo proyecto." #: taiga/projects/validators.py:264 msgid "Default options" @@ -4150,7 +4279,7 @@ msgstr "zona horaria por defecto" #: taiga/users/models.py:154 msgid "colorize tags" -msgstr "añade color a las etiquetas" +msgstr "añade color a los tags" #: taiga/users/models.py:159 msgid "email token" diff --git a/taiga/locale/fi/LC_MESSAGES/django.po b/taiga/locale/fi/LC_MESSAGES/django.po index d6b6d9ce..082d726b 100644 --- a/taiga/locale/fi/LC_MESSAGES/django.po +++ b/taiga/locale/fi/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fi/)\n" @@ -867,7 +867,7 @@ msgstr "" msgid "web" msgstr "" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1382,7 +1382,11 @@ msgstr "" msgid "is deprecated" msgstr "on poistettu" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/fr/LC_MESSAGES/django.po b/taiga/locale/fr/LC_MESSAGES/django.po index 3aa97f20..7be6412f 100644 --- a/taiga/locale/fr/LC_MESSAGES/django.po +++ b/taiga/locale/fr/LC_MESSAGES/django.po @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fr/)\n" @@ -901,7 +901,7 @@ msgstr "Url de l'icône" msgid "web" msgstr "web" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1416,7 +1416,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "est obsolète" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/it/LC_MESSAGES/django.po b/taiga/locale/it/LC_MESSAGES/django.po index bf059711..f7237700 100644 --- a/taiga/locale/it/LC_MESSAGES/django.po +++ b/taiga/locale/it/LC_MESSAGES/django.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/it/)\n" @@ -978,7 +978,7 @@ msgstr "Url dell'icona" msgid "web" msgstr "web" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1520,7 +1520,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "non approvato" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po index 7eccc581..dab8d95d 100644 --- a/taiga/locale/ja/LC_MESSAGES/django.po +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Japanese (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ja/)\n" @@ -914,7 +914,7 @@ msgstr "アイコンのURL" msgid "web" msgstr "ウェブ" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1454,7 +1454,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "は廃止予定である" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/ko/LC_MESSAGES/django.po b/taiga/locale/ko/LC_MESSAGES/django.po index 6e8847a2..f44b4bfe 100644 --- a/taiga/locale/ko/LC_MESSAGES/django.po +++ b/taiga/locale/ko/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Korean (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ko/)\n" @@ -914,7 +914,7 @@ msgstr "아이콘 url" msgid "web" msgstr "웹" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1449,7 +1449,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "지원안함" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 @@ -1544,6 +1548,11 @@ msgid "" "%(project_settings_url)s to prevent such contacts. Regular communications " "amongst members of the project will not be affected.\n" msgstr "" +"\n" +"이 메시지는 당신이 %(project_name)s 이름의 프로젝트의 관리자로 되어기 때문에 " +"수신되었습니다. 타이가 커뮤니티의 회원이 귀하의 프로젝트에 연락하기를 원치 않" +"으시면, %(project_settings_url)s 에서 당신의 프로젝트 설정을 변경하십시오. 프" +"로젝트 회원간의 대화에는 영향을 받지 않습니다.\n" #: taiga/projects/contact/templates/emails/contact_notification-subject.jinja:1 #, python-format @@ -2033,7 +2042,7 @@ msgstr "구인중" #: taiga/projects/models.py:208 taiga/projects/models.py:765 msgid "looking for people note" -msgstr "" +msgstr "구인 메모" #: taiga/projects/models.py:222 msgid "project transfer token" diff --git a/taiga/locale/nb/LC_MESSAGES/django.po b/taiga/locale/nb/LC_MESSAGES/django.po index 56141588..63350d7a 100644 --- a/taiga/locale/nb/LC_MESSAGES/django.po +++ b/taiga/locale/nb/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/nb/)\n" @@ -783,7 +783,7 @@ msgstr "Ikon url" msgid "web" msgstr "web" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1299,7 +1299,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "er foreldet" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/nl/LC_MESSAGES/django.po b/taiga/locale/nl/LC_MESSAGES/django.po index 4e45439f..8bb082e3 100644 --- a/taiga/locale/nl/LC_MESSAGES/django.po +++ b/taiga/locale/nl/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/nl/)\n" @@ -813,7 +813,7 @@ msgstr "" msgid "web" msgstr "" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1327,7 +1327,11 @@ msgstr "" msgid "is deprecated" msgstr "is verouderd" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/pl/LC_MESSAGES/django.po b/taiga/locale/pl/LC_MESSAGES/django.po index d7a138c6..90024b91 100644 --- a/taiga/locale/pl/LC_MESSAGES/django.po +++ b/taiga/locale/pl/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/pl/)\n" @@ -881,7 +881,7 @@ msgstr "" msgid "web" msgstr "web" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1395,7 +1395,11 @@ msgstr "" msgid "is deprecated" msgstr "jest przestarzałe" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/pt_BR/LC_MESSAGES/django.po b/taiga/locale/pt_BR/LC_MESSAGES/django.po index ebe0438d..decc64bb 100644 --- a/taiga/locale/pt_BR/LC_MESSAGES/django.po +++ b/taiga/locale/pt_BR/LC_MESSAGES/django.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/pt_BR/)\n" @@ -913,7 +913,7 @@ msgstr "Ícone da url" msgid "web" msgstr "web" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1429,7 +1429,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "está obsoleto" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/ru/LC_MESSAGES/django.po b/taiga/locale/ru/LC_MESSAGES/django.po index a678cf9b..0c306afd 100644 --- a/taiga/locale/ru/LC_MESSAGES/django.po +++ b/taiga/locale/ru/LC_MESSAGES/django.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ru/)\n" @@ -905,7 +905,7 @@ msgstr "url иконки" msgid "web" msgstr "веб" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1424,7 +1424,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "устаревшее" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/sv/LC_MESSAGES/django.po b/taiga/locale/sv/LC_MESSAGES/django.po index 41667a93..76e3b414 100644 --- a/taiga/locale/sv/LC_MESSAGES/django.po +++ b/taiga/locale/sv/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Swedish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/sv/)\n" @@ -780,7 +780,7 @@ msgstr "Ikonlänk" msgid "web" msgstr "Internet" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1278,7 +1278,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "undviks" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/tr/LC_MESSAGES/django.po b/taiga/locale/tr/LC_MESSAGES/django.po index 9c0206b7..e3f390ef 100644 --- a/taiga/locale/tr/LC_MESSAGES/django.po +++ b/taiga/locale/tr/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Turkish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/tr/)\n" @@ -875,7 +875,7 @@ msgstr "İkon url" msgid "web" msgstr "web" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1387,7 +1387,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "kaldırıldı" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/zh-Hans/LC_MESSAGES/django.po b/taiga/locale/zh-Hans/LC_MESSAGES/django.po index fb44b60c..b933eb72 100644 --- a/taiga/locale/zh-Hans/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hans/LC_MESSAGES/django.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Simplified (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hans/)\n" @@ -906,7 +906,7 @@ msgstr "图标地址" msgid "web" msgstr "网页" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1438,7 +1438,11 @@ msgstr "SHA1" msgid "is deprecated" msgstr "已废弃" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/locale/zh-Hant/LC_MESSAGES/django.po b/taiga/locale/zh-Hant/LC_MESSAGES/django.po index 2f6dfb9f..21155fd7 100644 --- a/taiga/locale/zh-Hant/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hant/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 17:35+0100\n" -"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"POT-Creation-Date: 2017-01-20 09:45+0100\n" +"PO-Revision-Date: 2017-01-20 08:45+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hant/)\n" @@ -861,7 +861,7 @@ msgstr "網址圖標" msgid "web" msgstr "網頁" -#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 @@ -1372,7 +1372,11 @@ msgstr "sha1" msgid "is deprecated" msgstr "棄用" -#: taiga/projects/attachments/models.py:62 +#: taiga/projects/attachments/models.py:61 +msgid "from_comment" +msgstr "" + +#: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 #: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 diff --git a/taiga/projects/attachments/models.py b/taiga/projects/attachments/models.py index 0e7449d9..d986dbd4 100644 --- a/taiga/projects/attachments/models.py +++ b/taiga/projects/attachments/models.py @@ -58,7 +58,7 @@ class Attachment(models.Model): sha1 = models.CharField(default="", max_length=40, verbose_name=_("sha1"), blank=True) is_deprecated = models.BooleanField(default=False, verbose_name=_("is deprecated")) - from_comment = models.BooleanField(default=False, verbose_name=_("from_comment")) + from_comment = models.BooleanField(default=False, verbose_name=_("from comment")) description = models.TextField(null=False, blank=True, verbose_name=_("description")) order = models.IntegerField(default=0, null=False, blank=False, verbose_name=_("order")) From 32a4473304d730cd21476681606c75ec904af611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Fri, 20 Jan 2017 10:03:39 +0100 Subject: [PATCH 091/144] [i18n] Fix script --- scripts/manage_translations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manage_translations.py b/scripts/manage_translations.py index c7a2d1ff..20ad70b1 100755 --- a/scripts/manage_translations.py +++ b/scripts/manage_translations.py @@ -246,7 +246,7 @@ You need transifex-client, install it. or - $ pip install --upgrade transifex-client==0.11.1.beta + $ pip install --upgrade transifex-client==0.12.2 2. Create ~/.transifexrc file: From b82603428ca802cfbf9986be62cf398e94938a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 20 Jan 2017 11:38:48 +0100 Subject: [PATCH 092/144] Improve the discover-speed --- taiga/projects/api.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/taiga/projects/api.py b/taiga/projects/api.py index 91d850d3..d0cdb91e 100644 --- a/taiga/projects/api.py +++ b/taiga/projects/api.py @@ -107,7 +107,15 @@ class ProjectViewSet(LikedResourceMixin, HistoryResourceMixin, def get_queryset(self): qs = super().get_queryset() qs = qs.select_related("owner") - qs = project_utils.attach_extra_info(qs, user=self.request.user) + if self.request.QUERY_PARAMS.get('discover_mode', False): + qs = project_utils.attach_members(qs) + qs = project_utils.attach_notify_policies(qs) + qs = project_utils.attach_is_fan(qs, user=self.request.user) + qs = project_utils.attach_my_role_permissions(qs, user=self.request.user) + qs = project_utils.attach_my_role_permissions(qs, user=self.request.user) + qs = project_utils.attach_closed_milestones(qs) + else: + qs = project_utils.attach_extra_info(qs, user=self.request.user) # If filtering an activity period we must exclude the activities not updated recently enough now = timezone.now() From 253e7b81d87b8ed64c5205ec3816da837f2d7f30 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 24 Jan 2017 08:13:41 +0100 Subject: [PATCH 093/144] Improving cancel account API endpoint --- taiga/users/models.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/taiga/users/models.py b/taiga/users/models.py index 499b094c..e1e7e173 100644 --- a/taiga/users/models.py +++ b/taiga/users/models.py @@ -41,6 +41,7 @@ from taiga.auth.tokens import get_token_for_user from taiga.base.utils.colors import generate_random_hex_color from taiga.base.utils.slug import slugify_uniquely from taiga.base.utils.files import get_file_path +from taiga.base.utils.time import timestamp_ms from taiga.permissions.choices import MEMBERS_PERMISSIONS from taiga.projects.choices import BLOCKED_BY_OWNER_LEAVING from taiga.projects.notifications.choices import NotifyLevel @@ -264,7 +265,7 @@ class User(AbstractBaseUser, PermissionsMixin): qs = User.objects.filter(is_active=True) project_ids = services.get_visible_project_ids(self, user) qs = qs.filter(memberships__project_id__in=project_ids) - qs = qs.exclude(id=self.id) + qs = qs.exclude(id=self.id) return qs def save(self, *args, **kwargs): @@ -273,7 +274,8 @@ class User(AbstractBaseUser, PermissionsMixin): def cancel(self): with advisory_lock("delete-user"): - self.username = slugify_uniquely("deleted-user", User, slugfield="username") + deleted_user_prefix = "deleted-user-{}".format(timestamp_ms()) + self.username = slugify_uniquely(deleted_user_prefix, User, slugfield="username") self.email = "{}@taiga.io".format(self.username) self.is_active = False self.full_name = "Deleted user" From 45bb5c4d9bfd045d6496e7d645ba6ef7f2d1efde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 26 Jan 2017 20:30:17 +0100 Subject: [PATCH 094/144] Fix Issue #5910: Create validator for assign_to attr --- taiga/projects/epics/validators.py | 6 +- taiga/projects/issues/validators.py | 3 +- taiga/projects/mixins/validators.py | 21 ++++ taiga/projects/tasks/validators.py | 4 +- taiga/projects/userstories/validators.py | 7 +- tests/factories.py | 1 + tests/integration/test_epics.py | 118 ++++++++++++++++++++++ tests/integration/test_issues.py | 120 ++++++++++++++++++++++- tests/integration/test_tasks.py | 118 ++++++++++++++++++++++ tests/integration/test_userstories.py | 117 ++++++++++++++++++++++ 10 files changed, 506 insertions(+), 9 deletions(-) create mode 100644 taiga/projects/mixins/validators.py diff --git a/taiga/projects/epics/validators.py b/taiga/projects/epics/validators.py index 7ed00481..f5d71ab2 100644 --- a/taiga/projects/epics/validators.py +++ b/taiga/projects/epics/validators.py @@ -22,10 +22,10 @@ from taiga.base.api import serializers from taiga.base.api import validators from taiga.base.exceptions import ValidationError from taiga.base.fields import PgArrayField +from taiga.projects.mixins.validators import AssignedToValidator from taiga.projects.notifications.mixins import EditableWatchedResourceSerializer from taiga.projects.notifications.validators import WatchersValidator from taiga.projects.tagging.fields import TagsAndTagsColorsField -from taiga.projects.userstories.validators import UserStoryExistsValidator from taiga.projects.validators import ProjectExistsValidator from . import models @@ -39,7 +39,8 @@ class EpicExistsValidator: return attrs -class EpicValidator(WatchersValidator, EditableWatchedResourceSerializer, validators.ModelValidator): +class EpicValidator(AssignedToValidator, WatchersValidator, EditableWatchedResourceSerializer, + validators.ModelValidator): tags = TagsAndTagsColorsField(default=[], required=False) external_reference = PgArrayField(required=False) @@ -61,7 +62,6 @@ class CreateRelatedUserStoriesBulkValidator(ProjectExistsValidator, EpicExistsVa bulk_userstories = serializers.CharField() - class EpicRelatedUserStoryValidator(validators.ModelValidator): class Meta: model = models.RelatedUserStory diff --git a/taiga/projects/issues/validators.py b/taiga/projects/issues/validators.py index 4c900c15..5052fb54 100644 --- a/taiga/projects/issues/validators.py +++ b/taiga/projects/issues/validators.py @@ -19,6 +19,7 @@ from taiga.base.api import serializers from taiga.base.api import validators from taiga.base.fields import PgArrayField +from taiga.projects.mixins.validators import AssignedToValidator from taiga.projects.notifications.mixins import EditableWatchedResourceSerializer from taiga.projects.notifications.validators import WatchersValidator from taiga.projects.tagging.fields import TagsAndTagsColorsField @@ -27,7 +28,7 @@ from taiga.projects.validators import ProjectExistsValidator from . import models -class IssueValidator(WatchersValidator, EditableWatchedResourceSerializer, +class IssueValidator(AssignedToValidator, WatchersValidator, EditableWatchedResourceSerializer, validators.ModelValidator): tags = TagsAndTagsColorsField(default=[], required=False) diff --git a/taiga/projects/mixins/validators.py b/taiga/projects/mixins/validators.py new file mode 100644 index 00000000..89372432 --- /dev/null +++ b/taiga/projects/mixins/validators.py @@ -0,0 +1,21 @@ +from django.utils.translation import ugettext as _ +from taiga.base.exceptions import ValidationError +from taiga.projects.models import Membership + + +class AssignedToValidator: + def validate_assigned_to(self, attrs, source): + assigned_to = attrs[source] + project = (attrs.get("project", None) or + getattr(self.object, "project", None)) + + if assigned_to and project: + filters = { + "project_id": project.id, + "user_id": assigned_to.id + } + + if not Membership.objects.filter(**filters).exists(): + raise ValidationError(_("The user must be a project member.")) + + return attrs diff --git a/taiga/projects/tasks/validators.py b/taiga/projects/tasks/validators.py index b9061bde..d7498cc6 100644 --- a/taiga/projects/tasks/validators.py +++ b/taiga/projects/tasks/validators.py @@ -23,6 +23,7 @@ from taiga.base.api import validators from taiga.base.exceptions import ValidationError from taiga.base.fields import PgArrayField from taiga.projects.milestones.models import Milestone +from taiga.projects.mixins.validators import AssignedToValidator from taiga.projects.models import TaskStatus from taiga.projects.notifications.mixins import EditableWatchedResourceSerializer from taiga.projects.notifications.validators import WatchersValidator @@ -33,7 +34,8 @@ from taiga.projects.validators import ProjectExistsValidator from . import models -class TaskValidator(WatchersValidator, EditableWatchedResourceSerializer, validators.ModelValidator): +class TaskValidator(AssignedToValidator, WatchersValidator, EditableWatchedResourceSerializer, + validators.ModelValidator): tags = TagsAndTagsColorsField(default=[], required=False) external_reference = PgArrayField(required=False) diff --git a/taiga/projects/userstories/validators.py b/taiga/projects/userstories/validators.py index e20a704e..cf901d10 100644 --- a/taiga/projects/userstories/validators.py +++ b/taiga/projects/userstories/validators.py @@ -23,7 +23,9 @@ from taiga.base.api import validators from taiga.base.exceptions import ValidationError from taiga.base.fields import PgArrayField from taiga.base.fields import PickledObjectField +from taiga.base.utils import json from taiga.projects.milestones.models import Milestone +from taiga.projects.mixins.validators import AssignedToValidator from taiga.projects.models import UserStoryStatus from taiga.projects.notifications.mixins import EditableWatchedResourceSerializer from taiga.projects.notifications.validators import WatchersValidator @@ -33,8 +35,6 @@ from taiga.projects.validators import ProjectExistsValidator from . import models -import json - class UserStoryExistsValidator: def validate_us_id(self, attrs, source): @@ -55,7 +55,8 @@ class RolePointsField(serializers.WritableField): return json.loads(obj) -class UserStoryValidator(WatchersValidator, EditableWatchedResourceSerializer, validators.ModelValidator): +class UserStoryValidator(AssignedToValidator, WatchersValidator, + EditableWatchedResourceSerializer, validators.ModelValidator): tags = TagsAndTagsColorsField(default=[], required=False) external_reference = PgArrayField(required=False) points = RolePointsField(source="role_points", required=False) diff --git a/tests/factories.py b/tests/factories.py index 55dafd87..5564cc55 100644 --- a/tests/factories.py +++ b/tests/factories.py @@ -707,6 +707,7 @@ def create_project(**kwargs): project.default_issue_type = IssueTypeFactory.create(project=project) project.default_us_status = UserStoryStatusFactory.create(project=project) project.default_task_status = TaskStatusFactory.create(project=project) + project.default_epic_status = EpicStatusFactory.create(project=project) project.save() diff --git a/tests/integration/test_epics.py b/tests/integration/test_epics.py index a95f1c7c..64d3edb7 100644 --- a/tests/integration/test_epics.py +++ b/tests/integration/test_epics.py @@ -25,8 +25,10 @@ from unittest import mock from django.core.urlresolvers import reverse from taiga.base.utils import json +from taiga.permissions.choices import MEMBERS_PERMISSIONS, ANON_PERMISSIONS from taiga.projects.epics import services from taiga.projects.epics import models +from taiga.projects.occ import OCCResourceMixin from .. import factories as f @@ -162,3 +164,119 @@ def test_unset_related_userstory(client): response = client.delete(url) assert response.status_code == 204 assert not models.RelatedUserStory.objects.filter(id=related_us.id).exists() + + +def test_api_validator_assigned_to_when_update_epics(client): + project = f.create_project(anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS))) + project_member_owner = f.MembershipFactory.create(project=project, + user=project.owner, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_member = f.MembershipFactory.create(project=project, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_no_member = f.MembershipFactory.create(is_admin=True) + + epic = f.create_epic(project=project, owner=project.owner, status=project.epic_statuses.all()[0]) + + url = reverse('epics-detail', kwargs={"pk": epic.pk}) + + # assign + data = { + "assigned_to": project_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 200, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == project_member.user.id + + # unassign + data = { + "assigned_to": None, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 200, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == None + + # assign to invalid user + data = { + "assigned_to": project_no_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 400, response.data + + +def test_api_validator_assigned_to_when_create_epics(client): + project = f.create_project(anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS))) + project_member_owner = f.MembershipFactory.create(project=project, + user=project.owner, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_member = f.MembershipFactory.create(project=project, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_no_member = f.MembershipFactory.create(is_admin=True) + + url = reverse('epics-list') + + # assign + data = { + "subject": "test", + "project": project.id, + "assigned_to": project_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 201, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == project_member.user.id + + # unassign + data = { + "subject": "test", + "project": project.id, + "assigned_to": None, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 201, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == None + + # assign to invalid user + data = { + "subject": "test", + "project": project.id, + "assigned_to": project_no_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 400, response.data diff --git a/tests/integration/test_issues.py b/tests/integration/test_issues.py index b2055bc4..5fc58827 100644 --- a/tests/integration/test_issues.py +++ b/tests/integration/test_issues.py @@ -28,8 +28,10 @@ from unittest import mock from django.core.urlresolvers import reverse -from taiga.projects.issues import services, models from taiga.base.utils import json +from taiga.permissions.choices import MEMBERS_PERMISSIONS, ANON_PERMISSIONS +from taiga.projects.issues import services, models +from taiga.projects.occ import OCCResourceMixin from .. import factories as f @@ -592,3 +594,119 @@ def test_custom_fields_csv_generation(): assert row[23] == attr.name row = next(reader) assert row[23] == "val1" + + +def test_api_validator_assigned_to_when_update_issues(client): + project = f.create_project(anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS))) + project_member_owner = f.MembershipFactory.create(project=project, + user=project.owner, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_member = f.MembershipFactory.create(project=project, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_no_member = f.MembershipFactory.create(is_admin=True) + + issue = f.create_issue(project=project, owner=project.owner) + + url = reverse('issues-detail', kwargs={"pk": issue.pk}) + + # assign + data = { + "assigned_to": project_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 200, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == project_member.user.id + + # unassign + data = { + "assigned_to": None, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 200, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == None + + # assign to invalid user + data = { + "assigned_to": project_no_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 400, response.data + + +def test_api_validator_assigned_to_when_create_issues(client): + project = f.create_project(anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS))) + project_member_owner = f.MembershipFactory.create(project=project, + user=project.owner, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_member = f.MembershipFactory.create(project=project, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_no_member = f.MembershipFactory.create(is_admin=True) + + url = reverse('issues-list') + + # assign + data = { + "subject": "test", + "project": project.id, + "assigned_to": project_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 201, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == project_member.user.id + + # unassign + data = { + "subject": "test", + "project": project.id, + "assigned_to": None, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 201, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == None + + # assign to invalid user + data = { + "subject": "test", + "project": project.id, + "assigned_to": project_no_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 400, response.data diff --git a/tests/integration/test_tasks.py b/tests/integration/test_tasks.py index cdda8375..2e9ae356 100644 --- a/tests/integration/test_tasks.py +++ b/tests/integration/test_tasks.py @@ -29,6 +29,8 @@ from unittest import mock from django.core.urlresolvers import reverse from taiga.base.utils import json +from taiga.permissions.choices import MEMBERS_PERMISSIONS, ANON_PERMISSIONS +from taiga.projects.occ import OCCResourceMixin from taiga.projects.tasks import services from .. import factories as f @@ -861,3 +863,119 @@ def test_api_filters_data(client): assert next(filter(lambda i: i['name'] == tag1, response.data["tags"]))["count"] == 2 assert next(filter(lambda i: i['name'] == tag2, response.data["tags"]))["count"] == 2 assert next(filter(lambda i: i['name'] == tag3, response.data["tags"]))["count"] == 1 + + +def test_api_validator_assigned_to_when_update_tasks(client): + project = f.create_project(anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS))) + project_member_owner = f.MembershipFactory.create(project=project, + user=project.owner, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_member = f.MembershipFactory.create(project=project, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_no_member = f.MembershipFactory.create(is_admin=True) + + task = f.create_task(project=project, milestone__project=project, user_story=None, owner=project.owner) + + url = reverse('tasks-detail', kwargs={"pk": task.pk}) + + # assign + data = { + "assigned_to": project_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 200, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == project_member.user.id + + # unassign + data = { + "assigned_to": None, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 200, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == None + + # assign to invalid user + data = { + "assigned_to": project_no_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 400, response.data + + +def test_api_validator_assigned_to_when_create_tasks(client): + project = f.create_project(anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS))) + project_member_owner = f.MembershipFactory.create(project=project, + user=project.owner, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_member = f.MembershipFactory.create(project=project, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_no_member = f.MembershipFactory.create(is_admin=True) + + url = reverse('tasks-list') + + # assign + data = { + "subject": "test", + "project": project.id, + "assigned_to": project_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 201, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == project_member.user.id + + # unassign + data = { + "subject": "test", + "project": project.id, + "assigned_to": None, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 201, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == None + + # assign to invalid user + data = { + "subject": "test", + "project": project.id, + "assigned_to": project_no_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 400, response.data diff --git a/tests/integration/test_userstories.py b/tests/integration/test_userstories.py index 69d6af4a..13e1df8f 100644 --- a/tests/integration/test_userstories.py +++ b/tests/integration/test_userstories.py @@ -28,6 +28,8 @@ from unittest import mock from django.core.urlresolvers import reverse from taiga.base.utils import json +from taiga.permissions.choices import MEMBERS_PERMISSIONS, ANON_PERMISSIONS +from taiga.projects.occ import OCCResourceMixin from taiga.projects.userstories import services, models from .. import factories as f @@ -1021,3 +1023,118 @@ def test_get_user_stories_including_attachments(client): response = client.get(url) assert response.status_code == 200 assert len(response.data[0].get("attachments")) == 1 + + +def test_api_validator_assigned_to_when_update_userstories(client): + project = f.create_project(anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS))) + project_member_owner = f.MembershipFactory.create(project=project, + user=project.owner, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_member = f.MembershipFactory.create(project=project, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_no_member = f.MembershipFactory.create(is_admin=True) + userstory = f.create_userstory(project=project, owner=project.owner, status=project.us_statuses.all()[0]) + + url = reverse('userstories-detail', kwargs={"pk": userstory.pk}) + + # assign + data = { + "assigned_to": project_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 200, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == project_member.user.id + + # unassign + data = { + "assigned_to": None, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 200, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == None + + # assign to invalid user + data = { + "assigned_to": project_no_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.patch(url, json.dumps(data)) + assert response.status_code == 400, response.data + + +def test_api_validator_assigned_to_when_create_userstories(client): + project = f.create_project(anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)), + public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS))) + project_member_owner = f.MembershipFactory.create(project=project, + user=project.owner, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_member = f.MembershipFactory.create(project=project, + is_admin=True, + role__project=project, + role__permissions=list(map(lambda x: x[0], MEMBERS_PERMISSIONS))) + project_no_member = f.MembershipFactory.create(is_admin=True) + + url = reverse('userstories-list') + + # assign + data = { + "subject": "test", + "project": project.id, + "assigned_to": project_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 201, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == project_member.user.id + + # unassign + data = { + "subject": "test", + "project": project.id, + "assigned_to": None, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 201, response.data + assert "assigned_to" in response.data + assert response.data["assigned_to"] == None + + # assign to invalid user + data = { + "subject": "test", + "project": project.id, + "assigned_to": project_no_member.user.id, + } + + with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): + client.login(project.owner) + + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 400, response.data From 75bc33b759987d2afb508651e57c414506b4e47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 31 Jan 2017 18:36:06 +0100 Subject: [PATCH 095/144] Exclude contacts from a concrete project --- taiga/users/filters.py | 5 +++++ tests/integration/test_users.py | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/taiga/users/filters.py b/taiga/users/filters.py index 2c7e47f9..9357bfa3 100644 --- a/taiga/users/filters.py +++ b/taiga/users/filters.py @@ -25,6 +25,11 @@ from . import services class ContactsFilterBackend(PermissionBasedFilterBackend): def filter_queryset(self, user, request, queryset, view): qs = user.contacts_visible_by_user(request.user) + + exclude_project = request.QUERY_PARAMS.get('exclude_project', None) + if exclude_project: + qs = qs.exclude(projects__id=exclude_project) + q = request.QUERY_PARAMS.get('q', None) if q: table = qs.model._meta.db_table diff --git a/tests/integration/test_users.py b/tests/integration/test_users.py index 678d4a03..6835f62b 100644 --- a/tests/integration/test_users.py +++ b/tests/integration/test_users.py @@ -447,6 +447,42 @@ def test_list_contacts_public_projects(client): assert response_content[0]["id"] == user_2.id +def test_list_contacts_filter_exclude_project(client): + project1 = f.ProjectFactory.create() + project2 = f.ProjectFactory.create() + user_1 = f.UserFactory.create() + user_2 = f.UserFactory.create() + user_3 = f.UserFactory.create() + user_4 = f.UserFactory.create() + role1 = f.RoleFactory(project=project1, permissions=["view_project"]) + role2 = f.RoleFactory(project=project2, permissions=["view_project"]) + + membership_11 = f.MembershipFactory.create(project=project1, user=user_1, role=role1) + membership_12 = f.MembershipFactory.create(project=project1, user=user_2, role=role1) + + membership_21 = f.MembershipFactory.create(project=project2, user=user_1, role=role2) + membership_23 = f.MembershipFactory.create(project=project2, user=user_3, role=role2) + membership_24 = f.MembershipFactory.create(project=project2, user=user_4, role=role2) + + url = reverse('users-contacts', kwargs={"pk": user_1.pk}) + + client.login(user_1) + response = client.get(url, content_type="application/json") + assert response.status_code == 200 + response_content = response.data + assert len(response_content) == 3 + + response = client.get(url + "?exclude_project={}".format(project1.id), content_type="application/json") + assert response.status_code == 200 + response_content = response.data + assert len(response_content) == 2 + + response = client.get(url + "?exclude_project={}".format(project2.id), content_type="application/json") + assert response.status_code == 200 + response_content = response.data + assert len(response_content) == 1 + + ############################## ## Mail permissions ############################## From 503beb68b905d8dd52523456c69e27eb434eaab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 1 Feb 2017 11:54:17 +0100 Subject: [PATCH 096/144] Add missed migration --- .../migrations/0008_auto_20170201_1053.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 taiga/projects/attachments/migrations/0008_auto_20170201_1053.py diff --git a/taiga/projects/attachments/migrations/0008_auto_20170201_1053.py b/taiga/projects/attachments/migrations/0008_auto_20170201_1053.py new file mode 100644 index 00000000..72b91c3b --- /dev/null +++ b/taiga/projects/attachments/migrations/0008_auto_20170201_1053.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-02-01 10:53 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('attachments', '0007_attachment_from_comment'), + ] + + operations = [ + migrations.AlterField( + model_name='attachment', + name='from_comment', + field=models.BooleanField(default=False, verbose_name='from comment'), + ), + ] From 582068a7ac97ff6c47526ccc7a577bfcaf896261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Sun, 5 Feb 2017 13:24:02 +0100 Subject: [PATCH 097/144] [i18n] Update locales --- taiga/locale/ca/LC_MESSAGES/django.po | 6 +++--- taiga/locale/de/LC_MESSAGES/django.po | 6 +++--- taiga/locale/es/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/fi/LC_MESSAGES/django.po | 6 +++--- taiga/locale/fr/LC_MESSAGES/django.po | 6 +++--- taiga/locale/it/LC_MESSAGES/django.po | 6 +++--- taiga/locale/ja/LC_MESSAGES/django.po | 6 +++--- taiga/locale/ko/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/nb/LC_MESSAGES/django.po | 6 +++--- taiga/locale/nl/LC_MESSAGES/django.po | 6 +++--- taiga/locale/pl/LC_MESSAGES/django.po | 6 +++--- taiga/locale/pt_BR/LC_MESSAGES/django.po | 6 +++--- taiga/locale/ru/LC_MESSAGES/django.po | 6 +++--- taiga/locale/sv/LC_MESSAGES/django.po | 6 +++--- taiga/locale/tr/LC_MESSAGES/django.po | 6 +++--- taiga/locale/zh-Hans/LC_MESSAGES/django.po | 6 +++--- taiga/locale/zh-Hant/LC_MESSAGES/django.po | 6 +++--- 17 files changed, 53 insertions(+), 53 deletions(-) diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index b26631a2..87768ffe 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ca/)\n" @@ -1288,7 +1288,7 @@ msgid "is deprecated" msgstr "està obsolet " #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/de/LC_MESSAGES/django.po b/taiga/locale/de/LC_MESSAGES/django.po index 3e67770d..8b542a8c 100644 --- a/taiga/locale/de/LC_MESSAGES/django.po +++ b/taiga/locale/de/LC_MESSAGES/django.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/de/)\n" @@ -1441,7 +1441,7 @@ msgid "is deprecated" msgstr "wurde verworfen" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/es/LC_MESSAGES/django.po b/taiga/locale/es/LC_MESSAGES/django.po index c1e697bb..3d22f7e6 100644 --- a/taiga/locale/es/LC_MESSAGES/django.po +++ b/taiga/locale/es/LC_MESSAGES/django.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/es/)\n" @@ -1465,8 +1465,8 @@ msgid "is deprecated" msgstr "está desactualizado" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" -msgstr "" +msgid "from comment" +msgstr "desde comentario" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 diff --git a/taiga/locale/fi/LC_MESSAGES/django.po b/taiga/locale/fi/LC_MESSAGES/django.po index 082d726b..b25d4389 100644 --- a/taiga/locale/fi/LC_MESSAGES/django.po +++ b/taiga/locale/fi/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fi/)\n" @@ -1383,7 +1383,7 @@ msgid "is deprecated" msgstr "on poistettu" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/fr/LC_MESSAGES/django.po b/taiga/locale/fr/LC_MESSAGES/django.po index 7be6412f..54479482 100644 --- a/taiga/locale/fr/LC_MESSAGES/django.po +++ b/taiga/locale/fr/LC_MESSAGES/django.po @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fr/)\n" @@ -1417,7 +1417,7 @@ msgid "is deprecated" msgstr "est obsolète" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/it/LC_MESSAGES/django.po b/taiga/locale/it/LC_MESSAGES/django.po index f7237700..eb84b405 100644 --- a/taiga/locale/it/LC_MESSAGES/django.po +++ b/taiga/locale/it/LC_MESSAGES/django.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/it/)\n" @@ -1521,7 +1521,7 @@ msgid "is deprecated" msgstr "non approvato" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po index dab8d95d..7e7375af 100644 --- a/taiga/locale/ja/LC_MESSAGES/django.po +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Japanese (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ja/)\n" @@ -1455,7 +1455,7 @@ msgid "is deprecated" msgstr "は廃止予定である" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/ko/LC_MESSAGES/django.po b/taiga/locale/ko/LC_MESSAGES/django.po index f44b4bfe..d13c8d94 100644 --- a/taiga/locale/ko/LC_MESSAGES/django.po +++ b/taiga/locale/ko/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Korean (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ko/)\n" @@ -1450,8 +1450,8 @@ msgid "is deprecated" msgstr "지원안함" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" -msgstr "" +msgid "from comment" +msgstr "댓글로부터" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 diff --git a/taiga/locale/nb/LC_MESSAGES/django.po b/taiga/locale/nb/LC_MESSAGES/django.po index 63350d7a..0fe1d1db 100644 --- a/taiga/locale/nb/LC_MESSAGES/django.po +++ b/taiga/locale/nb/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/nb/)\n" @@ -1300,7 +1300,7 @@ msgid "is deprecated" msgstr "er foreldet" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/nl/LC_MESSAGES/django.po b/taiga/locale/nl/LC_MESSAGES/django.po index 8bb082e3..5a03648d 100644 --- a/taiga/locale/nl/LC_MESSAGES/django.po +++ b/taiga/locale/nl/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/nl/)\n" @@ -1328,7 +1328,7 @@ msgid "is deprecated" msgstr "is verouderd" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/pl/LC_MESSAGES/django.po b/taiga/locale/pl/LC_MESSAGES/django.po index 90024b91..55f1aab1 100644 --- a/taiga/locale/pl/LC_MESSAGES/django.po +++ b/taiga/locale/pl/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/pl/)\n" @@ -1396,7 +1396,7 @@ msgid "is deprecated" msgstr "jest przestarzałe" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/pt_BR/LC_MESSAGES/django.po b/taiga/locale/pt_BR/LC_MESSAGES/django.po index decc64bb..6c05c930 100644 --- a/taiga/locale/pt_BR/LC_MESSAGES/django.po +++ b/taiga/locale/pt_BR/LC_MESSAGES/django.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/pt_BR/)\n" @@ -1430,7 +1430,7 @@ msgid "is deprecated" msgstr "está obsoleto" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/ru/LC_MESSAGES/django.po b/taiga/locale/ru/LC_MESSAGES/django.po index 0c306afd..556d85dd 100644 --- a/taiga/locale/ru/LC_MESSAGES/django.po +++ b/taiga/locale/ru/LC_MESSAGES/django.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ru/)\n" @@ -1425,7 +1425,7 @@ msgid "is deprecated" msgstr "устаревшее" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/sv/LC_MESSAGES/django.po b/taiga/locale/sv/LC_MESSAGES/django.po index 76e3b414..2b08d64d 100644 --- a/taiga/locale/sv/LC_MESSAGES/django.po +++ b/taiga/locale/sv/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Swedish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/sv/)\n" @@ -1279,7 +1279,7 @@ msgid "is deprecated" msgstr "undviks" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/tr/LC_MESSAGES/django.po b/taiga/locale/tr/LC_MESSAGES/django.po index e3f390ef..5c7aae43 100644 --- a/taiga/locale/tr/LC_MESSAGES/django.po +++ b/taiga/locale/tr/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Turkish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/tr/)\n" @@ -1388,7 +1388,7 @@ msgid "is deprecated" msgstr "kaldırıldı" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/zh-Hans/LC_MESSAGES/django.po b/taiga/locale/zh-Hans/LC_MESSAGES/django.po index b933eb72..d6d38dbc 100644 --- a/taiga/locale/zh-Hans/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hans/LC_MESSAGES/django.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Simplified (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hans/)\n" @@ -1439,7 +1439,7 @@ msgid "is deprecated" msgstr "已废弃" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 diff --git a/taiga/locale/zh-Hant/LC_MESSAGES/django.po b/taiga/locale/zh-Hant/LC_MESSAGES/django.po index 21155fd7..2b3fc5e0 100644 --- a/taiga/locale/zh-Hant/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hant/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:45+0100\n" -"PO-Revision-Date: 2017-01-20 08:45+0000\n" +"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"PO-Revision-Date: 2017-02-05 12:23+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hant/)\n" @@ -1373,7 +1373,7 @@ msgid "is deprecated" msgstr "棄用" #: taiga/projects/attachments/models.py:61 -msgid "from_comment" +msgid "from comment" msgstr "" #: taiga/projects/attachments/models.py:63 From 0a7bd3be06849930c9c4b3f326f1147c010a3788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 9 Feb 2017 09:14:16 +0100 Subject: [PATCH 098/144] [i18n] Update locales --- taiga/locale/ca/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/de/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/en/LC_MESSAGES/django.po | 116 ++++++++++---------- taiga/locale/es/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/fi/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/fr/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/it/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/ja/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/ko/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/nb/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/nl/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/pl/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/pt_BR/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/ru/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/sv/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/tr/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/zh-Hans/LC_MESSAGES/django.po | 118 +++++++++++---------- taiga/locale/zh-Hant/LC_MESSAGES/django.po | 118 +++++++++++---------- 18 files changed, 1097 insertions(+), 1025 deletions(-) diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index 87768ffe..1921ef71 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ca/)\n" @@ -57,8 +57,8 @@ msgid "Error on creating new user." msgstr "Error creant un nou usuari." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Token invàlid" @@ -188,8 +188,8 @@ msgstr "" "està corrupte." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -761,7 +761,7 @@ msgstr "" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "Nom" @@ -797,11 +797,11 @@ msgstr "" msgid "application" msgstr "" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "Nom complet" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "Adreça d'email" @@ -1192,41 +1192,41 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Arguments incomplets." -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Format d'image invàlid" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "No tens permisos per a veure açò." @@ -1253,7 +1253,7 @@ msgstr "" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "Projecte" @@ -1298,7 +1298,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "Ordre" @@ -1459,7 +1459,7 @@ msgstr "tema" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "color" @@ -1679,7 +1679,7 @@ msgstr "Fans" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "slug" @@ -1730,6 +1730,10 @@ msgstr "" msgid "'project' parameter is mandatory" msgstr "" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "email" @@ -1738,7 +1742,7 @@ msgstr "email" msgid "create at" msgstr "" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "token" @@ -2736,31 +2740,31 @@ msgstr "ordre de taskboard" msgid "is iocaine" msgstr "es iocaina" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3405,27 +3409,27 @@ msgstr "generat desde incidéncia" msgid "There's no user story with that id" msgstr "No hi ha cap història d'usuari amb eixe id" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -3600,11 +3604,11 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Invàlid. Estás segur que el token es correcte?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "estatus de superusuari" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -3612,24 +3616,24 @@ msgstr "" "Designa que aquest usuari te tots els permisos sense asignarli-los " "explícitament." -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "mot d'usuari" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "Requerit. 30 caràcters o menys. Lletres, nombres i caràcters /./-/_" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Introdueix un nom d'usuari vàlid" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "actiu" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -3637,59 +3641,59 @@ msgstr "" "Designa si aquest usuari ha de se tractac com actiu. Deselecciona açó en " "lloc de borrar el compte." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biografia" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "foto" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "data d'unió" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "llenguatge per defecte" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "zona horaria per defecte" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "coloritza tags" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "token de correu" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "nova adreça de correu" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "permissos" diff --git a/taiga/locale/de/LC_MESSAGES/django.po b/taiga/locale/de/LC_MESSAGES/django.po index 8b542a8c..f03e5edc 100644 --- a/taiga/locale/de/LC_MESSAGES/django.po +++ b/taiga/locale/de/LC_MESSAGES/django.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/de/)\n" @@ -69,8 +69,8 @@ msgid "Error on creating new user." msgstr "Fehler bei der Erstellung des neuen Benutzers." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Ungültiges Token" @@ -222,8 +222,8 @@ msgstr "" "haben, ist entweder kein Bild oder defekt." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -912,7 +912,7 @@ msgstr "Authentifizierung erforderlich" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "Name" @@ -948,11 +948,11 @@ msgstr "Benutzer" msgid "application" msgstr "Applikation" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "vollständiger Name" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "E-Mail Adresse" @@ -1343,35 +1343,35 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Unvollständige Argumente" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Ungültiges Bildformat" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Unglültiger Templatename" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Ungültige Templatebeschreibung" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "Ungültige Benutzer-Id" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "Der Benutzer existiert nicht" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "Der Benutzer muss bereits Mitglied des Projektes sein" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1379,7 +1379,7 @@ msgstr "" "Das Projekt muss einen Eigentümer haben und mindestens ein Benutzer muss ein " "aktiver Administrator sein" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "Sie haben keine Berechtigungen für diese Ansicht" @@ -1406,7 +1406,7 @@ msgstr "Nr. unterschreidet sich zwischen dem Objekt und dem Projekt" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "Projekt" @@ -1451,7 +1451,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "Reihenfolge" @@ -1612,7 +1612,7 @@ msgstr "Betreff" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "Farbe" @@ -1836,7 +1836,7 @@ msgstr "Likes" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "Slug" @@ -1887,6 +1887,10 @@ msgstr "'{param}' Parameter ist ein Pflichtfeld" msgid "'project' parameter is mandatory" msgstr "Der 'project' Parameter ist ein Pflichtfeld" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "E-Mail" @@ -1895,7 +1899,7 @@ msgstr "E-Mail" msgid "create at" msgstr "erstellt am " -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "Token" @@ -3181,31 +3185,31 @@ msgstr "Taskboard Befehl " msgid "is iocaine" msgstr "ist Iocaine" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3901,27 +3905,27 @@ msgstr "erzeugt von Ticket" msgid "There's no user story with that id" msgstr "Es gibt keine User-Story mit dieser id" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -4098,11 +4102,11 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Ungültig. Sind Sie sicher, dass das Token korrekt ist?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "Superuser Status" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -4110,25 +4114,25 @@ msgstr "" "Dieser Benutzer soll alle Berechtigungen erhalten, ohne dass diese zuvor " "zugewiesen werden müssen. " -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "Benutzername" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "" "Benötigt. 30 Zeichen oder weniger.. Buchstaben, Zahlen und /./-/_ Zeichen" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Geben Sie einen gültigen Benuzternamen ein." -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "aktiv" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -4136,59 +4140,59 @@ msgstr "" "Kennzeichnet den Benutzer als aktiv. Deaktiviere die Option anstelle einen " "Benutzer zu löschen." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "Über mich" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "Foto" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "Beitrittsdatum" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "Vorgegebene Sprache" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "Standard-Theme" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "Vorgegebene Zeitzone" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "Tag-Farben" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "E-Mail Token" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "neue E-Mail Adresse" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "Berechtigungen" diff --git a/taiga/locale/en/LC_MESSAGES/django.po b/taiga/locale/en/LC_MESSAGES/django.po index 972c5c1c..757246c6 100644 --- a/taiga/locale/en/LC_MESSAGES/django.po +++ b/taiga/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" "PO-Revision-Date: 2015-03-25 20:09+0100\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Taiga Dev Team \n" @@ -53,8 +53,8 @@ msgid "Error on creating new user." msgstr "" #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "" @@ -180,8 +180,8 @@ msgid "" msgstr "" #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -750,7 +750,7 @@ msgstr "" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "" @@ -786,11 +786,11 @@ msgstr "" msgid "application" msgstr "" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "" @@ -1165,41 +1165,41 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "" @@ -1226,7 +1226,7 @@ msgstr "" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "" @@ -1271,7 +1271,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "" @@ -1432,7 +1432,7 @@ msgstr "" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "" @@ -1652,7 +1652,7 @@ msgstr "" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "" @@ -1703,6 +1703,10 @@ msgstr "" msgid "'project' parameter is mandatory" msgstr "" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "" @@ -1711,7 +1715,7 @@ msgstr "" msgid "create at" msgstr "" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "" @@ -2703,31 +2707,31 @@ msgstr "" msgid "is iocaine" msgstr "" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3354,27 +3358,27 @@ msgstr "" msgid "There's no user story with that id" msgstr "" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -3548,92 +3552,92 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "" diff --git a/taiga/locale/es/LC_MESSAGES/django.po b/taiga/locale/es/LC_MESSAGES/django.po index 3d22f7e6..7a887fc7 100644 --- a/taiga/locale/es/LC_MESSAGES/django.po +++ b/taiga/locale/es/LC_MESSAGES/django.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/es/)\n" @@ -67,8 +67,8 @@ msgid "Error on creating new user." msgstr "Error al crear un nuevo usuario " #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Token inválido" @@ -208,8 +208,8 @@ msgid "" msgstr "Adjunta una imagen válida. El fichero no es una imagen o está dañada." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -914,7 +914,7 @@ msgstr "Se requiere autenticación" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "nombre" @@ -950,11 +950,11 @@ msgstr "usuario" msgid "application" msgstr "aplicación" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "nombre completo" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "dirección de email" @@ -1367,35 +1367,35 @@ msgstr "Haz privado" msgid "Delete selected %(verbose_name_plural)s" msgstr "Eliminar seleccionados %(verbose_name_plural)s" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Argumentos incompletos" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Formato de imagen no válido" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Nombre de plantilla invalido" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Descripción de plantilla invalida" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "id de usuario inválido" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "El usuario no existe" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "El usuario debe ser un miembro del proyecto" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1403,7 +1403,7 @@ msgstr "" "El proyecto debe tener un dueño y al menos uno de los usuarios debe ser un " "administrador activo" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "No tienes suficientes permisos para ver esto." @@ -1430,7 +1430,7 @@ msgstr "El ID de proyecto no coincide entre el adjunto y un proyecto" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "Proyecto" @@ -1475,7 +1475,7 @@ msgstr "desde comentario" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "orden" @@ -1660,7 +1660,7 @@ msgstr "asunto" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "color" @@ -1880,7 +1880,7 @@ msgstr "Likes" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "slug" @@ -1933,6 +1933,10 @@ msgstr "el parámetro '{param}' es obligatório" msgid "'project' parameter is mandatory" msgstr "el parámetro 'project' es obligatório" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "email" @@ -1941,7 +1945,7 @@ msgstr "email" msgid "create at" msgstr "creado el" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "token" @@ -3226,34 +3230,34 @@ msgstr "orden en el taskboard" msgid "is iocaine" msgstr "tiene iocaína" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "invalido id de milestone." -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "Estado de la tarea tiene un id que no es válido" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "inválido id de historia de usuario." -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" "Invalido id de estado de tarea. El estado debe pertenecer al mismo proyecto." -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" "Invalido id de historia de usuario. La historia debe pertenecer al mismo " "proyecto." -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "Invalido id de milestone. El estado debe pertenecer al mismo proyecto." -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -4015,19 +4019,19 @@ msgstr "generada desde una petición" msgid "There's no user story with that id" msgstr "No existe ninguna historia de usuario con este id" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" "Invalido id de estado de historia de usuario. El estado debe pertenecer al " "mismo proyecto." -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "Invalido id de milestone. El estado debe pertenecer al mismo proyecto." -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." @@ -4035,11 +4039,11 @@ msgstr "" "Inválidos ids de historias de usuario. Todas las historias deben pertenecer " "al msimo proyecto y, si existe, al mismo estado y milestone." -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "El milestone no es válido para este proyecto" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "Todas las historias de usuario deben ser del mismo proyecto" @@ -4216,11 +4220,11 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Inválido, ¿estás seguro de que el token es correcto?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "es superusuario" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -4228,24 +4232,24 @@ msgstr "" "Otorga todos los permisos a este usuario sin necesidad de hacerlo " "explicitamente." -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "nombre de usuario" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "Obligatorio. 30 caracteres o menos. Letras, números y /./-/_" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Introduce un nombre de usuario válido" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "activo" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -4253,59 +4257,59 @@ msgstr "" "Denota a los usuarios activos. Desmárcalo para dar de baja/borrar a un " "usuario." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biografía" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "foto" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "fecha de registro" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "idioma por defecto" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "tema por defecto" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "zona horaria por defecto" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "añade color a los tags" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "token de email" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "nueva dirección de email" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "numero maximo de proyectos privados asignados" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "numero maximo de proyectos publicos asignados" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "máximo de membresías para cada proyecto privado poseído" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "máximo de membresías para cada proyecto público poseído" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "permisos" diff --git a/taiga/locale/fi/LC_MESSAGES/django.po b/taiga/locale/fi/LC_MESSAGES/django.po index b25d4389..9cdfec8f 100644 --- a/taiga/locale/fi/LC_MESSAGES/django.po +++ b/taiga/locale/fi/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fi/)\n" @@ -58,8 +58,8 @@ msgid "Error on creating new user." msgstr "Virhe käyttäjän luonnissa." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Väärä tunniste" @@ -191,8 +191,8 @@ msgstr "" "vioittunut." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -855,7 +855,7 @@ msgstr "" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "nimi" @@ -891,11 +891,11 @@ msgstr "" msgid "application" msgstr "" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "koko nimi" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "sähköpostiosoite" @@ -1287,41 +1287,41 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Puutteelliset argumentit" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Väärä kuvaformaatti" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Virheellinen mallipohjan nimi" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Virheellinen mallipohjan kuvaus" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "Sinulla ei ole oikeuksia nähdä tätä." @@ -1348,7 +1348,7 @@ msgstr "Projekti ID ei vastaa kohdetta ja projektia" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "projekti" @@ -1393,7 +1393,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "order" @@ -1554,7 +1554,7 @@ msgstr "aihe" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "väri" @@ -1774,7 +1774,7 @@ msgstr "" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "hukka-aika" @@ -1825,6 +1825,10 @@ msgstr "'{param}' parametri on pakollinen" msgid "'project' parameter is mandatory" msgstr "'project' parametri on pakollinen" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "sähköposti" @@ -1833,7 +1837,7 @@ msgstr "sähköposti" msgid "create at" msgstr "luo täällä" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "tunniste" @@ -3071,31 +3075,31 @@ msgstr "tehtävätaulun järjestys" msgid "is iocaine" msgstr "on hidaste" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3771,27 +3775,27 @@ msgstr "luotu pyynnöstä" msgid "There's no user story with that id" msgstr "En löydä käyttäjätarinaa tällä id:llä" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -3967,96 +3971,96 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Virheellinen, oletko varma että tunniste on oikea?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "pääkäyttäjän status" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "Kertoo että käyttäjä saa tehdä kaiken ilman erikseen annettuja oiekuksia." -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "käyttäjänimi" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "" "Vaaditaan. Korkeintaan 30merkkiä. Kirjaimet, numerot ja merkit /./-/_ " "sallittuja" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Anna olemassa oleva käyttäjänimi." -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "aktiivinen" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" "Käyttäjä on aktiivinen. Poista aktiivisuus käyttäjän poistamisen sijaan." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biografia" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "kuva" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "liittymispvm" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "oletuskieli" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "oletus aikavyöhyke" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "väritä avainsanat" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "sähköpostitunniste" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "uusi sähköpostiosoite" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "oikeudet" diff --git a/taiga/locale/fr/LC_MESSAGES/django.po b/taiga/locale/fr/LC_MESSAGES/django.po index 54479482..c70d9109 100644 --- a/taiga/locale/fr/LC_MESSAGES/django.po +++ b/taiga/locale/fr/LC_MESSAGES/django.po @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fr/)\n" @@ -73,8 +73,8 @@ msgid "Error on creating new user." msgstr "Erreur à la création du nouvel utilisateur." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Jeton invalide" @@ -217,8 +217,8 @@ msgstr "" "image ou était une image corrompue." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -889,7 +889,7 @@ msgstr "Authentification requise" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "nom" @@ -925,11 +925,11 @@ msgstr "utilisateur" msgid "application" msgstr "application" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "Nom complet" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "Adresse email" @@ -1319,35 +1319,35 @@ msgstr "Rendre privé" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "arguments manquants" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "format de l'image non valide" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Nom de modèle non valide" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Description du modèle non valide" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "Identifiant utilisateur invalide" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "L'utilisateur n'existe pas" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "L'utilisateur doit déjà être un membre du projet" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1355,7 +1355,7 @@ msgstr "" "Le projet doit avoir un propriétaire et au moins l'un de ses membres doit " "être un administrateur actif." -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "Vous n'avez pas les permissions pour consulter cet élément" @@ -1382,7 +1382,7 @@ msgstr "L'identifiant du projet de correspond pas entre l'objet et le projet" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "projet" @@ -1427,7 +1427,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "ordre" @@ -1588,7 +1588,7 @@ msgstr "sujet" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "couleur" @@ -1808,7 +1808,7 @@ msgstr "Aime" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "slug" @@ -1859,6 +1859,10 @@ msgstr "'{param}' paramètre obligatoire" msgid "'project' parameter is mandatory" msgstr "'project' paramètre obligatoire" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "email" @@ -1867,7 +1871,7 @@ msgstr "email" msgid "create at" msgstr "Créé le" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "jeton" @@ -2891,31 +2895,31 @@ msgstr "order du tableau de tâches" msgid "is iocaine" msgstr "est de l'iocaine" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3603,27 +3607,27 @@ msgstr "généré depuis un problème" msgid "There's no user story with that id" msgstr "Il n'y a pas d'user story avec cet id" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "Le jalon n'est pas valide pour le projet" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "Tous les user stories doivent provenir du même projet" @@ -3800,11 +3804,11 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Invalide, êtes-vous sûre que le jeton est correct ?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "statut superutilisateur" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -3812,25 +3816,25 @@ msgstr "" "Indique que l'utilisateur a toutes les permissions sans avoir à lui les " "donner explicitement" -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "nom d'utilisateur" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "" "Obligatoire. 30 caractères maximum. Lettres, nombres et les caractères /./-/_" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Entrez un nom d'utilisateur valide" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "actif" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -3838,59 +3842,59 @@ msgstr "" "Indique qu'un utilisateur est considéré ou non comme actif. Désélectionnez " "cette option au lieu de supprimer le compte utilisateur." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biographie" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "photo" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "date d'inscription" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "langage par défaut" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "thème par défaut" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "Fuseau horaire par défaut" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "changer la couleur des tags" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "jeton email" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "nouvelle adresse email" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "Nombre maximal de projets privés" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "Nombre maximal de projets publics" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "Nombre maximum d'adhésions pour chaque projet privé" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "Nombre maximum d'adhésions pour chaque projet public détenu" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "permissions" diff --git a/taiga/locale/it/LC_MESSAGES/django.po b/taiga/locale/it/LC_MESSAGES/django.po index eb84b405..65c55de1 100644 --- a/taiga/locale/it/LC_MESSAGES/django.po +++ b/taiga/locale/it/LC_MESSAGES/django.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/it/)\n" @@ -63,8 +63,8 @@ msgid "Error on creating new user." msgstr "Errore nella creazione della nuova utenza." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Token non valido" @@ -201,8 +201,8 @@ msgstr "" "o l'immagine potrebbe essere corrotta. " #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -966,7 +966,7 @@ msgstr "E' richiesta l'autenticazione" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "nome" @@ -1002,11 +1002,11 @@ msgstr "utente" msgid "application" msgstr "applicazione" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "Nome completo" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "Inserisci un indirizzo e-mail valido." @@ -1423,35 +1423,35 @@ msgstr "Rendi privato" msgid "Delete selected %(verbose_name_plural)s" msgstr "Cancella selezionati %(verbose_name_plural)s" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Argomento non valido" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Formato dell'immagine non valido" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Il nome del template non è valido" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "La descrizione del template non è valida" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "id utente non valido" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "L'utente non esiste" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "L'utente deve gia' essere un membro del progetto" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1459,7 +1459,7 @@ msgstr "" "Il progetto deve avere un proprietario ed almeno uno dei suoi utenti deve " "essere un amministratore attivo" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "Non hai il permesso di vedere questo elemento." @@ -1486,7 +1486,7 @@ msgstr "L'ID di progetto non corrisponde tra oggetto e progetto" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "progetto" @@ -1531,7 +1531,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "ordine" @@ -1692,7 +1692,7 @@ msgstr "soggeto" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "colore" @@ -1912,7 +1912,7 @@ msgstr "Piaciuto" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "lumaca" @@ -1964,6 +1964,10 @@ msgstr "il parametro '{param}' è obbligatorio" msgid "'project' parameter is mandatory" msgstr "il parametro 'project' è obbligatorio" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "email" @@ -1972,7 +1976,7 @@ msgstr "email" msgid "create at" msgstr "creato a " -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "token" @@ -3399,36 +3403,36 @@ msgstr "ordine del pannello dei compiti" msgid "is iocaine" msgstr "è sotto aspirina" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "milestone id non valido." -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "id stato attivita' non valido." -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "id storia utente non valido." -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" "id stato attivita' non valido. Lo stato deve appartenere allo stesso " "progetto." -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" "id storia utente non valido. La storia utente deve appartenere allo stesso " "progetto." -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" "id milestone non valido. La milestone deve appartenere allo stesso progetto." -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -4201,27 +4205,27 @@ msgstr "generato da un problema" msgid "There's no user story with that id" msgstr "Non c'è nessuna storia utente con questo ID" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -4397,11 +4401,11 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Non valido. Sicuro che il token sia corretto?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "Stato del super-utente" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -4409,26 +4413,26 @@ msgstr "" "Definisce che questo utente ha tutti i permessi senza assegnarglieli " "esplicitamente." -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "nome utente" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "" "Richiede 30 caratteri o meno. Deve comprendere: lettere, numeri e caratteri " "come /./-/_" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Inserisci un nome utente valido." -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "attivo" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -4436,59 +4440,59 @@ msgstr "" "Definisce se questo utente debba essere trattato come attivo. Deseleziona " "questo invece di eliminare gli account." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biografia" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "fotografia" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "data di inizio partecipazione" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "lingua predefinita" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "tema predefinito" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "timezone predefinita" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "colora i tag" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "token e-mail" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "nuovo indirizzo e-mail" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "permessi" diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po index 7e7375af..902c2a73 100644 --- a/taiga/locale/ja/LC_MESSAGES/django.po +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Japanese (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ja/)\n" @@ -61,8 +61,8 @@ msgid "Error on creating new user." msgstr "新しいユーザを作成中にエラーが発生しました。" #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "トークンが間違っています" @@ -199,8 +199,8 @@ msgstr "" "か破損しています。" #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -902,7 +902,7 @@ msgstr "認証が必要です。" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "名前" @@ -938,11 +938,11 @@ msgstr "ユーザー" msgid "application" msgstr "アプリケーション" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "フルネーム" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "メールアドレス" @@ -1357,35 +1357,35 @@ msgstr "プライベートにする" msgid "Delete selected %(verbose_name_plural)s" msgstr "選択中の%(verbose_name_plural)sらを削除する" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "引数は不足している" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "画像形式が正しくありません" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "無効なテンプレート名" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "無効なテンプレートの説明文" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "無効なユーザーID" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "このユーザーは存在しません。" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "ユーザーはプロジェクトのメンバーである必要がある" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1393,7 +1393,7 @@ msgstr "" "プロジェクトにオーナーと、1人以上のアクティブな管理者であるユーザーが必要で" "す。" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "閲覧する権限がありません。" @@ -1420,7 +1420,7 @@ msgstr "" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "プロジェクト" @@ -1465,7 +1465,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "並べ替え" @@ -1626,7 +1626,7 @@ msgstr "件名" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "色" @@ -1846,7 +1846,7 @@ msgstr "いいねの数" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "スラグ" @@ -1897,6 +1897,10 @@ msgstr "'{param}'パラメータは必須です。" msgid "'project' parameter is mandatory" msgstr "'project'パラメータは必須です。" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "メール" @@ -1905,7 +1909,7 @@ msgstr "メール" msgid "create at" msgstr "" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "トークン" @@ -2897,31 +2901,31 @@ msgstr "" msgid "is iocaine" msgstr "" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3548,27 +3552,27 @@ msgstr "" msgid "There's no user story with that id" msgstr "" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -3742,92 +3746,92 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "管理者の状態" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "ユーザー名" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "有効なユーザー名を入力してください。" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "有効" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "経歴" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "写真" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "参加日" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "既定の言語" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "既定のテーマ" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "既定のタイムゾーン" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "タグを色付け" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "Eメールトークン" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "新しいEメールアドレス" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "非公開プロジェクトの最大数" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "公開プロジェクトの最大数" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "非公開プロジェクトごとのメンバーの最大数" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "公開プロジェクトごとのメンバーの最大数" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "アクセス権" diff --git a/taiga/locale/ko/LC_MESSAGES/django.po b/taiga/locale/ko/LC_MESSAGES/django.po index d13c8d94..eeb2f9f2 100644 --- a/taiga/locale/ko/LC_MESSAGES/django.po +++ b/taiga/locale/ko/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Korean (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ko/)\n" @@ -58,8 +58,8 @@ msgid "Error on creating new user." msgstr "사용자를 생성에 에러가 발생했습니다." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "유효하지 않은 토큰" @@ -196,8 +196,8 @@ msgstr "" "지 또한 아닙니다." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -902,7 +902,7 @@ msgstr "인증 필요" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "이름" @@ -938,11 +938,11 @@ msgstr "유저" msgid "application" msgstr "어플리케이션" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "성명" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "이메일 주소" @@ -1352,35 +1352,35 @@ msgstr "비공개로 만들기" msgid "Delete selected %(verbose_name_plural)s" msgstr "%(verbose_name_plural)s 선택된 것을 삭제" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "매개변수가 완전하지 않습니다." -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "이미지 형식이 유효하지 않습니다." -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "탬플릿 이름이 유효하지 않습니다." -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "탬플릿 설명이 유효하지 않습니다." -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "사용자 아이디가 유효하지 않습니다." -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "사용자가 존재하지 않습니다." -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "프로젝트 회원이어야 합니다." -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1388,7 +1388,7 @@ msgstr "" "프로젝트는 반드시 소유자가 있어야하며 사용자 중 적어도 한 명이 활성 관리자이" "어야 합니다." -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "볼 수 있는 권한이 없습니다." @@ -1415,7 +1415,7 @@ msgstr "프로젝트 아이디가 객체와 프로젝트간에 알맞지 않습 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "프로젝트" @@ -1460,7 +1460,7 @@ msgstr "댓글로부터" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "순서" @@ -1641,7 +1641,7 @@ msgstr "제목" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "색" @@ -1861,7 +1861,7 @@ msgstr "좋아요" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "슬러그" @@ -1912,6 +1912,10 @@ msgstr "'{param}' 매개변수는 필수입니다." msgid "'project' parameter is mandatory" msgstr "'project' 매개변수는 필수입니다." +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "이메일" @@ -1920,7 +1924,7 @@ msgstr "이메일" msgid "create at" msgstr "생성일" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "토큰" @@ -3220,37 +3224,37 @@ msgstr "태스크보드 순서" msgid "is iocaine" msgstr "아이오케인 입니다." -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "마일스톤 아이디가 유효하지 않습니다." -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "태스크 상태 아이디가 유효하지 않습니다." -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "유저 스토리 아이디가 유효하지 않습니다." -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" "태스크 상태 아이디가 유효하지 않습니다. 상태는 반드시 같은 프로젝트에 속해야 " "합니다." -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" "유저 스토리 아이디가 유효하지 않습니다. 유저 스토리는 반드시 같은 프로젝트에 " "속해야 합니다." -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" "마일스톤 아이디가 유효하지 않습니다. 마일스톤은 반드시 같은 프로젝트에 속해" "야 합니다." -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -4006,21 +4010,21 @@ msgstr "이슈로부터 생성됨" msgid "There's no user story with that id" msgstr "아이디를 가진 유저 스토리가 없습니다." -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" "유저 스토리 상태 아이디가 유효하지 않습니다. 상태는 반드시 동일한 프로젝트에 " "속해야 합니다." -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" "마일스톤 아이디가 유효하지 않습니다. 마일스톤은 반드시 같은 프로젝트에 속해" "야 합니다." -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." @@ -4028,11 +4032,11 @@ msgstr "" "유저 스토리 아이디가 유효하지 않습니다. 모든 유저 스토리는 반드시 같은 프로젝" "트에 속해야 하고, 존재한다면, 같은 상태와 마일스톤을 가져야 합니다." -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "마일스톤은 프로젝트에 유효하지 않습니다." -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "모든 유저 스토리는 반드시 동일한 프로젝트에 속해야 합니다." @@ -4210,34 +4214,34 @@ msgstr "유효하지 않음, 토큰이 정확하고 이전에 사용하지 않 msgid "Invalid, are you sure the token is correct?" msgstr "유효하지 않음, 토큰이 정확합니까?are you sure the token is correct?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "슈퍼유저 상태" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "이 사용자가 명시적인 할당을 받지 않고 모든 권한을 가지는지 지정합니다." -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "아이디" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "필수. 30자 이하. 문자, 숫자 그리고 /./-/_ characters" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "올바른 아이디를 입력해주세요." -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "활성" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -4245,59 +4249,59 @@ msgstr "" "이 사용자를 활성 상태로 취급할 것인지 지정합니다. 계정을 삭제하는 대신에 선택" "을 해제하십시오." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "바이오그래피" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "사진" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "가입한 날짜" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "기본 언어" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "기본 테마" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "기본 시간대" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "태그 색 칠하기" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "이메일 토큰" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "새로운 이메일 주소" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "소유할 수 있는 비공개 프로젝트의 최대 개수" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "소유할 수 있는 공공 프로젝트의 최대 개수" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "소유한 비공개 프로젝트당 수용할 수 있는 최대 회원수" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "소유한 공공 프로젝트당 수용할 수 있는 최대 회원수" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "권한" diff --git a/taiga/locale/nb/LC_MESSAGES/django.po b/taiga/locale/nb/LC_MESSAGES/django.po index 0fe1d1db..6eb57831 100644 --- a/taiga/locale/nb/LC_MESSAGES/django.po +++ b/taiga/locale/nb/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/nb/)\n" @@ -56,8 +56,8 @@ msgid "Error on creating new user." msgstr "Feil ved å lage ny bruker." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Ugyldig polett" @@ -190,8 +190,8 @@ msgstr "" "et ødelagt bilde." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -771,7 +771,7 @@ msgstr "Autentisering kreves" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "navn" @@ -807,11 +807,11 @@ msgstr "bruker" msgid "application" msgstr "applikasjon" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "fullt navn" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "epostadresse" @@ -1202,35 +1202,35 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Ufullstendige argumenter" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Ugyldig bildeformat" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Ikke et gyldig malnavn" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Ikke en gyldig malbeskrivelse" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "Ugyldig brukerid" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "Brukeren eksisterer ikke" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "Brukeren må allerede være et medlem i et prosjekt" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1238,7 +1238,7 @@ msgstr "" "Prosjektet må ha en eier og minst en av brukerne må være en aktiv " "administrator" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "Du har ikke tillatelser til å se det." @@ -1265,7 +1265,7 @@ msgstr "Prosjekt ID matcher ikke mellom objekt og prosjekt" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "prosjekt" @@ -1310,7 +1310,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "rekkefølge" @@ -1471,7 +1471,7 @@ msgstr "subjekt" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "farge" @@ -1694,7 +1694,7 @@ msgstr "Liker" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "slug" @@ -1745,6 +1745,10 @@ msgstr "'{param}' parameter er obligatorisk" msgid "'project' parameter is mandatory" msgstr "'project' parameter er obligatorisk" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "epost" @@ -1753,7 +1757,7 @@ msgstr "epost" msgid "create at" msgstr "opprett ved" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "token" @@ -2753,31 +2757,31 @@ msgstr "Oppgavetavle rekkefølge" msgid "is iocaine" msgstr "Er Iocaine" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3406,27 +3410,27 @@ msgstr "" msgid "There's no user story with that id" msgstr "Det finnes ingen brukerhistorie med den id'en" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -3601,35 +3605,35 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Ugyldig, er du sikker på at token er korrekt?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "superbrukerstatus" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "Angir at denne brukeren har alle tillatelser uten eksplisitt tildele dem." -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "brukernavn" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "Påkrevd. 30 tegn eller færre. Bokstaver, tall og /./-/_ tegn" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Skriv inn et gyldig brukernavn" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "aktiv" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -3637,59 +3641,59 @@ msgstr "" "Betegner om denne brukeren bør behandles som aktiv. Velg bort dette i stedet " "for å slette kontoer." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biografi" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "bilde" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "dato ble med" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "standardspråk" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "standard tema" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "standard tidssone" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "fargelegg etiketter" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "epost token" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "ny epostadresse" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "maks antall eide private prosjekter" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "maks antall eide offentlige prosjekter" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "maks antall medlemskap for hvert eide private prosjekt" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "maks antall medlemskap for hvetr eide offentlige prosjekt" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "rettigheter" diff --git a/taiga/locale/nl/LC_MESSAGES/django.po b/taiga/locale/nl/LC_MESSAGES/django.po index 5a03648d..a7cdaf3e 100644 --- a/taiga/locale/nl/LC_MESSAGES/django.po +++ b/taiga/locale/nl/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/nl/)\n" @@ -57,8 +57,8 @@ msgid "Error on creating new user." msgstr "Fout bij het aanmaken van een nieuwe gebruiker." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Ongeldig token" @@ -199,8 +199,8 @@ msgstr "" "een afbeelding ofwel een corrupte afbeelding." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -801,7 +801,7 @@ msgstr "" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "naam" @@ -837,11 +837,11 @@ msgstr "" msgid "application" msgstr "" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "volledige naam" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "e-mail adres" @@ -1232,41 +1232,41 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Onvolledige argumenten" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Ongeldig afbeelding formaat" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Ongeldige template naam" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Ongeldige template omschrijving" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "Je hebt geen toestamming om dat te bekijken." @@ -1293,7 +1293,7 @@ msgstr "Project ID van object is niet gelijk aan die van het project" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "project" @@ -1338,7 +1338,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "volgorde" @@ -1499,7 +1499,7 @@ msgstr "onderwerp" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "kleur" @@ -1721,7 +1721,7 @@ msgstr "Personen die dit leuk vinden" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "slug" @@ -1772,6 +1772,10 @@ msgstr "'{param}' parameter is verplicht" msgid "'project' parameter is mandatory" msgstr "'project' parameter is verplicht" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "e-mail" @@ -1780,7 +1784,7 @@ msgstr "e-mail" msgid "create at" msgstr "aangemaakt op" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "token" @@ -2802,31 +2806,31 @@ msgstr "takenbord volgorde" msgid "is iocaine" msgstr "is iocaine" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3477,27 +3481,27 @@ msgstr "gegenereerd van issue" msgid "There's no user story with that id" msgstr "Er is geen user story met dat id" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -3671,11 +3675,11 @@ msgstr "Ongeldig, weet je zeker dat het token correct en ongebruikt is?" msgid "Invalid, are you sure the token is correct?" msgstr "Ongeldig, weet je zeker dat het token correct is?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "superuser status" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -3683,24 +3687,24 @@ msgstr "" "Beduidt dat deze gebruik alle toestemmingen heeft zonder deze expliciet toe " "te wijzen." -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "gebruikersnaam" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "Vereist. 30 of minder karakters. Letters, nummers en /./-/_ karakters" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Geef een geldige gebruikersnaam in" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "actief" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -3708,59 +3712,59 @@ msgstr "" "Beduidt of deze gebruiker als actief moet behandeld worden. Deselecteer dit " "i.p.v. accounts te verwijderen." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biografie" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "foto" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "toetrededatum" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "standaard taal" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "standaard tijdzone" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "kleur tags" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "e-mail token" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "nieuw e-mail adres" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "toestemmingen" diff --git a/taiga/locale/pl/LC_MESSAGES/django.po b/taiga/locale/pl/LC_MESSAGES/django.po index 55f1aab1..cdc8538b 100644 --- a/taiga/locale/pl/LC_MESSAGES/django.po +++ b/taiga/locale/pl/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/pl/)\n" @@ -59,8 +59,8 @@ msgid "Error on creating new user." msgstr "Błąd przy tworzeniu użytkownika." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Nieprawidłowy token" @@ -193,8 +193,8 @@ msgstr "" "jest uszkodzony." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -869,7 +869,7 @@ msgstr "" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "nazwa" @@ -905,11 +905,11 @@ msgstr "użytkownik" msgid "application" msgstr "aplikacja" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "Imię i Nazwisko" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "adres e-mail" @@ -1300,41 +1300,41 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Pola niekompletne" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Niepoprawny format obrazka" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Nieprawidłowa nazwa szablonu" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Nieprawidłowy opis szablonu" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "Nie masz uprawnień by to zobaczyć." @@ -1361,7 +1361,7 @@ msgstr "ID nie pasuje pomiędzy obiektem a projektem" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "projekt" @@ -1406,7 +1406,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "kolejność" @@ -1567,7 +1567,7 @@ msgstr "temat" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "kolor" @@ -1787,7 +1787,7 @@ msgstr "" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "slug" @@ -1838,6 +1838,10 @@ msgstr "'{param}' parametr jest obowiązkowy" msgid "'project' parameter is mandatory" msgstr "'project' parametr jest obowiązkowy" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "e-mail" @@ -1846,7 +1850,7 @@ msgstr "e-mail" msgid "create at" msgstr "utwórz na" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "token" @@ -3100,31 +3104,31 @@ msgstr "Kolejność tablicy zadań" msgid "is iocaine" msgstr "Iokaina" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3804,27 +3808,27 @@ msgstr "wygenerowane ze zgłoszenia" msgid "There's no user story with that id" msgstr "Nie ma historyjki użytkownika z takim ID" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -4002,11 +4006,11 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Niepoprawne, jesteś pewien, że token jest poprawny?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "status SUPERUSER" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -4014,24 +4018,24 @@ msgstr "" "Oznacza, że ten użytkownik posiada wszystkie uprawnienia bez konieczności " "ich przydzielania." -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "nazwa użytkownika" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "Wymagane. 30 znaków. Liter, cyfr i znaków /./-/_" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Wprowadź poprawną nazwę użytkownika" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "aktywny" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -4039,59 +4043,59 @@ msgstr "" "Oznacza, że ten użytkownik ma być traktowany jako aktywny. Możesz to " "odznaczyć zamiast usuwać konto." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biografia" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "zdjęcie" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "data dołączenia" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "domyślny język Taiga" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "domyślny szablon Taiga" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "domyśla strefa czasowa" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "kolory tagów" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "tokem e-mail" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "nowy adres e-mail" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "uprawnienia" diff --git a/taiga/locale/pt_BR/LC_MESSAGES/django.po b/taiga/locale/pt_BR/LC_MESSAGES/django.po index 6c05c930..957e60ad 100644 --- a/taiga/locale/pt_BR/LC_MESSAGES/django.po +++ b/taiga/locale/pt_BR/LC_MESSAGES/django.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/pt_BR/)\n" @@ -71,8 +71,8 @@ msgid "Error on creating new user." msgstr "Erro ao criar um novo usuário." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Token inválido" @@ -204,8 +204,8 @@ msgstr "" "está corrompido." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -901,7 +901,7 @@ msgstr "Autenticação necessária" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "Nome" @@ -937,11 +937,11 @@ msgstr "usuário" msgid "application" msgstr "aplicação" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "nome completo" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "endereço de e-mail" @@ -1332,35 +1332,35 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Argumentos incompletos" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Formato de imagem inválida" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Nome de template inválido" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Descrição de template inválida" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "Id de usuário inválido" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "O usuário não existe" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "O usuário deve ser um membro do projeto" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1368,7 +1368,7 @@ msgstr "" "O projeto deve ter um dono e pelo menos um dos usuários precisa ser um " "administrador ativo" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "Você não tem permissão para ver isso" @@ -1395,7 +1395,7 @@ msgstr "ID do projeto não combina entre objeto e projeto" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "projeto" @@ -1440,7 +1440,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "ordem" @@ -1601,7 +1601,7 @@ msgstr "assunto" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "cor" @@ -1822,7 +1822,7 @@ msgstr "Curtidas" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "slug" @@ -1873,6 +1873,10 @@ msgstr "'{param}' parametro é mandatório" msgid "'project' parameter is mandatory" msgstr "'project' parametro é mandatório" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "email" @@ -1881,7 +1885,7 @@ msgstr "email" msgid "create at" msgstr "criado em" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "token" @@ -3120,31 +3124,31 @@ msgstr "ordenar por quadro de tarefa" msgid "is iocaine" msgstr "é Iocaine" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3837,27 +3841,27 @@ msgstr "Gerado do problema" msgid "There's no user story with that id" msgstr "Não há história de usuário com esse id" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -4034,11 +4038,11 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Inválido, tem certeza que o token está correto?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "status de superuser" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -4046,24 +4050,24 @@ msgstr "" "Designa que esse usuário tem todas as permissões sem explicitamente assiná-" "las" -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "usuário" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "Requerido. 30 caracteres ou menos. Letras, números e caracteres /./-/_" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Digite um usuário válido" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "ativo" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -4071,59 +4075,59 @@ msgstr "" "Designa quando esse usuário deve ser tratado como ativo. desmarque isso em " "vez de deletar contas." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biografia" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "foto" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "data ingressado" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "lingua padrão" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "tema padrão" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "fuso horário padrão" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "tags coloridas" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "token de e-mail" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "novo endereço de email" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "permissões" diff --git a/taiga/locale/ru/LC_MESSAGES/django.po b/taiga/locale/ru/LC_MESSAGES/django.po index 556d85dd..5dd0e49f 100644 --- a/taiga/locale/ru/LC_MESSAGES/django.po +++ b/taiga/locale/ru/LC_MESSAGES/django.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ru/)\n" @@ -68,8 +68,8 @@ msgid "Error on creating new user." msgstr "Ошибка при создании нового пользователя." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Неверный токен" @@ -206,8 +206,8 @@ msgstr "" "изображение, либо не корректное изображение." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -893,7 +893,7 @@ msgstr "Необходима аутентификация" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "имя" @@ -929,11 +929,11 @@ msgstr "пользователь" msgid "application" msgstr "приложение" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "полное имя" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "адрес email" @@ -1327,35 +1327,35 @@ msgstr "Сделать приватным" msgid "Delete selected %(verbose_name_plural)s" msgstr "Удалить выбранные %(verbose_name_plural)s" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Список аргументов неполон" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Неправильный формат изображения" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Неверное название шаблона" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Неверное описание шаблона" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "Неправильный id пользователя" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "Пользователь не существует" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "Пользователь должен быть участником проекта" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1363,7 +1363,7 @@ msgstr "" "У проекта должен быть владелец и по крайней мере один пользователь должен " "быть активным администратором" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "У вас нет разрешения на просмотр." @@ -1390,7 +1390,7 @@ msgstr "Идентификатор проекта не подходит к эт #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "проект" @@ -1435,7 +1435,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "порядок" @@ -1596,7 +1596,7 @@ msgstr "тема" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "цвет" @@ -1820,7 +1820,7 @@ msgstr "Лайки" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "ссылочное имя" @@ -1873,6 +1873,10 @@ msgstr "параметр '{param}' является обязательным" msgid "'project' parameter is mandatory" msgstr "параметр 'project' является обязательным" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "электронная почта" @@ -1881,7 +1885,7 @@ msgstr "электронная почта" msgid "create at" msgstr "создано" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "идентификатор" @@ -3132,34 +3136,34 @@ msgstr "порядок панели задач" msgid "is iocaine" msgstr "- иокаин" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "Неверный id вехи" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "Неверный id статуса задачи" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "Неверный id пользовательской истории" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" "Неверный id статуса задачи. Статус должен принадлежать тому же проекту." -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" "Неверный id пользовательской истории. Пользовательская история должна " "принадлежать тому же проекту." -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "Неверный id вехи. Веха должна принадлежать тому же проекту." -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3919,29 +3923,29 @@ msgstr "создано из запроса" msgid "There's no user story with that id" msgstr "Не существует пользовательской истории с таким идентификатором" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" "Неверный id статуса пользовательской истории. Статус должен принадлежать " "тому же проекту." -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "Неверный id вехи. Веха должна принадлежать тому же проекту." -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "Это недопустимая веха для проекта" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "Все пользовательские истории должны быть из того же проекта" @@ -4117,92 +4121,92 @@ msgstr "Неверно, вы уверены что токен правильны msgid "Invalid, are you sure the token is correct?" msgstr "Неверно, вы уверены что токен правильный?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "статус суперпользователя" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "Выбранный пользователь имеет все разрешения, ему не чего назначит." -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "имя пользователя" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "Обязательно. 30 символов или меньше. Буквы, числа и символы /./-/_" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Введите корректное имя пользователя." -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "активный" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "Выбранный пользователь активен. Отменить выбор для удаления аккаунта." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "биография" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "фотография" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "когда присоединился" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "язык по умолчанию" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "тема по умолчанию" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "временная зона по умолчанию" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "установить цвета для тэгов" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "email токен" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "новый email адрес" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "максимальное число частных проектов" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "максимальное число публичных проектов" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "максимальное число участников для каждого частного проекта" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "максимальное число участников для каждого публичного проекта" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "разрешения" diff --git a/taiga/locale/sv/LC_MESSAGES/django.po b/taiga/locale/sv/LC_MESSAGES/django.po index 2b08d64d..5ec1f73a 100644 --- a/taiga/locale/sv/LC_MESSAGES/django.po +++ b/taiga/locale/sv/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Swedish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/sv/)\n" @@ -56,8 +56,8 @@ msgid "Error on creating new user." msgstr "Ett fel uppstod når användaren skapades. " #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Felaktig förekomst. " @@ -192,8 +192,8 @@ msgstr "" "eller en skadad bild." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -768,7 +768,7 @@ msgstr "Verifiering krävs" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "namn" @@ -804,11 +804,11 @@ msgstr "användare" msgid "application" msgstr "program" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "hela namnet" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "e-postadress" @@ -1183,41 +1183,41 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Felaktiga argument" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Felaktigt bildformat" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Inget giltigt mallnamn" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Inte giltigt mallbeskrivning" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "Du har inte behörighet att se det. " @@ -1244,7 +1244,7 @@ msgstr "Projekt-ID stämmer inte mellan objekt och projekt" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "projekt" @@ -1289,7 +1289,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "sortera" @@ -1450,7 +1450,7 @@ msgstr "titel" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "färg" @@ -1670,7 +1670,7 @@ msgstr "Gillar" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "slugg" @@ -1721,6 +1721,10 @@ msgstr "'{param}' parameter är obligatoriskt" msgid "'project' parameter is mandatory" msgstr "'project' parameter är obligatoriskt" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "e-post" @@ -1729,7 +1733,7 @@ msgstr "e-post" msgid "create at" msgstr "skapa som" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "textsträng" @@ -2721,31 +2725,31 @@ msgstr "Sortera uppgiftstavlan" msgid "is iocaine" msgstr "är Iocaine" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3385,27 +3389,27 @@ msgstr "skapad från ärende" msgid "There's no user story with that id" msgstr "Det är inga användarhistoria med det ID-numret" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -3581,11 +3585,11 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Fel, är du säker på att textsträngen är korrekt? " -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "status för administratorn" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -3593,25 +3597,25 @@ msgstr "" "Anger om användaren har alla behörigheter utan att uttryckligen tilldela " "dem. " -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "användarnamn" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "" "Obligatoriskt. 30 eller färre alfanumeriska tecken, bokstäver och /./-/_ . " -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Skriv in ett giltigt användarnamn" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "aktiv" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -3619,59 +3623,59 @@ msgstr "" "Anger om användaren ska betraktas som aktiv. Avmarkera detta i stället för " "att ta bort kontot." -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biografi" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "foto" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "blev medlem datum" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "standardspråk" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "standardtema" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "standard tidzon" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "farglägg taggar" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "e-poststräng" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "ny e-postadress" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "behörigheter" diff --git a/taiga/locale/tr/LC_MESSAGES/django.po b/taiga/locale/tr/LC_MESSAGES/django.po index 5c7aae43..7a6ca7d7 100644 --- a/taiga/locale/tr/LC_MESSAGES/django.po +++ b/taiga/locale/tr/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Turkish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/tr/)\n" @@ -58,8 +58,8 @@ msgid "Error on creating new user." msgstr "Yeni kullanıcı oluşturulurken hata meydana geldi." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "Geçersiz kupon" @@ -200,8 +200,8 @@ msgstr "" "resim dosyası değil." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -863,7 +863,7 @@ msgstr "Kimlik doğrulama gerekli" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "isim" @@ -899,11 +899,11 @@ msgstr "kullanıcı" msgid "application" msgstr "uygulama" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "tam ad" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "e-posta adresi" @@ -1292,41 +1292,41 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Eksik parametreq" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Geçersiz resim biçemi" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "Geçersiz şablon adı" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "Geçersiz şablon tanımı" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "Geçersiz kullanıcı id" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "Kullanıcı mevcut değil" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "Kullanıcı zaten proje üyesi durumunda" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "Görebilmek için yetkiniz yok." @@ -1353,7 +1353,7 @@ msgstr "Proje ve nesne arasında Proje ID uyuşmazlığı mevcut" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "proje" @@ -1398,7 +1398,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "sıra" @@ -1559,7 +1559,7 @@ msgstr "konu" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "renk" @@ -1779,7 +1779,7 @@ msgstr "Beğeniler" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "satır" @@ -1830,6 +1830,10 @@ msgstr "'{param}' parametresi zorunlu" msgid "'project' parameter is mandatory" msgstr "'proje' parametresi zorunlu" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "e-posta" @@ -1838,7 +1842,7 @@ msgstr "e-posta" msgid "create at" msgstr "" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "kupon" @@ -2896,31 +2900,31 @@ msgstr "görev panosu sırası" msgid "is iocaine" msgstr "baldıran zehri" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3559,27 +3563,27 @@ msgstr "talepden oluştur" msgid "There's no user story with that id" msgstr "Bu id ye sahip kullanıcı hikayesi yok" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -3755,93 +3759,93 @@ msgstr "" msgid "Invalid, are you sure the token is correct?" msgstr "Geçersiz, kuponun doğru olduğuna emin misin?" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "superuser durumu" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "kullanıcı adı" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "" "Zorunlu. 30 karakter ya da daha azı. Harfler, sayılar ve /./-/_ karakterleri" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "Geçerli bir kullanıcı adı girin." -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "aktif" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "biyografi" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "fotoğraf" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "katılma tarihi" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "varsayılan dil" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "varsayılan tema" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "varsayılan saat dilimi" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "etiketleri renklendir" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "e-posta kuponu" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "yeni e-posta adresi" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "izinler" diff --git a/taiga/locale/zh-Hans/LC_MESSAGES/django.po b/taiga/locale/zh-Hans/LC_MESSAGES/django.po index d6d38dbc..73e12c44 100644 --- a/taiga/locale/zh-Hans/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hans/LC_MESSAGES/django.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Simplified (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hans/)\n" @@ -66,8 +66,8 @@ msgid "Error on creating new user." msgstr "无法创建新用户" #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "无效令牌" @@ -193,8 +193,8 @@ msgid "" msgstr "请上传一张有效的图片。所上传的不是图片或已损坏" #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -894,7 +894,7 @@ msgstr "需要身份认证" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "名称" @@ -930,11 +930,11 @@ msgstr "用户" msgid "application" msgstr "应用" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "全名" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "邮件地址" @@ -1343,41 +1343,41 @@ msgstr "私有" msgid "Delete selected %(verbose_name_plural)s" msgstr "删除选中的%(verbose_name_plural)s" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "不完整的参数" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "非法的图片格式" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "非法的模板名称" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "无效的模板说明" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "无效用户ID" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "用户不存在" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "用户必须属于某一个项目" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "该项目必须有一个所有者，至少一个用户必须是一个积极的管理员" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "你无权访问" @@ -1404,7 +1404,7 @@ msgstr "对象和项目间的项目ID不匹配" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "项目" @@ -1449,7 +1449,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "次序" @@ -1610,7 +1610,7 @@ msgstr "主题" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "颜色" @@ -1830,7 +1830,7 @@ msgstr "点赞" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "代称" @@ -1881,6 +1881,10 @@ msgstr "'{param}' 参数必填" msgid "'project' parameter is mandatory" msgstr "'project' 参数必填" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "电子邮件" @@ -1889,7 +1893,7 @@ msgstr "电子邮件" msgid "create at" msgstr "创建自" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "令牌" @@ -3142,31 +3146,31 @@ msgstr "任务板次序" msgid "is iocaine" msgstr "负予全新任务" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "无效的里程碑ID" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "无效的任务状态ID" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "无效的用户故事ID" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "任务状态ID无效，该状态必须属于同一项目。" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "用户故事ID无效，该用户故事必须属于同一项目。" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "里程碑ID无效，该里程碑必须属于同一项目" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3912,27 +3916,27 @@ msgstr "从问题派生" msgid "There's no user story with that id" msgstr "该ID无用户故事" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "用户故事ID无效，所有用户故事必须属于同一项目" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "里程碑ID无效，此里程碑必须属于同一项目" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "用户故事ID无效，所有用户故事必须属于同一项目" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "此里程碑在该项目无效" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "所有用户故事必须从属于一个同一项目" @@ -4106,92 +4110,92 @@ msgstr "无效，请确定令牌正确，之前使用过？" msgid "Invalid, are you sure the token is correct?" msgstr "无效，请确定令牌正确？" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "超级用户状态" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "选定此用户拥有所有权限，而不用显式将他们分配。" -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "用户名" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "必填，长度小于30的英文字母、数字、“.”、“-”、“_”" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "输入一个合法的用户名" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "活跃" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "指定是否此用户为活跃用户。取消选择这而不是删除帐户。" -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "个人简介" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "照片" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "加入日期" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "默认语言" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "默认主题" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "默认时区" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "彩色标签" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "电子邮件密码" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "新邮件地址" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "最大私有项目数" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "最大公开项目数" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "私有项目最大成员数" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "公开项目最大成员数" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "权限" diff --git a/taiga/locale/zh-Hant/LC_MESSAGES/django.po b/taiga/locale/zh-Hant/LC_MESSAGES/django.po index 2b3fc5e0..e6d12aa7 100644 --- a/taiga/locale/zh-Hant/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hant/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 09:47+0100\n" -"PO-Revision-Date: 2017-02-05 12:23+0000\n" +"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-09 08:12+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hant/)\n" @@ -59,8 +59,8 @@ msgid "Error on creating new user." msgstr "無法創建新使用者" #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 -#: taiga/projects/api.py:387 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:374 +#: taiga/projects/api.py:395 msgid "Invalid token" msgstr "無效的代碼　" @@ -186,8 +186,8 @@ msgid "" msgstr "上傳有效圖片，你所上傳的檔案非圖檔或已損壞" #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 -#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/hooks/api.py:69 taiga/projects/api.py:409 taiga/projects/api.py:442 +#: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 #: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 @@ -849,7 +849,7 @@ msgstr "要求取得授權" #: taiga/projects/models.py:643 taiga/projects/models.py:663 #: taiga/projects/models.py:683 taiga/projects/models.py:715 #: taiga/projects/models.py:735 taiga/users/admin.py:54 -#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +#: taiga/users/models.py:303 taiga/webhooks/models.py:29 msgid "name" msgstr "姓名" @@ -885,11 +885,11 @@ msgstr "使用者" msgid "application" msgstr "應用程式" -#: taiga/feedback/models.py:25 taiga/users/models.py:139 +#: taiga/feedback/models.py:25 taiga/users/models.py:140 msgid "full name" msgstr "全名" -#: taiga/feedback/models.py:27 taiga/users/models.py:134 +#: taiga/feedback/models.py:27 taiga/users/models.py:135 msgid "email address" msgstr "電子郵件" @@ -1277,41 +1277,41 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:152 taiga/users/api.py:244 +#: taiga/projects/api.py:160 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "不完整參數" -#: taiga/projects/api.py:156 taiga/users/api.py:249 +#: taiga/projects/api.py:164 taiga/users/api.py:249 msgid "Invalid image format" msgstr "無效的圖片檔案" -#: taiga/projects/api.py:217 +#: taiga/projects/api.py:225 msgid "Not valid template name" msgstr "非有效樣板名稱　" -#: taiga/projects/api.py:220 +#: taiga/projects/api.py:228 msgid "Not valid template description" msgstr "無效樣板描述" -#: taiga/projects/api.py:346 +#: taiga/projects/api.py:354 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:352 +#: taiga/projects/api.py:360 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:356 +#: taiga/projects/api.py:364 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:777 +#: taiga/projects/api.py:785 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:811 +#: taiga/projects/api.py:819 msgid "You don't have permisions to see that." msgstr "您無觀看權限" @@ -1338,7 +1338,7 @@ msgstr "專案ID不符合物件與專案" #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:314 msgid "project" msgstr "專案" @@ -1383,7 +1383,7 @@ msgstr "" #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 #: taiga/projects/models.py:687 taiga/projects/models.py:717 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:309 msgid "order" msgstr "次序" @@ -1544,7 +1544,7 @@ msgstr "主旨" #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 -#: taiga/users/models.py:141 +#: taiga/users/models.py:142 msgid "color" msgstr "顏色" @@ -1764,7 +1764,7 @@ msgstr "喜歡" #: taiga/projects/models.py:520 taiga/projects/models.py:553 #: taiga/projects/models.py:611 taiga/projects/models.py:685 #: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 -#: taiga/users/admin.py:58 taiga/users/models.py:303 +#: taiga/users/admin.py:58 taiga/users/models.py:305 msgid "slug" msgstr "代稱" @@ -1815,6 +1815,10 @@ msgstr "'{param}' 參數為必要" msgid "'project' parameter is mandatory" msgstr "'project'參數為必要" +#: taiga/projects/mixins/validators.py:19 +msgid "The user must be a project member." +msgstr "" + #: taiga/projects/models.py:79 msgid "email" msgstr "電子郵件" @@ -1823,7 +1827,7 @@ msgstr "電子郵件" msgid "create at" msgstr "創建於" -#: taiga/projects/models.py:83 taiga/users/models.py:156 +#: taiga/projects/models.py:83 taiga/users/models.py:157 msgid "token" msgstr "代號" @@ -3065,31 +3069,31 @@ msgstr "任務板次序" msgid "is iocaine" msgstr "挑戰全新任務" -#: taiga/projects/tasks/validators.py:59 +#: taiga/projects/tasks/validators.py:61 msgid "Invalid milestone id." msgstr "" -#: taiga/projects/tasks/validators.py:70 +#: taiga/projects/tasks/validators.py:72 msgid "Invalid task status id." msgstr "" -#: taiga/projects/tasks/validators.py:83 +#: taiga/projects/tasks/validators.py:85 msgid "Invalid user story id." msgstr "" -#: taiga/projects/tasks/validators.py:107 +#: taiga/projects/tasks/validators.py:109 msgid "Invalid task status id. The status must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:121 +#: taiga/projects/tasks/validators.py:123 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:133 +#: taiga/projects/tasks/validators.py:135 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" -#: taiga/projects/tasks/validators.py:150 +#: taiga/projects/tasks/validators.py:152 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." @@ -3758,27 +3762,27 @@ msgstr "産生自問題　" msgid "There's no user story with that id" msgstr "該ID無相關使用者故事" -#: taiga/projects/userstories/validators.py:82 -#: taiga/projects/userstories/validators.py:108 +#: taiga/projects/userstories/validators.py:83 +#: taiga/projects/userstories/validators.py:109 msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:120 +#: taiga/projects/userstories/validators.py:121 msgid "Invalid milestone id. The milistone must belong to the same project." msgstr "" -#: taiga/projects/userstories/validators.py:135 +#: taiga/projects/userstories/validators.py:136 msgid "" "Invalid user story ids. All stories must belong to the same project and, if " "it exists, to the same status and milestone." msgstr "" -#: taiga/projects/userstories/validators.py:159 +#: taiga/projects/userstories/validators.py:160 msgid "The milestone isn't valid for the project" msgstr "" -#: taiga/projects/userstories/validators.py:169 +#: taiga/projects/userstories/validators.py:170 msgid "All the user stories must be from the same project" msgstr "" @@ -3952,92 +3956,92 @@ msgstr "無效，請確認代號正確，之前是否曾使用過？" msgid "Invalid, are you sure the token is correct?" msgstr "無效，請確認代號是否正確？" -#: taiga/users/models.py:97 +#: taiga/users/models.py:98 msgid "superuser status" msgstr "超級使用者狀態　" -#: taiga/users/models.py:98 +#: taiga/users/models.py:99 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "無經明確分派，即賦予該使用者所有權限，" -#: taiga/users/models.py:128 +#: taiga/users/models.py:129 msgid "username" msgstr "使用者名稱" -#: taiga/users/models.py:129 +#: taiga/users/models.py:130 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "必填。最多30字元(可為數字，字母，符號....)" -#: taiga/users/models.py:132 +#: taiga/users/models.py:133 msgid "Enter a valid username." msgstr "輸入有效的使用者名稱　" -#: taiga/users/models.py:135 +#: taiga/users/models.py:136 msgid "active" msgstr "活躍" -#: taiga/users/models.py:136 +#: taiga/users/models.py:137 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "賦予該使用者活躍角色，以不選擇取代刪除帳戶功能。" -#: taiga/users/models.py:142 +#: taiga/users/models.py:143 msgid "biography" msgstr "自傳" -#: taiga/users/models.py:145 +#: taiga/users/models.py:146 msgid "photo" msgstr "照片" -#: taiga/users/models.py:146 +#: taiga/users/models.py:147 msgid "date joined" msgstr "加入日期" -#: taiga/users/models.py:148 +#: taiga/users/models.py:149 msgid "default language" msgstr "預設語言　" -#: taiga/users/models.py:150 +#: taiga/users/models.py:151 msgid "default theme" msgstr "預設主題" -#: taiga/users/models.py:152 +#: taiga/users/models.py:153 msgid "default timezone" msgstr "預設時區" -#: taiga/users/models.py:154 +#: taiga/users/models.py:155 msgid "colorize tags" msgstr "顏色標籤" -#: taiga/users/models.py:159 +#: taiga/users/models.py:160 msgid "email token" msgstr "電子郵件符號　" -#: taiga/users/models.py:161 +#: taiga/users/models.py:162 msgid "new email address" msgstr "新電子郵件地址" -#: taiga/users/models.py:168 +#: taiga/users/models.py:169 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:171 +#: taiga/users/models.py:172 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:174 +#: taiga/users/models.py:175 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:178 +#: taiga/users/models.py:179 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:305 +#: taiga/users/models.py:307 msgid "permissions" msgstr "許可" From d09dbcb3db653f37fd7f34574af0583a19ec8f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 9 Feb 2017 12:01:11 +0100 Subject: [PATCH 099/144] [i18n] Update locales --- taiga/locale/es/LC_MESSAGES/django.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/taiga/locale/es/LC_MESSAGES/django.po b/taiga/locale/es/LC_MESSAGES/django.po index 7a887fc7..07bb75c9 100644 --- a/taiga/locale/es/LC_MESSAGES/django.po +++ b/taiga/locale/es/LC_MESSAGES/django.po @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" -"Last-Translator: Taiga Dev Team \n" +"PO-Revision-Date: 2017-02-09 09:06+0000\n" +"Last-Translator: David Barragán \n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/es/)\n" "MIME-Version: 1.0\n" @@ -1935,7 +1935,7 @@ msgstr "el parámetro 'project' es obligatório" #: taiga/projects/mixins/validators.py:19 msgid "The user must be a project member." -msgstr "" +msgstr "El usuario debe ser miembro del proyecto." #: taiga/projects/models.py:79 msgid "email" From 03d97f6ece0fb29c537d241c2727472b1782c968 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 10 Feb 2017 08:55:30 +0100 Subject: [PATCH 100/144] Issue 4931:Tag Creation Caps Bug --- taiga/projects/tagging/services.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/taiga/projects/tagging/services.py b/taiga/projects/tagging/services.py index e281eaa5..78fd00b6 100644 --- a/taiga/projects/tagging/services.py +++ b/taiga/projects/tagging/services.py @@ -34,6 +34,7 @@ def create_tag(project, tag, color): def edit_tag(project, from_tag, to_tag, color): + to_tag = to_tag.lower() sql = """ UPDATE userstories_userstory SET tags = array_distinct(array_replace(tags, %(from_tag)s, %(to_tag)s)) @@ -64,6 +65,7 @@ def edit_tag(project, from_tag, to_tag, color): def rename_tag(project, from_tag, to_tag, **kwargs): # Kwargs can have a color parameter update_color = "color" in kwargs + to_tag = to_tag.lower() if update_color: color = kwargs.get("color") else: From d306900c3179d538997134e3c22e2f953b73517c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 14 Feb 2017 21:00:21 +0100 Subject: [PATCH 101/144] Avoid problems with some malformed requests --- taiga/projects/history/mixins.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/taiga/projects/history/mixins.py b/taiga/projects/history/mixins.py index 2e058879..0bb90fd0 100644 --- a/taiga/projects/history/mixins.py +++ b/taiga/projects/history/mixins.py @@ -59,7 +59,9 @@ class HistoryResourceMixin(object): """ user = self.request.user - comment = self.request.DATA.get("comment", "") + comment = "" + if isinstance(self.request.DATA, dict): + comment = self.request.DATA.get("comment", "") if obj is None: obj = self.get_object() From f7595b65cc7c2aa7dc147ca2b61e612a1903dee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 18 Jan 2017 09:25:39 +0100 Subject: [PATCH 102/144] Add trello importer --- requirements.txt | 4 + settings/common.py | 4 + taiga/front/urls.py | 2 + taiga/importers/api.py | 39 ++ taiga/importers/management/__init__.py | 0 .../importers/management/commands/__init__.py | 0 .../management/commands/import_from_trello.py | 89 +++ taiga/importers/permissions.py | 32 ++ taiga/importers/trello/api.py | 147 +++++ taiga/importers/trello/importer.py | 537 ++++++++++++++++++ taiga/importers/trello/tasks.py | 56 ++ .../0005_epic_external_reference.py | 21 + taiga/projects/epics/models.py | 3 + taiga/projects/references/models.py | 13 + taiga/projects/userstories/api.py | 1 + taiga/routers.py | 5 + .../integration/test_importers_trello_api.py | 244 ++++++++ 17 files changed, 1197 insertions(+) create mode 100644 taiga/importers/api.py create mode 100644 taiga/importers/management/__init__.py create mode 100644 taiga/importers/management/commands/__init__.py create mode 100644 taiga/importers/management/commands/import_from_trello.py create mode 100644 taiga/importers/permissions.py create mode 100644 taiga/importers/trello/api.py create mode 100644 taiga/importers/trello/importer.py create mode 100644 taiga/importers/trello/tasks.py create mode 100644 taiga/projects/epics/migrations/0005_epic_external_reference.py create mode 100644 tests/integration/test_importers_trello_api.py diff --git a/requirements.txt b/requirements.txt index 7ff142ab..11efe393 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,6 +17,8 @@ Markdown==2.6.7 fn==0.4.3 diff-match-patch==20121119 requests==2.12.4 +requests-oauthlib==0.6.2 +webcolors==1.5 django-sr==0.0.4 easy-thumbnails==2.3 celery==3.1.24 @@ -35,3 +37,5 @@ netaddr==0.7.18 serpy==0.1.1 psd-tools==1.4 CairoSVG==2.0.1 +cryptography==1.7.1 +PyJWT==1.4.2 diff --git a/settings/common.py b/settings/common.py index b4c9e002..2e0cd3ad 100644 --- a/settings/common.py +++ b/settings/common.py @@ -318,6 +318,7 @@ INSTALLED_APPS = [ "taiga.hooks.bitbucket", "taiga.hooks.gogs", "taiga.webhooks", + "taiga.importers", "djmail", "django_jinja", @@ -561,6 +562,9 @@ MAX_PENDING_MEMBERSHIPS = 30 # Max number of unconfirmed memberships in a projec from .sr import * +TRELLO_API_KEY = "" +TRELLO_SECRET_KEY = "" + # NOTE: DON'T INSERT MORE SETTINGS AFTER THIS LINE TEST_RUNNER="django.test.runner.DiscoverRunner" diff --git a/taiga/front/urls.py b/taiga/front/urls.py index 77d53dab..5190d2f8 100644 --- a/taiga/front/urls.py +++ b/taiga/front/urls.py @@ -23,6 +23,8 @@ urls = { "login": "/login", "register": "/register", "forgot-password": "/forgot-password", + "new-project": "/project/new", + "new-project-import": "/project/new/import/{0}", "change-password": "/change-password/{0}", # user.token "change-email": "/change-email/{0}", # user.email_token diff --git a/taiga/importers/api.py b/taiga/importers/api.py new file mode 100644 index 00000000..c1e774cc --- /dev/null +++ b/taiga/importers/api.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Taiga Agile LLC +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from taiga.base.api import viewsets +from taiga.base.decorators import list_route + + +class BaseImporterViewSet(viewsets.ViewSet): + @list_route(methods=["GET"]) + def list_users(self, request, *args, **kwargs): + raise NotImplementedError + + @list_route(methods=["GET"]) + def list_projects(self, request, *args, **kwargs): + raise NotImplementedError + + @list_route(methods=["POST"]) + def import_project(self, request, *args, **kwargs): + raise NotImplementedError + + @list_route(methods=["GET"]) + def auth_url(self, request, *args, **kwargs): + raise NotImplementedError + + @list_route(methods=["POST"]) + def authorize(self, request, *args, **kwargs): + raise NotImplementedError diff --git a/taiga/importers/management/__init__.py b/taiga/importers/management/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/taiga/importers/management/commands/__init__.py b/taiga/importers/management/commands/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/taiga/importers/management/commands/import_from_trello.py b/taiga/importers/management/commands/import_from_trello.py new file mode 100644 index 00000000..c04537fe --- /dev/null +++ b/taiga/importers/management/commands/import_from_trello.py @@ -0,0 +1,89 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.core.management.base import BaseCommand +from django.db.models import Q + +from taiga.importers.trello.importer import TrelloImporter +from taiga.users.models import User +from taiga.projects.services import projects as service + +import unittest.mock +import timeit + + +class Command(BaseCommand): + def add_arguments(self, parser): + parser.add_argument('--token', dest="token", type=str, + help='Auth token') + parser.add_argument('--project-id', dest="project_id", type=str, + help='Project ID or full name (ex: taigaio/taiga-back)') + parser.add_argument('--template', dest='template', default="kanban", + help='template to use: scrum or kanban (default kanban)') + parser.add_argument('--ask-for-users', dest='ask_for_users', const=True, + action="store_const", default=False, + help='Import closed data') + parser.add_argument('--closed-data', dest='closed_data', const=True, + action="store_const", default=False, + help='Import closed data') + parser.add_argument('--keep-external-reference', dest='keep_external_reference', const=True, + action="store_const", default=False, + help='Store external reference of imported data') + + def handle(self, *args, **options): + admin = User.objects.get(username="admin") + if options.get('token', None): + token = options.get('token') + else: + (oauth_token, oauth_token_secret, url) = TrelloImporter.get_auth_url() + print("Go to here and come with your token: {}".format(url)) + oauth_verifier = input("Code: ") + access_data = TrelloImporter.get_access_token(oauth_token, oauth_token_secret, oauth_verifier) + token = access_data['oauth_token'] + print("Access token: {}".format(token)) + importer = TrelloImporter(admin, token) + + if options.get('project_id', None): + project_id = options.get('project_id') + else: + print("Select the project to import:") + for project in importer.list_projects(): + print("- {}: {}".format(project['id'], project['name'])) + project_id = input("Project id: ") + + users_bindings = {} + if options.get('ask_for_users', None): + print("Add the username or email for next trello users:") + for user in importer.list_users(project_id): + while True: + username_or_email = input("{}: ".format(user['fullName'])) + if username_or_email == "": + break + try: + users_bindings[user['id']] = User.objects.get(Q(username=username_or_email) | Q(email=username_or_email)) + break + except User.DoesNotExist: + print("ERROR: Invalid username or email") + + options = { + "template": options.get('template'), + "import_closed_data": options.get("closed_data", False), + "users_bindings": users_bindings, + "keep_external_reference": options.get('keep_external_reference') + } + importer.import_project(project_id, options) diff --git a/taiga/importers/permissions.py b/taiga/importers/permissions.py new file mode 100644 index 00000000..1532989e --- /dev/null +++ b/taiga/importers/permissions.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from taiga.base.api.permissions import TaigaResourcePermission, AllowAny, IsAuthenticated +from taiga.base.api.permissions import IsSuperUser, HasProjectPerm, IsProjectAdmin + +from taiga.permissions.permissions import CommentAndOrUpdatePerm + + +class ImporterPermission(TaigaResourcePermission): + enought_perms = IsAuthenticated() + global_perms = None + auth_url_perms = IsAuthenticated() + authorize_perms = IsAuthenticated() + list_users_perms = IsAuthenticated() + list_projects_perms = IsAuthenticated() + import_project_perms = IsAuthenticated() diff --git a/taiga/importers/trello/api.py b/taiga/importers/trello/api.py new file mode 100644 index 00000000..33b9fe40 --- /dev/null +++ b/taiga/importers/trello/api.py @@ -0,0 +1,147 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Taiga Agile LLC +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import uuid + +from django.utils.translation import ugettext as _ +from django.conf import settings + +from taiga.base.api import viewsets +from taiga.base import response +from taiga.base import exceptions as exc +from taiga.base.decorators import list_route +from taiga.users.models import AuthData, User +from taiga.users.services import get_user_photo_url +from taiga.users.gravatar import get_user_gravatar_id +from taiga.projects.serializers import ProjectSerializer + +from .importer import TrelloImporter +from taiga.importers import permissions +from . import tasks + + +class TrelloImporterViewSet(viewsets.ViewSet): + permission_classes = (permissions.ImporterPermission,) + + @list_route(methods=["POST"]) + def list_users(self, request, *args, **kwargs): + self.check_permissions(request, "list_users", None) + + token = request.DATA.get('token', None) + project_id = request.DATA.get('project', None) + + if not project_id: + raise exc.WrongArguments(_("The project param is needed")) + + importer = TrelloImporter(request.user, token) + users = importer.list_users(project_id) + for user in users: + user['user'] = None + if not user['email']: + continue + + try: + taiga_user = User.objects.get(email=user['email']) + except User.DoesNotExist: + continue + + user['user'] = { + 'id': taiga_user.id, + 'full_name': taiga_user.get_full_name(), + 'gravatar_id': get_user_gravatar_id(taiga_user), + 'photo': get_user_photo_url(taiga_user), + } + return response.Ok(users) + + @list_route(methods=["POST"]) + def list_projects(self, request, *args, **kwargs): + self.check_permissions(request, "list_projects", None) + token = request.DATA.get('token', None) + importer = TrelloImporter(request.user, token) + projects = importer.list_projects() + return response.Ok(projects) + + @list_route(methods=["POST"]) + def import_project(self, request, *args, **kwargs): + self.check_permissions(request, "import_project", None) + + token = request.DATA.get('token', None) + project_id = request.DATA.get('project', None) + if not project_id: + raise exc.WrongArguments(_("The project param is needed")) + + options = { + "name": request.DATA.get('name', None), + "description": request.DATA.get('description', None), + "template": request.DATA.get('template', "kanban"), + "users_bindings": request.DATA.get("users_bindings", {}), + "keep_external_reference": request.DATA.get("keep_external_reference", False), + "is_private": request.DATA.get("is_private", False), + } + + if settings.CELERY_ENABLED: + task = tasks.import_project.delay(request.user.id, token, project_id, options) + return response.Accepted({"task_id": task.id}) + + importer = TrelloImporter(request.user, token) + project = importer.import_project(project_id, options) + project_data = { + "slug": project.slug, + "my_permissions": ["view_us"], + "is_backlog_activated": project.is_backlog_activated, + "is_kanban_activated": project.is_kanban_activated, + } + + return response.Ok(project_data) + + @list_route(methods=["GET"]) + def auth_url(self, request, *args, **kwargs): + self.check_permissions(request, "auth_url", None) + + (oauth_token, oauth_secret, url) = TrelloImporter.get_auth_url() + + (auth_data, created) = AuthData.objects.get_or_create( + user=request.user, + key="trello-oauth", + defaults={ + "value": uuid.uuid4().hex, + "extra": {}, + } + ) + auth_data.extra = { + "oauth_token": oauth_token, + "oauth_secret": oauth_secret, + } + auth_data.save() + + return response.Ok({"url": url}) + + @list_route(methods=["POST"]) + def authorize(self, request, *args, **kwargs): + self.check_permissions(request, "authorize", None) + + try: + oauth_data = request.user.auth_data.get(key="trello-oauth") + oauth_token = oauth_data.extra['oauth_token'] + oauth_secret = oauth_data.extra['oauth_secret'] + oauth_verifier = request.DATA.get('code') + oauth_data.delete() + trello_token = TrelloImporter.get_access_token(oauth_token, oauth_secret, oauth_verifier)['oauth_token'] + except Exception as e: + raise exc.WrongArguments(_("Invalid or expired auth token")) + + return response.Ok({ + "token": trello_token + }) diff --git a/taiga/importers/trello/importer.py b/taiga/importers/trello/importer.py new file mode 100644 index 00000000..e41063b8 --- /dev/null +++ b/taiga/importers/trello/importer.py @@ -0,0 +1,537 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.utils.translation import ugettext as _ + +from requests_oauthlib import OAuth1Session, OAuth1 +from django.conf import settings +from django.core.files.base import ContentFile +from django.contrib.contenttypes.models import ContentType +import requests +import webcolors + +from django.template.defaultfilters import slugify +from taiga.base import exceptions as exc +from taiga.projects.services import projects as projects_service +from taiga.projects.models import Project, ProjectTemplate, Membership +from taiga.projects.userstories.models import UserStory +from taiga.projects.tasks.models import Task +from taiga.projects.attachments.models import Attachment +from taiga.projects.history.services import (make_diff_from_dicts, + make_diff_values, + make_key_from_model_object, + get_typename_for_model_class, + FrozenDiff) +from taiga.projects.history.models import HistoryEntry +from taiga.projects.history.choices import HistoryType +from taiga.projects.custom_attributes.models import UserStoryCustomAttribute +from taiga.mdrender.service import render as mdrender +from taiga.timeline.rebuilder import rebuild_timeline +from taiga.timeline.models import Timeline +from taiga.front.templatetags.functions import resolve as resolve_front_url + +from taiga.base import exceptions + + +class TrelloClient: + def __init__(self, api_key, api_secret, token): + self.api_key = api_key + self.api_secret = api_secret + self.token = token + if self.token: + self.oauth = OAuth1( + client_key=self.api_key, + client_secret=self.api_secret, + resource_owner_key=self.token + ) + else: + self.oauth = None + + def get(self, uri_path, query_params=None): + headers = {'Accept': 'application/json'} + if query_params is None: + query_params = {} + + if uri_path[0] == '/': + uri_path = uri_path[1:] + url = 'https://api.trello.com/1/%s' % uri_path + + response = requests.get(url, params=query_params, headers=headers, auth=self.oauth) + + if response.status_code == 400: + raise exc.WrongArguments(_("Invalid Request: %s at %s") % (response.text, url)) + if response.status_code == 401: + raise exc.AuthenticationFailed(_("Unauthorized: %s at %s") % (response.text, url)) + if response.status_code == 403: + raise exc.PermissionDenied(_("Unauthorized: %s at %s") % (response.text, url)) + if response.status_code == 404: + raise exc.NotFound(_("Resource Unavailable: %s at %s") % (response.text, url)) + if response.status_code != 200: + raise exc.WrongArguments(_("Resource Unavailable: %s at %s") % (response.text, url)) + + return response.json() + + +class TrelloImporter: + def __init__(self, user, token): + self._user = user + self._cached_orgs = {} + self._client = TrelloClient( + api_key=settings.TRELLO_API_KEY, + api_secret=settings.TRELLO_SECRET_KEY, + token=token, + ) + + def list_projects(self): + projects_data = self._client.get("/members/me/boards", { + "fields": "id,name,desc,prefs,idOrganization", + "organization": "true", + "organization_fields": "prefs", + }) + projects = [] + for project in projects_data: + is_private = False + if project['prefs']['permissionLevel'] == "private": + is_private = True + + if project['prefs']['permissionLevel'] == "org": + if 'organization' not in project: + is_private = True + elif project['organization']['prefs']['permissionLevel'] == "private": + is_private = True + + projects.append({ + "id": project['id'], + "name": project['name'], + "description": project['desc'], + "is_private": is_private, + }) + return projects + + def list_users(self, project_id): + members = [] + for member in self._client.get("/board/{}/members/all".format(project_id), {"fields": "id"}): + user = self._client.get("/member/{}".format(member['id']), {"fields": "id,fullName,email"}) + members.append({ + "id": user['id'], + "full_name": user['fullName'], + "email": user['email'], + }) + return members + + def import_project(self, project_id, options): + data = self._client.get( + "/board/{}".format(project_id), + { + "fields": "name,desc", + "cards": "all", + "card_fields": "closed,labels,idList,desc,due,name,pos,dateLastActivity,idChecklists,idMembers,url", + "card_attachments": "true", + "labels": "all", + "labels_limit": "1000", + "lists": "all", + "list_fields": "closed,name,pos", + "members": "none", + "checklists": "all", + "checklist_fields": "name", + "organization": "true", + "organization_fields": "logoHash", + } + ) + + project = self._import_project_data(data, options) + self._import_user_stories_data(data, project, options) + self._cleanup(project, options) + Timeline.objects.filter(project=project).delete() + rebuild_timeline(None, None, project.id) + return project + + def _import_project_data(self, data, options): + board = data + labels = board['labels'] + statuses = board['lists'] + project_template = ProjectTemplate.objects.get(slug=options.get('template', "kanban")) + project_template.us_statuses = [] + counter = 0 + for us_status in statuses: + if counter == 0: + project_template.default_options["us_status"] = us_status['name'] + + counter += 1 + if us_status['name'] not in [s['name'] for s in project_template.us_statuses]: + project_template.us_statuses.append({ + "name": us_status['name'], + "slug": slugify(us_status['name']), + "is_closed": False, + "is_archived": True if us_status['closed'] else False, + "color": "#999999", + "wip_limit": None, + "order": us_status['pos'], + }) + + project_template.task_statuses = [] + project_template.task_statuses.append({ + "name": "Incomplete", + "slug": "incomplete", + "is_closed": False, + "color": "#ff8a84", + "order": 1, + }) + project_template.task_statuses.append({ + "name": "Complete", + "slug": "complete", + "is_closed": True, + "color": "#669900", + "order": 2, + }) + project_template.default_options["task_status"] = "Incomplete" + project_template.roles.append({ + "name": "Trello", + "slug": "trello", + "computable": False, + "permissions": project_template.roles[0]['permissions'], + "order": 70, + }) + + tags_colors = [] + for label in labels: + name = label['name'] + if not name: + name = label['color'] + name = name.lower() + color = self._ensure_hex_color(label['color']) + tags_colors.append([name, color]) + + project = Project( + name=options.get('name', None) or board['name'], + description=options.get('description', None) or board['desc'], + owner=self._user, + tags_colors=tags_colors, + creation_template=project_template, + is_private=options.get('is_private', False), + ) + (can_create, error_message) = projects_service.check_if_project_can_be_created_or_updated(project) + if not can_create: + raise exceptions.NotEnoughSlotsForProject(project.is_private, 1, error_message) + project.save() + + if board.get('organization', None): + trello_avatar_template = "https://trello-logos.s3.amazonaws.com/{}/170.png" + project_logo_url = trello_avatar_template.format(board['organization']['logoHash']) + data = requests.get(project_logo_url) + project.logo.save("logo.png", ContentFile(data.content), save=True) + + UserStoryCustomAttribute.objects.create( + name="Due", + description="Due date", + type="date", + order=1, + project=project + ) + for user in options.get('users_bindings', {}).values(): + Membership.objects.create( + user=user, + project=project, + role=project.get_roles().get(slug="trello"), + is_admin=False, + invited_by=self._user, + ) + return project + + def _import_user_stories_data(self, data, project, options): + users_bindings = options.get('users_bindings', {}) + statuses = {s['id']: s for s in data['lists']} + cards = data['cards'] + due_date_field = project.userstorycustomattributes.first() + + for card in cards: + if card['closed'] and not options.get("import_closed_data", False): + continue + if statuses[card['idList']]['closed'] and not options.get("import_closed_data", False): + continue + + tags = [] + for tag in card['labels']: + name = tag['name'] + if not name: + name = tag['color'] + name = name.lower() + tags.append(name) + + assigned_to = None + if len(card['idMembers']) > 0: + assigned_to = users_bindings.get(card['idMembers'][0], None) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["trello", card['url']] + + us = UserStory.objects.create( + project=project, + owner=self._user, + assigned_to=assigned_to, + status=project.us_statuses.get(name=statuses[card['idList']]['name']), + kanban_order=card['pos'], + sprint_order=card['pos'], + backlog_order=card['pos'], + subject=card['name'], + description=card['desc'], + tags=tags, + external_reference=external_reference + ) + + if len(card['idMembers']) > 1: + for watcher in card['idMembers'][1:]: + watcher_user = users_bindings.get(watcher, None) + if watcher_user: + us.add_watcher(watcher_user) + + if card['due']: + us.custom_attributes_values.attributes_values = {due_date_field.id: card['due']} + us.custom_attributes_values.save() + + UserStory.objects.filter(id=us.id).update( + modified_date=card['dateLastActivity'], + created_date=card['dateLastActivity'] + ) + self._import_attachments(us, card, options) + self._import_tasks(data, us, card) + self._import_actions(us, card, statuses, options) + + def _import_tasks(self, data, us, card): + checklists_by_id = {c['id']: c for c in data['checklists']} + for checklist_id in card['idChecklists']: + for item in checklists_by_id.get(checklist_id, {}).get('checkItems', []): + Task.objects.create( + subject=item['name'], + status=us.project.task_statuses.get(slug=item['state']), + project=us.project, + user_story=us + ) + + def _import_attachments(self, us, card, options): + users_bindings = options.get('users_bindings', {}) + for attachment in card['attachments']: + if attachment['bytes'] is None: + continue + data = requests.get(attachment['url']) + att = Attachment( + owner=users_bindings.get(attachment['idMember'], self._user), + project=us.project, + content_type=ContentType.objects.get_for_model(UserStory), + object_id=us.id, + name=attachment['name'], + size=attachment['bytes'], + created_date=attachment['date'], + is_deprecated=False, + ) + att.attached_file.save(attachment['name'], ContentFile(data.content), save=True) + + UserStory.objects.filter(id=us.id, created_date__gt=attachment['date']).update( + created_date=attachment['date'] + ) + + def _import_actions(self, us, card, statuses, options): + included_actions = [ + "addAttachmentToCard", "addMemberToCard", "commentCard", + "convertToCardFromCheckItem", "copyCommentCard", "createCard", + "deleteAttachmentFromCard", "deleteCard", "removeMemberFromCard", + "updateCard", + ] + + actions = self._client.get( + "/card/{}/actions".format(card['id']), + { + "filter": ",".join(included_actions), + "limit": "1000", + "memberCreator": "true", + "memberCreator_fields": "fullName", + } + ) + + while actions: + for action in actions: + self._import_action(us, action, statuses, options) + actions = self._client.get( + "/card/{}/actions".format(card['id']), + { + "filter": ",".join(included_actions), + "limit": "1000", + "since": "lastView", + "before": action['date'], + "memberCreator": "true", + "memberCreator_fields": "fullName", + } + ) + + def _import_action(self, us, action, statuses, options): + key = make_key_from_model_object(us) + typename = get_typename_for_model_class(UserStory) + action_data = self._transform_action_data(us, action, statuses, options) + if action_data is None: + return + + change_old = action_data['change_old'] + change_new = action_data['change_new'] + hist_type = action_data['hist_type'] + comment = action_data['comment'] + user = action_data['user'] + + diff = make_diff_from_dicts(change_old, change_new) + fdiff = FrozenDiff(key, diff, {}) + + entry = HistoryEntry.objects.create( + user=user, + project_id=us.project.id, + key=key, + type=hist_type, + snapshot=None, + diff=fdiff.diff, + values=make_diff_values(typename, fdiff), + comment=comment, + comment_html=mdrender(us.project, comment), + is_hidden=False, + is_snapshot=False, + ) + HistoryEntry.objects.filter(id=entry.id).update(created_at=action['date']) + return HistoryEntry.objects.get(id=entry.id) + + def _transform_action_data(self, us, action, statuses, options): + users_bindings = options.get('users_bindings', {}) + due_date_field = us.project.userstorycustomattributes.first() + + ignored_actions = ["addAttachmentToCard", "addMemberToCard", + "deleteAttachmentFromCard", "deleteCard", + "removeMemberFromCard"] + + if action['type'] in ignored_actions: + return None + + user = {"pk": None, "name": action.get('memberCreator', {}).get('fullName', None)} + taiga_user = users_bindings.get(action.get('memberCreator', {}).get('id', None), None) + if taiga_user: + user = {"pk": taiga_user.id, "name": taiga_user.get_full_name()} + + result = { + "change_old": {}, + "change_new": {}, + "hist_type": HistoryType.change, + "comment": "", + "user": user + } + + if action['type'] == "commentCard": + result['comment'] = str(action['data']['text']) + elif action['type'] == "convertToCardFromCheckItem": + UserStory.objects.filter(id=us.id, created_date__gt=action['date']).update( + created_date=action['date'], + owner=users_bindings.get(action["idMemberCreator"], self._user) + ) + result['hist_type'] = HistoryType.create + elif action['type'] == "copyCommentCard": + UserStory.objects.filter(id=us.id, created_date__gt=action['date']).update( + created_date=action['date'], + owner=users_bindings.get(action["idMemberCreator"], self._user) + ) + result['hist_type'] = HistoryType.create + elif action['type'] == "createCard": + UserStory.objects.filter(id=us.id, created_date__gt=action['date']).update( + created_date=action['date'], + owner=users_bindings.get(action["idMemberCreator"], self._user) + ) + result['hist_type'] = HistoryType.create + elif action['type'] == "updateCard": + if 'desc' in action['data']['old']: + result['change_old']["description"] = str(action['data']['old'].get('desc', '')) + result['change_new']["description"] = str(action['data']['card'].get('desc', '')) + result['change_old']["description_html"] = mdrender(us.project, str(action['data']['old'].get('desc', ''))) + result['change_new']["description_html"] = mdrender(us.project, str(action['data']['card'].get('desc', ''))) + if 'idList' in action['data']['old']: + old_status_name = statuses[action['data']['old']['idList']]['name'] + result['change_old']["status"] = us.project.us_statuses.get(name=old_status_name).id + new_status_name = statuses[action['data']['card']['idList']]['name'] + result['change_new']["status"] = us.project.us_statuses.get(name=new_status_name).id + if 'name' in action['data']['old']: + result['change_old']["subject"] = action['data']['old']['name'] + result['change_new']["subject"] = action['data']['card']['name'] + if 'due' in action['data']['old']: + result['change_old']["custom_attributes"] = [{ + "name": "Due", + "value": action['data']['old']['due'], + "id": due_date_field.id + }] + result['change_new']["custom_attributes"] = [{ + "name": "Due", + "value": action['data']['card']['due'], + "id": due_date_field.id + }] + + if result['change_old'] == {}: + return None + return result + + @classmethod + def get_auth_url(cls): + request_token_url = 'https://trello.com/1/OAuthGetRequestToken' + authorize_url = 'https://trello.com/1/OAuthAuthorizeToken' + return_url = resolve_front_url("new-project-import", "trello") + expiration = "1day" + scope = "read,write,account" + trello_key = settings.TRELLO_API_KEY + trello_secret = settings.TRELLO_SECRET_KEY + name = "Taiga" + + session = OAuth1Session(client_key=trello_key, client_secret=trello_secret) + response = session.fetch_request_token(request_token_url) + oauth_token, oauth_token_secret = response.get('oauth_token'), response.get('oauth_token_secret') + + return ( + oauth_token, + oauth_token_secret, + "{authorize_url}?oauth_token={oauth_token}&scope={scope}&expiration={expiration}&name={name}&return_url={return_url}".format( + authorize_url=authorize_url, + oauth_token=oauth_token, + expiration=expiration, + scope=scope, + name=name, + return_url=return_url, + ) + ) + + @classmethod + def get_access_token(cls, oauth_token, oauth_token_secret, oauth_verifier): + api_key = settings.TRELLO_API_KEY + api_secret = settings.TRELLO_SECRET_KEY + access_token_url = 'https://trello.com/1/OAuthGetAccessToken' + session = OAuth1Session(client_key=api_key, client_secret=api_secret, + resource_owner_key=oauth_token, resource_owner_secret=oauth_token_secret, + verifier=oauth_verifier) + access_token = session.fetch_access_token(access_token_url) + return access_token + + def _ensure_hex_color(self, color): + if color is None: + return None + try: + return webcolors.name_to_hex(color) + except ValueError: + return color + + def _cleanup(self, project, options): + if not options.get("import_closed_data", False): + project.us_statuses.filter(is_archived=True).delete() diff --git a/taiga/importers/trello/tasks.py b/taiga/importers/trello/tasks.py new file mode 100644 index 00000000..76f7f197 --- /dev/null +++ b/taiga/importers/trello/tasks.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import logging +import sys + +from django.utils.translation import ugettext as _ + +from taiga.base.mails import mail_builder +from taiga.users.models import User +from taiga.celery import app +from .importer import TrelloImporter + +logger = logging.getLogger('taiga.importers.trello') + + +@app.task(bind=True) +def import_project(self, user_id, token, project_id, options): + user = User.object.get(id=user_id) + importer = TrelloImporter(user, token) + try: + project = importer.import_project(project_id, options) + except Exception as e: + # Error + ctx = { + "user": user, + "error_subject": _("Error importing trello project"), + "error_message": _("Error importing trello project"), + "project": project_id, + "exception": e + } + email = mail_builder.trello_import_error(admin, ctx) + email.send() + logger.error('Error importing trello project %s (by %s)', project_id, user, exc_info=sys.exc_info()) + else: + ctx = { + "project": project, + "user": user, + } + email = mail_builder.trello_import_success(user, ctx) + email.send() diff --git a/taiga/projects/epics/migrations/0005_epic_external_reference.py b/taiga/projects/epics/migrations/0005_epic_external_reference.py new file mode 100644 index 00000000..a1d10880 --- /dev/null +++ b/taiga/projects/epics/migrations/0005_epic_external_reference.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-11-08 11:19 +from __future__ import unicode_literals + +import django.contrib.postgres.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('epics', '0004_auto_20160928_0540'), + ] + + operations = [ + migrations.AddField( + model_name='epic', + name='external_reference', + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), blank=True, default=None, null=True, size=None, verbose_name='external reference'), + ), + ] diff --git a/taiga/projects/epics/models.py b/taiga/projects/epics/models.py index da0e4a3e..906e5f8d 100644 --- a/taiga/projects/epics/models.py +++ b/taiga/projects/epics/models.py @@ -18,6 +18,7 @@ from django.db import models from django.contrib.contenttypes.fields import GenericRelation +from django.contrib.postgres.fields import ArrayField from django.conf import settings from django.utils.translation import ugettext_lazy as _ from django.utils import timezone @@ -67,6 +68,8 @@ class Epic(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, models.M user_stories = models.ManyToManyField("userstories.UserStory", related_name="epics", through='RelatedUserStory', verbose_name=_("user stories")) + external_reference = ArrayField(models.TextField(null=False, blank=False), + null=True, blank=True, default=None, verbose_name=_("external reference")) attachments = GenericRelation("attachments.Attachment") diff --git a/taiga/projects/references/models.py b/taiga/projects/references/models.py index 61097ecb..d6ad400b 100644 --- a/taiga/projects/references/models.py +++ b/taiga/projects/references/models.py @@ -68,6 +68,19 @@ def make_reference(instance, project, create=False): return refval, refinstance +def recalc_reference_counter(project): + seqname = make_sequence_name(project) + max_ref_us = project.user_stories.all().aggregate(max=models.Max('ref')) + max_ref_task = project.tasks.all().aggregate(max=models.Max('ref')) + max_ref_issue = project.issues.all().aggregate(max=models.Max('ref')) + max_references = list(filter(lambda x: x is not None, [max_ref_us['max'], max_ref_task['max'], max_ref_issue['max']])) + + max_value = 0 + if len(max_references) > 0: + max_value = max(max_references) + seq.set_max(seqname, max_value) + + def create_sequence(sender, instance, created, **kwargs): if not created: return diff --git a/taiga/projects/userstories/api.py b/taiga/projects/userstories/api.py index 3df5ddc9..c21ea7ae 100644 --- a/taiga/projects/userstories/api.py +++ b/taiga/projects/userstories/api.py @@ -106,6 +106,7 @@ class UserStoryViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixi include_attachments = "include_attachments" in self.request.QUERY_PARAMS include_tasks = "include_tasks" in self.request.QUERY_PARAMS + epic_id = self.request.QUERY_PARAMS.get("epic", None) # We can be filtering by more than one epic so epic_id can consist # of different ids separete by comma. In that situation we will use diff --git a/taiga/routers.py b/taiga/routers.py index f59bea7e..528f7696 100644 --- a/taiga/routers.py +++ b/taiga/routers.py @@ -283,6 +283,11 @@ from taiga.external_apps.api import Application, ApplicationToken router.register(r"applications", Application, base_name="applications") router.register(r"application-tokens", ApplicationToken, base_name="application-tokens") +# Third party importers +from taiga.importers.trello.api import TrelloImporterViewSet + +router.register(r"importers/trello", TrelloImporterViewSet, base_name="importers-trello") + # Stats # - see taiga.stats.routers and taiga.stats.apps diff --git a/tests/integration/test_importers_trello_api.py b/tests/integration/test_importers_trello_api.py new file mode 100644 index 00000000..c83f5c57 --- /dev/null +++ b/tests/integration/test_importers_trello_api.py @@ -0,0 +1,244 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import pytest +import json + +from unittest import mock + +from django.core.urlresolvers import reverse + +from .. import factories as f +from taiga.base.utils import json +from taiga.base import exceptions as exc + + +pytestmark = pytest.mark.django_db + + +def test_auth_url(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-trello-auth-url") + + with mock.patch('taiga.importers.trello.importer.OAuth1Session') as OAuth1SessionMock: + session = mock.Mock() + session.fetch_request_token.return_value = {"oauth_token": "token", "oauth_token_secret": "token"} + OAuth1SessionMock.return_value = session + + response = client.get(url, content_type="application/json") + + assert response.status_code == 200 + assert 'url' in response.data + assert response.data['url'] == "https://trello.com/1/OAuthAuthorizeToken?oauth_token=token&scope=read,write,account&expiration=1day&name=Taiga&return_url=http://localhost:9001/project/new/import/trello" + + +def test_authorize(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-trello-auth-url") + authorize_url = reverse("importers-trello-authorize") + + with mock.patch('taiga.importers.trello.importer.OAuth1Session') as OAuth1SessionMock: + session = mock.Mock() + session.fetch_request_token.return_value = {"oauth_token": "token", "oauth_token_secret": "token"} + session.fetch_access_token.return_value = {"oauth_token": "token", "oauth_token_secret": "token"} + OAuth1SessionMock.return_value = session + + client.get(url, content_type="application/json") + response = client.post(authorize_url, content_type="application/json", data=json.dumps({"oauth_verifier": "token"})) + + assert response.status_code == 200 + assert 'token' in response.data + assert response.data['token'] == "token" + +def test_authorize_without_token_and_secret(client): + user = f.UserFactory.create() + client.login(user) + + authorize_url = reverse("importers-trello-authorize") + + with mock.patch('taiga.importers.trello.importer.OAuth1Session') as OAuth1SessionMock: + session = mock.Mock() + session.fetch_access_token.return_value = {"oauth_token": "token", "oauth_token_secret": "token"} + OAuth1SessionMock.return_value = session + + response = client.post(authorize_url, content_type="application/json", data=json.dumps({"oauth_verifier": "token"})) + + assert response.status_code == 400 + assert 'token' not in response.data + + +def test_authorize_with_bad_verify(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-trello-auth-url") + authorize_url = reverse("importers-trello-authorize") + + with mock.patch('taiga.importers.trello.importer.OAuth1Session') as OAuth1SessionMock: + session = mock.Mock() + session.fetch_request_token.return_value = {"oauth_token": "token", "oauth_token_secret": "token"} + session.fetch_access_token.side_effect = Exception("Bad Token") + OAuth1SessionMock.return_value = session + + client.get(url, content_type="application/json") + response = client.post(authorize_url, content_type="application/json", data=json.dumps({"oauth_verifier": "token"})) + + assert response.status_code == 400 + assert 'token' not in response.data + + +def test_import_trello_list_users(client, settings): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-trello-list-users") + + with mock.patch('taiga.importers.trello.api.TrelloImporter') as TrelloImporterMock: + instance = mock.Mock() + instance.list_users.return_value = [ + {"id": 1, "fullName": "user1", "email": None}, + {"id": 2, "fullName": "user2", "email": None} + ] + TrelloImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 200 + assert response.data[0]["id"] == 1 + assert response.data[1]["id"] == 2 + + +def test_import_trello_list_users_without_project(client, settings): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-trello-list-users") + + with mock.patch('taiga.importers.trello.api.TrelloImporter') as TrelloImporterMock: + instance = mock.Mock() + instance.list_users.return_value = [ + {"id": 1, "fullName": "user1", "email": None}, + {"id": 2, "fullName": "user2", "email": None} + ] + TrelloImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 400 + + +def test_import_trello_list_users_with_problem_on_request(client, settings): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-trello-list-users") + + with mock.patch('taiga.importers.trello.importer.TrelloClient') as TrelloClientMock: + instance = mock.Mock() + instance.get.side_effect = exc.WrongArguments("Invalid Request") + TrelloClientMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 400 + + +def test_import_trello_list_projects(client, settings): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-trello-list-projects") + + with mock.patch('taiga.importers.trello.api.TrelloImporter') as TrelloImporterMock: + instance = mock.Mock() + instance.list_projects.return_value = ["project1", "project2"] + TrelloImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 200 + assert response.data[0] == "project1" + assert response.data[1] == "project2" + + +def test_import_trello_list_projects_with_problem_on_request(client, settings): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-trello-list-projects") + + with mock.patch('taiga.importers.trello.importer.TrelloClient') as TrelloClientMock: + instance = mock.Mock() + instance.get.side_effect = exc.WrongArguments("Invalid Request") + TrelloClientMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 400 + + +def test_import_trello_project_without_project_id(client, settings): + settings.CELERY_ENABLED = True + + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-trello-import-project") + + with mock.patch('taiga.importers.trello.tasks.TrelloImporter') as TrelloImporterMock: + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 400 + + +def test_import_trello_project_with_celery_enabled(client, settings): + settings.CELERY_ENABLED = True + + user = f.UserFactory.create() + project = f.ProjectFactory.create(slug="async-imported-project") + client.login(user) + + url = reverse("importers-trello-import-project") + + with mock.patch('taiga.importers.trello.tasks.TrelloImporter') as TrelloImporterMock: + instance = mock.Mock() + instance.import_project.return_value = project + TrelloImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 202 + assert "task_id" in response.data + + +def test_import_trello_project_with_celery_disabled(client, settings): + settings.CELERY_ENABLED = False + + user = f.UserFactory.create() + project = f.ProjectFactory.create(slug="imported-project") + client.login(user) + + url = reverse("importers-trello-import-project") + + with mock.patch('taiga.importers.trello.api.TrelloImporter') as TrelloImporterMock: + instance = mock.Mock() + instance.import_project.return_value = project + TrelloImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 200 + assert "slug" in response.data + assert response.data['slug'] == "imported-project" From 723034d37343df87f0b16861e43f8ba2834de2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 18 Jan 2017 09:39:10 +0100 Subject: [PATCH 103/144] Add jira importer --- settings/common.py | 4 + taiga/importers/jira/agile.py | 357 +++++++++ taiga/importers/jira/api.py | 229 ++++++ taiga/importers/jira/common.py | 748 ++++++++++++++++++ taiga/importers/jira/normal.py | 439 ++++++++++ taiga/importers/jira/tasks.py | 61 ++ .../management/commands/import_from_jira.py | 146 ++++ taiga/routers.py | 2 + tests/integration/test_importers_jira_api.py | 259 ++++++ 9 files changed, 2245 insertions(+) create mode 100644 taiga/importers/jira/agile.py create mode 100644 taiga/importers/jira/api.py create mode 100644 taiga/importers/jira/common.py create mode 100644 taiga/importers/jira/normal.py create mode 100644 taiga/importers/jira/tasks.py create mode 100644 taiga/importers/management/commands/import_from_jira.py create mode 100644 tests/integration/test_importers_jira_api.py diff --git a/settings/common.py b/settings/common.py index 2e0cd3ad..7a894969 100644 --- a/settings/common.py +++ b/settings/common.py @@ -565,6 +565,10 @@ from .sr import * TRELLO_API_KEY = "" TRELLO_SECRET_KEY = "" +JIRA_CONSUMER_KEY = "" +JIRA_CERT = "" +JIRA_PUB_CERT = "" + # NOTE: DON'T INSERT MORE SETTINGS AFTER THIS LINE TEST_RUNNER="django.test.runner.DiscoverRunner" diff --git a/taiga/importers/jira/agile.py b/taiga/importers/jira/agile.py new file mode 100644 index 00000000..0f4d70cf --- /dev/null +++ b/taiga/importers/jira/agile.py @@ -0,0 +1,357 @@ +import datetime + +from django.template.defaultfilters import slugify +from taiga.projects.references.models import recalc_reference_counter +from taiga.projects.models import Project, ProjectTemplate, Membership, Points +from taiga.projects.userstories.models import UserStory, RolePoints +from taiga.projects.tasks.models import Task +from taiga.projects.milestones.models import Milestone +from taiga.projects.epics.models import Epic, RelatedUserStory +from taiga.projects.history.services import take_snapshot +from taiga.timeline.rebuilder import rebuild_timeline +from taiga.timeline.models import Timeline +from .common import JiraImporterCommon + + +class JiraAgileImporter(JiraImporterCommon): + def list_projects(self): + return [{"id": board['id'], + "name": board['name'], + "description": "", + "is_private": True, + "importer_type": "agile"} for board in self._client.get_agile('/board')['values']] + + def list_issue_types(self, project_id): + board_project = self._client.get_agile("/board/{}/project".format(project_id))['values'][0] + statuses = self._client.get("/project/{}/statuses".format(board_project['id'])) + return statuses + + def import_project(self, project_id, options=None): + self.resolve_user_bindings(options) + project = self._import_project_data(project_id, options) + self._import_epics_data(project_id, project, options) + self._import_user_stories_data(project_id, project, options) + self._cleanup(project, options) + Timeline.objects.filter(project=project).delete() + rebuild_timeline(None, None, project.id) + recalc_reference_counter(project) + return project + + def _import_project_data(self, project_id, options): + project = self._client.get_agile("/board/{}".format(project_id)) + project_config = self._client.get_agile("/board/{}/configuration".format(project_id)) + if project['type'] == "scrum": + project_template = ProjectTemplate.objects.get(slug="scrum") + options['type'] = "scrum" + elif project['type'] == "kanban": + project_template = ProjectTemplate.objects.get(slug="kanban") + options['type'] = "kanban" + + project_template.is_epics_activated = True + project_template.epic_statuses = [] + project_template.us_statuses = [] + project_template.task_statuses = [] + project_template.issue_statuses = [] + + counter = 0 + for column in project_config['columnConfig']['columns']: + project_template.epic_statuses.append({ + "name": column['name'], + "slug": slugify(column['name']), + "is_closed": False, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": counter, + }) + project_template.us_statuses.append({ + "name": column['name'], + "slug": slugify(column['name']), + "is_closed": False, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": counter, + }) + project_template.task_statuses.append({ + "name": column['name'], + "slug": slugify(column['name']), + "is_closed": False, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": counter, + }) + project_template.issue_statuses.append({ + "name": column['name'], + "slug": slugify(column['name']), + "is_closed": False, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": counter, + }) + counter += 1 + + project_template.default_options["epic_status"] = project_template.epic_statuses[0]['name'] + project_template.default_options["us_status"] = project_template.us_statuses[0]['name'] + project_template.default_options["task_status"] = project_template.task_statuses[0]['name'] + project_template.default_options["issue_status"] = project_template.issue_statuses[0]['name'] + + project_template.points = [{ + "value": None, + "name": "?", + "order": 0, + }] + + main_permissions = project_template.roles[0]['permissions'] + project_template.roles = [{ + "name": "Main", + "slug": "main", + "computable": True, + "permissions": main_permissions, + "order": 70, + }] + + project = Project.objects.create( + name=options.get('name', None) or project['name'], + description=options.get('description', None) or project.get('description', ''), + owner=self._user, + creation_template=project_template, + is_private=options.get('is_private', False), + ) + + self._create_custom_fields(project) + + for user in options.get('users_bindings', {}).values(): + if user != self._user: + Membership.objects.get_or_create( + user=user, + project=project, + role=project.get_roles().get(slug="main"), + is_admin=False, + ) + + if project_template.slug == "scrum": + for sprint in self._client.get_agile("/board/{}/sprint".format(project_id))['values']: + start_datetime = sprint.get('startDate', None) + end_datetime = sprint.get('startDate', None) + start_date = datetime.date.today() + if start_datetime: + start_date = start_datetime[:10] + end_date = datetime.date.today() + if end_datetime: + end_date = end_datetime[:10] + + milestone = Milestone.objects.create( + name=sprint['name'], + slug=slugify(sprint['name']), + owner=self._user, + project=project, + estimated_start=start_date, + estimated_finish=end_date, + ) + Milestone.objects.filter(id=milestone.id).update( + created_date=start_datetime or datetime.datetime.now(), + modified_date=start_datetime or datetime.datetime.now(), + ) + return project + + def _import_user_stories_data(self, project_id, project, options): + users_bindings = options.get('users_bindings', {}) + project_conf = self._client.get_agile("/board/{}/configuration".format(project_id)) + if options['type'] == "scrum": + estimation_field = project_conf['estimation']['field']['fieldId'] + + counter = 0 + offset = 0 + while True: + issues = self._client.get_agile("/board/{}/issue".format(project_id), { + "startAt": offset, + "expand": "changelog", + }) + offset += issues['maxResults'] + + for issue in issues['issues']: + issue['fields']['issuelinks'] += self._client.get("/issue/{}/remotelink".format(issue['key'])) + assigned_to = users_bindings.get(issue['fields']['assignee']['key'] if issue['fields']['assignee'] else None, None) + owner = users_bindings.get(issue['fields']['creator']['key'] if issue['fields']['creator'] else None, self._user) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["jira", self._client.get_issue_url(issue['key'])] + + try: + milestone = project.milestones.get(name=issue['fields'].get('sprint', {}).get('name', '')) + except Milestone.DoesNotExist: + milestone = None + + us = UserStory.objects.create( + project=project, + owner=owner, + assigned_to=assigned_to, + status=project.us_statuses.get(name=issue['fields']['status']['name']), + kanban_order=counter, + sprint_order=counter, + backlog_order=counter, + subject=issue['fields']['summary'], + description=issue['fields']['description'] or '', + tags=issue['fields']['labels'], + external_reference=external_reference, + milestone=milestone, + ) + + try: + epic = project.epics.get(ref=int(issue['fields'].get("epic", {}).get("key", "FAKE-0").split("-")[1])) + RelatedUserStory.objects.create( + user_story=us, + epic=epic, + order=1 + ) + except Epic.DoesNotExist: + pass + + if options['type'] == "scrum": + estimation = None + if issue['fields'].get(estimation_field, None): + estimation = float(issue['fields'].get(estimation_field)) + + (points, _) = Points.objects.get_or_create( + project=project, + value=estimation, + defaults={ + "name": str(estimation), + "order": estimation, + } + ) + RolePoints.objects.filter(user_story=us, role__slug="main").update(points_id=points.id) + + self._import_to_custom_fields(us, issue, options) + + us.ref = issue['key'].split("-")[1] + UserStory.objects.filter(id=us.id).update( + ref=us.ref, + modified_date=issue['fields']['updated'], + created_date=issue['fields']['created'] + ) + take_snapshot(us, comment="", user=None, delete=False) + self._import_subtasks(project_id, project, us, issue, options) + self._import_comments(us, issue, options) + self._import_attachments(us, issue, options) + self._import_changelog(project, us, issue, options) + counter += 1 + + if len(issues['issues']) < issues['maxResults']: + break + + def _import_subtasks(self, project_id, project, us, issue, options): + users_bindings = options.get('users_bindings', {}) + + if len(issue['fields']['subtasks']) == 0: + return + + counter = 0 + offset = 0 + while True: + issues = self._client.get_agile("/board/{}/issue".format(project_id), { + "jql": "parent={}".format(issue['key']), + "startAt": offset, + "expand": "changelog", + }) + offset += issues['maxResults'] + + for issue in issues['issues']: + issue['fields']['issuelinks'] += self._client.get("/issue/{}/remotelink".format(issue['key'])) + assigned_to = users_bindings.get(issue['fields']['assignee']['key'] if issue['fields']['assignee'] else None, None) + owner = users_bindings.get(issue['fields']['creator']['key'] if issue['fields']['creator'] else None, self._user) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["jira", self._client.get_issue_url(issue['key'])] + + task = Task.objects.create( + user_story=us, + project=project, + owner=owner, + assigned_to=assigned_to, + status=project.task_statuses.get(name=issue['fields']['status']['name']), + subject=issue['fields']['summary'], + description=issue['fields']['description'] or '', + tags=issue['fields']['labels'], + external_reference=external_reference, + milestone=us.milestone, + ) + + self._import_to_custom_fields(task, issue, options) + + task.ref = issue['key'].split("-")[1] + Task.objects.filter(id=task.id).update( + ref=task.ref, + modified_date=issue['fields']['updated'], + created_date=issue['fields']['created'] + ) + take_snapshot(task, comment="", user=None, delete=False) + for subtask in issue['fields']['subtasks']: + print("WARNING: Ignoring subtask {} because parent isn't a User Story".format(subtask['key'])) + self._import_comments(task, issue, options) + self._import_attachments(task, issue, options) + self._import_changelog(project, task, issue, options) + counter += 1 + if len(issues['issues']) < issues['maxResults']: + break + + def _import_epics_data(self, project_id, project, options): + users_bindings = options.get('users_bindings', {}) + + counter = 0 + offset = 0 + while True: + issues = self._client.get_agile("/board/{}/epic".format(project_id), { + "startAt": offset, + }) + offset += issues['maxResults'] + + for epic in issues['values']: + issue = self._client.get_agile("/issue/{}".format(epic['key'])) + issue['fields']['issuelinks'] += self._client.get("/issue/{}/remotelink".format(issue['key'])) + assigned_to = users_bindings.get(issue['fields']['assignee']['key'] if issue['fields']['assignee'] else None, None) + owner = users_bindings.get(issue['fields']['creator']['key'] if issue['fields']['creator'] else None, self._user) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["jira", self._client.get_issue_url(issue['key'])] + + epic = Epic.objects.create( + project=project, + owner=owner, + assigned_to=assigned_to, + status=project.epic_statuses.get(name=issue['fields']['status']['name']), + subject=issue['fields']['summary'], + description=issue['fields']['description'] or '', + epics_order=counter, + tags=issue['fields']['labels'], + external_reference=external_reference, + ) + + self._import_to_custom_fields(epic, issue, options) + + epic.ref = issue['key'].split("-")[1] + Epic.objects.filter(id=epic.id).update( + ref=epic.ref, + modified_date=issue['fields']['updated'], + created_date=issue['fields']['created'] + ) + + take_snapshot(epic, comment="", user=None, delete=False) + for subtask in issue['fields']['subtasks']: + print("WARNING: Ignoring subtask {} because parent isn't a User Story".format(subtask['key'])) + self._import_comments(epic, issue, options) + self._import_attachments(epic, issue, options) + issue_with_changelog = self._client.get("/issue/{}".format(issue['key']), { + "expand": "changelog" + }) + self._import_changelog(project, epic, issue_with_changelog, options) + counter += 1 + + if len(issues['values']) < issues['maxResults']: + break diff --git a/taiga/importers/jira/api.py b/taiga/importers/jira/api.py new file mode 100644 index 00000000..47bb6cda --- /dev/null +++ b/taiga/importers/jira/api.py @@ -0,0 +1,229 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Taiga Agile LLC +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.utils.translation import ugettext as _ +from django.conf import settings + +from taiga.base.api import viewsets +from taiga.base import response +from taiga.base import exceptions as exc +from taiga.base.decorators import list_route +from taiga.users.models import AuthData, User +from taiga.users.services import get_user_photo_url +from taiga.users.gravatar import get_user_gravatar_id + +from taiga.importers import permissions +from .normal import JiraNormalImporter +from .agile import JiraAgileImporter +from . import tasks + + +class JiraImporterViewSet(viewsets.ViewSet): + permission_classes = (permissions.ImporterPermission,) + + def _get_token(self, request): + token_data = request.DATA.get('token', "").split(".") + + token = { + "access_token": token_data[0], + "access_token_secret": token_data[1], + "key_cert": settings.JIRA_CERT, + "consumer_key": settings.JIRA_CONSUMER_KEY + } + return token + + @list_route(methods=["POST"]) + def list_users(self, request, *args, **kwargs): + self.check_permissions(request, "list_users", None) + + url = request.DATA.get('url', None) + token = self._get_token(request) + project_id = request.DATA.get('project', None) + + if not project_id: + raise exc.WrongArguments(_("The project param is needed")) + if not url: + raise exc.WrongArguments(_("The url param is needed")) + + importer = JiraNormalImporter(request.user, url, token) + users = importer.list_users() + for user in users: + user['user'] = None + if not user['email']: + continue + + try: + taiga_user = User.objects.get(email=user['email']) + except User.DoesNotExist: + continue + + user['user'] = { + 'id': taiga_user.id, + 'full_name': taiga_user.get_full_name(), + 'gravatar_id': get_user_gravatar_id(taiga_user), + 'photo': get_user_photo_url(taiga_user), + } + return response.Ok(users) + + @list_route(methods=["POST"]) + def list_projects(self, request, *args, **kwargs): + self.check_permissions(request, "list_projects", None) + url = request.DATA.get('url', None) + if not url: + raise exc.WrongArguments(_("The url param is needed")) + + token = self._get_token(request) + importer = JiraNormalImporter(request.user, url, token) + agile_importer = JiraAgileImporter(request.user, url, token) + projects = importer.list_projects() + boards = agile_importer.list_projects() + return response.Ok(sorted(projects + boards, key=lambda x: x['name'])) + + @list_route(methods=["POST"]) + def import_project(self, request, *args, **kwargs): + self.check_permissions(request, "import_project", None) + + url = request.DATA.get('url', None) + token = self._get_token(request) + project_id = request.DATA.get('project', None) + if not project_id: + raise exc.WrongArguments(_("The project param is needed")) + + if not url: + raise exc.WrongArguments(_("The url param is needed")) + + options = { + "name": request.DATA.get('name', None), + "description": request.DATA.get('description', None), + "users_bindings": request.DATA.get("user_bindings", {}), + "keep_external_reference": request.DATA.get("keep_external_reference", False), + "is_private": request.DATA.get("is_private", False), + } + + importer_type = request.DATA.get('importer_type', "normal") + if importer_type == "agile": + importer = JiraAgileImporter(request.user, url, token) + else: + project_type = request.DATA.get("project_type", "scrum") + if project_type == "kanban": + options['template'] = "kanban" + else: + options['template'] = "scrum" + + importer = JiraNormalImporter(request.user, url, token) + + types_bindings = { + "epic": [], + "us": [], + "task": [], + "issue": [], + } + for issue_type in importer.list_issue_types(project_id): + if project_type in ['scrum', 'kanban']: + # Set the type bindings + if issue_type['subtask']: + types_bindings['task'].append(issue_type) + elif issue_type['name'].upper() == "EPIC": + types_bindings["epic"].append(issue_type) + elif issue_type['name'].upper() in ["US", "USERSTORY", "USER STORY"]: + types_bindings["us"].append(issue_type) + elif issue_type['name'].upper() in ["ISSUE", "BUG", "ENHANCEMENT"]: + types_bindings["issue"].append(issue_type) + else: + types_bindings["us"].append(issue_type) + elif project_type == "issues": + # Set the type bindings + if issue_type['subtask']: + continue + types_bindings["issue"].append(issue_type) + elif project_type == "issues-with-subissues": + types_bindings["issue"].append(issue_type) + else: + raise exc.WrongArguments(_("Invalid project_type {}").format(project_type)) + + options["types_bindings"] = types_bindings + + if settings.CELERY_ENABLED: + task = tasks.import_project.delay(request.user.id, url, token, project_id, options, importer_type) + return response.Accepted({"task_id": task.id}) + + project = importer.import_project(project_id, options) + project_data = { + "slug": project.slug, + "my_permissions": ["view_us"], + "is_backlog_activated": project.is_backlog_activated, + "is_kanban_activated": project.is_kanban_activated, + } + + return response.Ok(project_data) + + @list_route(methods=["GET"]) + def auth_url(self, request, *args, **kwargs): + self.check_permissions(request, "auth_url", None) + jira_url = request.QUERY_PARAMS.get('url', None) + + if not jira_url: + raise exc.WrongArguments(_("The url param is needed")) + + (oauth_token, oauth_secret, url) = JiraNormalImporter.get_auth_url( + jira_url, + settings.JIRA_CONSUMER_KEY, + settings.JIRA_CERT, + True + ) + + (auth_data, created) = AuthData.objects.get_or_create( + user=request.user, + key="jira-oauth", + defaults={ + "value": "", + "extra": {}, + } + ) + auth_data.extra = { + "oauth_token": oauth_token, + "oauth_secret": oauth_secret, + "url": jira_url, + } + auth_data.save() + + return response.Ok({"url": url}) + + @list_route(methods=["POST"]) + def authorize(self, request, *args, **kwargs): + self.check_permissions(request, "authorize", None) + + try: + oauth_data = request.user.auth_data.get(key="jira-oauth") + oauth_token = oauth_data.extra['oauth_token'] + oauth_secret = oauth_data.extra['oauth_secret'] + server_url = oauth_data.extra['url'] + oauth_data.delete() + + jira_token = JiraNormalImporter.get_access_token( + server_url, + settings.JIRA_CONSUMER_KEY, + settings.JIRA_CERT, + oauth_token, + oauth_secret, + True + ) + except Exception as e: + raise exc.WrongArguments(_("Invalid or expired auth token")) + + return response.Ok({ + "token": jira_token['access_token'] + "." + jira_token['access_token_secret'], + "url": server_url + }) diff --git a/taiga/importers/jira/common.py b/taiga/importers/jira/common.py new file mode 100644 index 00000000..c38d1993 --- /dev/null +++ b/taiga/importers/jira/common.py @@ -0,0 +1,748 @@ +import requests +from urllib.parse import parse_qsl +from oauthlib.oauth1 import SIGNATURE_RSA + +from requests_oauthlib import OAuth1 +from django.core.files.base import ContentFile +from django.contrib.contenttypes.models import ContentType + +from taiga.users.models import User +from taiga.projects.models import Project, ProjectTemplate, Membership, Points +from taiga.projects.userstories.models import UserStory +from taiga.projects.tasks.models import Task +from taiga.projects.issues.models import Issue +from taiga.projects.milestones.models import Milestone +from taiga.projects.epics.models import Epic +from taiga.projects.attachments.models import Attachment +from taiga.projects.history.services import take_snapshot +from taiga.projects.history.services import (make_diff_from_dicts, + make_diff_values, + make_key_from_model_object, + get_typename_for_model_class, + FrozenDiff) +from taiga.projects.custom_attributes.models import (UserStoryCustomAttribute, + TaskCustomAttribute, + IssueCustomAttribute, + EpicCustomAttribute) +from taiga.projects.history.models import HistoryEntry +from taiga.projects.history.choices import HistoryType +from taiga.mdrender.service import render as mdrender + +EPIC_COLORS = { + "ghx-label-0": "#ffffff", + "ghx-label-1": "#815b3a", + "ghx-label-2": "#f79232", + "ghx-label-3": "#d39c3f", + "ghx-label-4": "#3b7fc4", + "ghx-label-5": "#4a6785", + "ghx-label-6": "#8eb021", + "ghx-label-7": "#ac707a", + "ghx-label-8": "#654982", + "ghx-label-9": "#f15c75", +} + + +def links_to_richtext(importer, issue, links): + richtext = "" + importing_project_key = issue['key'].split("-")[0] + for link in links: + if "inwardIssue" in link: + (project_key, issue_key) = link['inwardIssue']['key'].split("-") + action = link['type']['inward'] + elif "outwardIssue" in link: + (project_key, issue_key) = link['outwardIssue']['key'].split("-") + action = link['type']['outward'] + else: + continue + + if importing_project_key == project_key: + richtext += " * This item {} #{}\n".format(action, issue_key) + else: + url = importer._client.server + "/projects/{}/issues/{}-{}".format( + project_key, + project_key, + issue_key + ) + richtext += " * This item {} [{}-{}]({})\n".format(action, project_key, issue_key, url) + + for link in links: + if "object" in link: + richtext += " * [{}]({})\n".format( + link['object']['title'] or link['object']['url'], + link['object']['url'], + ) + + return richtext + + +class JiraClient: + def __init__(self, server, oauth): + self.server = server + self.api_url = server + "/rest/agile/1.0/{}" + self.main_api_url = server + "/rest/api/2/{}" + if oauth: + self.oauth = OAuth1( + oauth['consumer_key'], + signature_method=SIGNATURE_RSA, + rsa_key=oauth['key_cert'], + resource_owner_key=oauth['access_token'], + resource_owner_secret=oauth['access_token_secret'] + ) + else: + self.oauth = None + + def get(self, uri_path, query_params=None): + headers = { + 'Content-Type': "application/json" + } + if query_params is None: + query_params = {} + + if uri_path[0] == '/': + uri_path = uri_path[1:] + url = self.main_api_url.format(uri_path) + + response = requests.get(url, params=query_params, headers=headers, auth=self.oauth) + + if response.status_code == 401: + raise Exception("Unauthorized: %s at %s" % (response.text, url), response) + if response.status_code != 200: + raise Exception("Resource Unavailable: %s at %s" % (response.text, url), response) + + return response.json() + + def get_agile(self, uri_path, query_params=None): + headers = { + 'Content-Type': "application/json" + } + if query_params is None: + query_params = {} + + if uri_path[0] == '/': + uri_path = uri_path[1:] + url = self.api_url.format(uri_path) + + response = requests.get(url, params=query_params, headers=headers, auth=self.oauth) + + if response.status_code == 401: + raise Exception("Unauthorized: %s at %s" % (response.text, url), response) + if response.status_code != 200: + raise Exception("Resource Unavailable: %s at %s" % (response.text, url), response) + + return response.json() + + def raw_get(self, absolute_uri, query_params=None): + if query_params is None: + query_params = {} + + response = requests.get(absolute_uri, params=query_params, auth=self.oauth) + + if response.status_code == 401: + raise Exception("Unauthorized: %s at %s" % (response.text, absolute_uri), response) + if response.status_code != 200: + raise Exception("Resource Unavailable: %s at %s" % (response.text, absolute_uri), response) + + return response.content + + def get_issue_url(self, key): + (project_key, issue_key) = key.split("-") + return self.server + "/projects/{}/issues/{}".format(project_key, key) + + +class JiraImporterCommon: + def __init__(self, user, server, oauth): + self._user = user + self._client = JiraClient(server=server, oauth=oauth) + + def resolve_user_bindings(self, options): + for option in list(options['users_bindings'].keys()): + try: + user = User.objects.get(id=options['users_bindings'][option]) + options['users_bindings'][option] = user + except User.DoesNotExist: + del(options['users_bindings'][option]) + + def list_users(self): + result = [] + users = self._client.get("/user/picker", { + "query": "@", + "maxResults": 1000, + }) + for user in users['users']: + user_data = self._client.get("/user", { + "key": user['key'] + }) + result.append({ + "id": user_data['key'], + "full_name": user_data['displayName'], + "email": user_data['emailAddress'], + }) + return result + + def _import_comments(self, obj, issue, options): + users_bindings = options.get('users_bindings', {}) + offset = 0 + while True: + comments = self._client.get("/issue/{}/comment".format(issue['key']), {"startAt": offset}) + for comment in comments['comments']: + snapshot = take_snapshot( + obj, + comment=comment['body'], + user=users_bindings.get( + comment['author']['name'], + User(full_name=comment['author']['displayName']) + ), + delete=False + ) + HistoryEntry.objects.filter(id=snapshot.id).update(created_at=comment['created']) + + offset += len(comments['comments']) + if len(comments['comments']) <= comments['maxResults']: + break + + def _create_custom_fields(self, project): + custom_fields = [] + for model in [UserStoryCustomAttribute, TaskCustomAttribute, IssueCustomAttribute, EpicCustomAttribute]: + model.objects.create( + name="Due date", + description="Due date", + type="date", + order=1, + project=project + ) + model.objects.create( + name="Priority", + description="Priority", + type="text", + order=1, + project=project + ) + model.objects.create( + name="Resolution", + description="Resolution", + type="text", + order=1, + project=project + ) + model.objects.create( + name="Resolution date", + description="Resolution date", + type="date", + order=1, + project=project + ) + model.objects.create( + name="Environment", + description="Environment", + type="text", + order=1, + project=project + ) + model.objects.create( + name="Components", + description="Components", + type="text", + order=1, + project=project + ) + model.objects.create( + name="Affects Version/s", + description="Affects Version/s", + type="text", + order=1, + project=project + ) + model.objects.create( + name="Fix Version/s", + description="Fix Version/s", + type="text", + order=1, + project=project + ) + model.objects.create( + name="Links", + description="Links", + type="richtext", + order=1, + project=project + ) + custom_fields.append({ + "history_name": "duedate", + "jira_field_name": "duedate", + "taiga_field_name": "Due date", + }) + custom_fields.append({ + "history_name": "priority", + "jira_field_name": "priority", + "taiga_field_name": "Priority", + "transform": lambda issue, obj: obj.get('name', None) + }) + custom_fields.append({ + "history_name": "resolution", + "jira_field_name": "resolution", + "taiga_field_name": "Resolution", + "transform": lambda issue, obj: obj.get('name', None) + }) + custom_fields.append({ + "history_name": "Resolution date", + "jira_field_name": "resolutiondate", + "taiga_field_name": "Resolution date", + }) + custom_fields.append({ + "history_name": "environment", + "jira_field_name": "environment", + "taiga_field_name": "Environment", + }) + custom_fields.append({ + "history_name": "Component", + "jira_field_name": "components", + "taiga_field_name": "Components", + "transform": lambda issue, obj: ", ".join([c.get('name', None) for c in obj]) + }) + custom_fields.append({ + "history_name": "Version", + "jira_field_name": "versions", + "taiga_field_name": "Affects Version/s", + "transform": lambda issue, obj: ", ".join([c.get('name', None) for c in obj]) + }) + custom_fields.append({ + "history_name": "Fix Version", + "jira_field_name": "fixVersions", + "taiga_field_name": "Fix Version/s", + "transform": lambda issue, obj: ", ".join([c.get('name', None) for c in obj]) + }) + custom_fields.append({ + "history_name": "Link", + "jira_field_name": "issuelinks", + "taiga_field_name": "Links", + "transform": lambda issue, obj: links_to_richtext(self, issue, obj) + }) + + greenhopper_fields = {} + for custom_field in self._client.get("/field"): + if custom_field['custom']: + if custom_field['schema']['custom'] == "com.pyxis.greenhopper.jira:gh-sprint": + greenhopper_fields["sprint"] = custom_field['id'] + elif custom_field['schema']['custom'] == "com.pyxis.greenhopper.jira:gh-epic-link": + greenhopper_fields["link"] = custom_field['id'] + elif custom_field['schema']['custom'] == "com.pyxis.greenhopper.jira:gh-epic-status": + greenhopper_fields["status"] = custom_field['id'] + elif custom_field['schema']['custom'] == "com.pyxis.greenhopper.jira:gh-epic-label": + greenhopper_fields["label"] = custom_field['id'] + elif custom_field['schema']['custom'] == "com.pyxis.greenhopper.jira:gh-epic-color": + greenhopper_fields["color"] = custom_field['id'] + elif custom_field['schema']['custom'] == "com.pyxis.greenhopper.jira:gh-lexo-rank": + greenhopper_fields["rank"] = custom_field['id'] + elif ( + custom_field['name'] == "Story Points" and + custom_field['schema']['custom'] == 'com.atlassian.jira.plugin.system.customfieldtypes:float' + ): + greenhopper_fields["points"] = custom_field['id'] + else: + multiline_types = [ + "com.atlassian.jira.plugin.system.customfieldtypes:textarea" + ] + date_types = [ + "com.atlassian.jira.plugin.system.customfieldtypes:datepicker" + "com.atlassian.jira.plugin.system.customfieldtypes:datetime" + ] + if custom_field['schema']['custom'] in multiline_types: + field_type = "multiline" + elif custom_field['schema']['custom'] in date_types: + field_type = "date" + else: + field_type = "text" + + custom_field_data = { + "name": custom_field['name'][:64], + "description": custom_field['name'], + "type": field_type, + "order": 1, + "project": project + } + + UserStoryCustomAttribute.objects.get_or_create(**custom_field_data) + TaskCustomAttribute.objects.get_or_create(**custom_field_data) + IssueCustomAttribute.objects.get_or_create(**custom_field_data) + EpicCustomAttribute.objects.get_or_create(**custom_field_data) + + custom_fields.append({ + "history_name": custom_field['name'], + "jira_field_name": custom_field['id'], + "taiga_field_name": custom_field['name'][:64], + }) + + self.greenhopper_fields = greenhopper_fields + self.custom_fields = custom_fields + + def _import_to_custom_fields(self, obj, issue, options): + if isinstance(obj, Epic): + custom_att_manager = obj.project.epiccustomattributes + elif isinstance(obj, UserStory): + custom_att_manager = obj.project.userstorycustomattributes + elif isinstance(obj, Task): + custom_att_manager = obj.project.taskcustomattributes + elif isinstance(obj, Issue): + custom_att_manager = obj.project.issuecustomattributes + else: + raise NotImplementedError("Not implemented custom attributes for this object ({})".format(obj)) + + custom_attributes_values = {} + for custom_field in self.custom_fields: + if issue['key'] == "PS-10": + import pprint; pprint.pprint(issue['fields']) + data = issue['fields'].get(custom_field['jira_field_name'], None) + if data and "transform" in custom_field: + data = custom_field['transform'](issue, data) + + if data: + taiga_field = custom_att_manager.get(name=custom_field['taiga_field_name']) + custom_attributes_values[taiga_field.id] = data + + if custom_attributes_values != {}: + obj.custom_attributes_values.attributes_values = custom_attributes_values + obj.custom_attributes_values.save() + + def _import_attachments(self, obj, issue, options): + users_bindings = options.get('users_bindings', {}) + + for attachment in issue['fields']['attachment']: + try: + data = self._client.raw_get(attachment['content']) + att = Attachment( + owner=users_bindings.get(attachment['author']['name'], self._user), + project=obj.project, + content_type=ContentType.objects.get_for_model(obj), + object_id=obj.id, + name=attachment['filename'], + size=attachment['size'], + created_date=attachment['created'], + is_deprecated=False, + ) + att.attached_file.save(attachment['filename'], ContentFile(data), save=True) + except Exception: + print("ERROR getting attachment url {}".format(attachment['content'])) + + + def _import_changelog(self, project, obj, issue, options): + obj.cummulative_attachments = [] + for history in sorted(issue['changelog']['histories'], key=lambda h: h['created']): + self._import_history(project, obj, history, options) + + def _import_history(self, project, obj, history, options): + key = make_key_from_model_object(obj) + typename = get_typename_for_model_class(obj.__class__) + history_data = self._transform_history_data(project, obj, history, options) + if history_data is None: + return + + change_old = history_data['change_old'] + change_new = history_data['change_new'] + hist_type = history_data['hist_type'] + comment = history_data['comment'] + user = history_data['user'] + + diff = make_diff_from_dicts(change_old, change_new) + fdiff = FrozenDiff(key, diff, {}) + + values = make_diff_values(typename, fdiff) + values.update(history_data['update_values']) + + entry = HistoryEntry.objects.create( + user=user, + project_id=obj.project.id, + key=key, + type=hist_type, + snapshot=None, + diff=fdiff.diff, + values=values, + comment=comment, + comment_html=mdrender(obj.project, comment), + is_hidden=False, + is_snapshot=False, + ) + HistoryEntry.objects.filter(id=entry.id).update(created_at=history['created']) + return HistoryEntry.objects.get(id=entry.id) + + def _transform_history_data(self, project, obj, history, options): + users_bindings = options.get('users_bindings', {}) + + user = {"pk": None, "name": history.get('author', {}).get('displayName', None)} + taiga_user = users_bindings.get(history.get('author', {}).get('key', None), None) + if taiga_user: + user = {"pk": taiga_user.id, "name": taiga_user.get_full_name()} + + result = { + "change_old": {}, + "change_new": {}, + "update_values": {}, + "hist_type": HistoryType.change, + "comment": "", + "user": user + } + custom_fields_by_names = {f["history_name"]: f for f in self.custom_fields} + has_data = False + for history_item in history['items']: + if history_item['field'] == "Attachment": + result['change_old']["attachments"] = [] + for att in obj.cummulative_attachments: + result['change_old']["attachments"].append({ + "id": 0, + "filename": att + }) + + if history_item['from'] is not None: + try: + idx = obj.cummulative_attachments.index(history_item['fromString']) + obj.cummulative_attachments.pop(idx) + except ValueError: + print("ERROR: Removing attachment that doesn't exist in the history ({})".format(history_item['fromString'])) + if history_item['to'] is not None: + obj.cummulative_attachments.append(history_item['toString']) + + result['change_new']["attachments"] = [] + for att in obj.cummulative_attachments: + result['change_new']["attachments"].append({ + "id": 0, + "filename": att + }) + has_data = True + elif history_item['field'] == "description": + result['change_old']["description"] = history_item['fromString'] + result['change_new']["description"] = history_item['toString'] + result['change_old']["description_html"] = mdrender(obj.project, history_item['fromString'] or "") + result['change_new']["description_html"] = mdrender(obj.project, history_item['toString'] or "") + has_data = True + elif history_item['field'] == "Epic Link": + pass + elif history_item['field'] == "Workflow": + pass + elif history_item['field'] == "Link": + pass + elif history_item['field'] == "labels": + result['change_old']["tags"] = history_item['fromString'].split() + result['change_new']["tags"] = history_item['toString'].split() + has_data = True + elif history_item['field'] == "Rank": + pass + elif history_item['field'] == "RemoteIssueLink": + pass + elif history_item['field'] == "Sprint": + old_milestone = None + if history_item['fromString']: + try: + old_milestone = obj.project.milestones.get(name=history_item['fromString']).id + except Milestone.DoesNotExist: + old_milestone = -1 + + new_milestone = None + if history_item['toString']: + try: + new_milestone = obj.project.milestones.get(name=history_item['toString']).id + except Milestone.DoesNotExist: + new_milestone = -2 + + result['change_old']["milestone"] = old_milestone + result['change_new']["milestone"] = new_milestone + + if old_milestone == -1 or new_milestone == -2: + result['update_values']["milestone"] = {} + + if old_milestone == -1: + result['update_values']["milestone"]["-1"] = history_item['fromString'] + if new_milestone == -2: + result['update_values']["milestone"]["-2"] = history_item['toString'] + has_data = True + elif history_item['field'] == "status": + if isinstance(obj, Task): + try: + old_status = obj.project.task_statuses.get(name=history_item['fromString']).id + except Exception: + old_status = -1 + try: + new_status = obj.project.task_statuses.get(name=history_item['toString']).id + except Exception: + new_status = -2 + elif isinstance(obj, UserStory): + try: + old_status = obj.project.us_statuses.get(name=history_item['fromString']).id + except Exception: + old_status = -1 + try: + new_status = obj.project.us_statuses.get(name=history_item['toString']).id + except Exception: + new_status = -2 + elif isinstance(obj, Issue): + try: + old_status = obj.project.issue_statuses.get(name=history_item['fromString']).id + except Exception: + old_status = -1 + try: + new_status = obj.project.us_statuses.get(name=history_item['toString']).id + except Exception: + new_status = -2 + elif isinstance(obj, Epic): + try: + old_status = obj.project.epic_statuses.get(name=history_item['fromString']).id + except Exception: + old_status = -1 + try: + new_status = obj.project.epic_statuses.get(name=history_item['toString']).id + except Exception: + new_status = -2 + + if old_status == -1 or new_status == -2: + result['update_values']["status"] = {} + + if old_status == -1: + result['update_values']["status"]["-1"] = history_item['fromString'] + if new_status == -2: + result['update_values']["status"]["-2"] = history_item['toString'] + + result['change_old']["status"] = old_status + result['change_new']["status"] = new_status + has_data = True + elif history_item['field'] == "Story Points": + old_points = None + if history_item['fromString']: + estimation = float(history_item['fromString']) + (old_points, _) = Points.objects.get_or_create( + project=project, + value=estimation, + defaults={ + "name": str(estimation), + "order": estimation, + } + ) + old_points = old_points.id + new_points = None + if history_item['toString']: + estimation = float(history_item['toString']) + (new_points, _) = Points.objects.get_or_create( + project=project, + value=estimation, + defaults={ + "name": str(estimation), + "order": estimation, + } + ) + new_points = new_points.id + result['change_old']["points"] = {project.roles.get(slug="main").id: old_points} + result['change_new']["points"] = {project.roles.get(slug="main").id: new_points} + has_data = True + elif history_item['field'] == "summary": + result['change_old']["subject"] = history_item['fromString'] + result['change_new']["subject"] = history_item['toString'] + has_data = True + elif history_item['field'] == "Epic Color": + if isinstance(obj, Epic): + result['change_old']["color"] = EPIC_COLORS.get(history_item['fromString'], None) + result['change_new']["color"] = EPIC_COLORS.get(history_item['toString'], None) + Epic.objects.filter(id=obj.id).update( + color=EPIC_COLORS.get(history_item['toString'], "#999999") + ) + has_data = True + elif history_item['field'] == "assignee": + old_assigned_to = None + if history_item['from'] is not None: + old_assigned_to = users_bindings.get(history_item['from'], -1) + if old_assigned_to != -1: + old_assigned_to = old_assigned_to.id + + new_assigned_to = None + if history_item['to'] is not None: + new_assigned_to = users_bindings.get(history_item['to'], -2) + if new_assigned_to != -2: + new_assigned_to = new_assigned_to.id + + result['change_old']["assigned_to"] = old_assigned_to + result['change_new']["assigned_to"] = new_assigned_to + + if old_assigned_to == -1 or new_assigned_to == -2: + result['update_values']["users"] = {} + + if old_assigned_to == -1: + result['update_values']["users"]["-1"] = history_item['fromString'] + if new_assigned_to == -2: + result['update_values']["users"]["-2"] = history_item['toString'] + has_data = True + elif history_item['field'] in custom_fields_by_names: + custom_field = custom_fields_by_names[history_item['field']] + if isinstance(obj, Task): + field_obj = obj.project.taskcustomattributes.get(name=custom_field['taiga_field_name']) + elif isinstance(obj, UserStory): + field_obj = obj.project.userstorycustomattributes.get(name=custom_field['taiga_field_name']) + elif isinstance(obj, Issue): + field_obj = obj.project.issuecustomattributes.get(name=custom_field['taiga_field_name']) + elif isinstance(obj, Epic): + field_obj = obj.project.epiccustomattributes.get(name=custom_field['taiga_field_name']) + + result['change_old']["custom_attributes"] = [{ + "name": custom_field['taiga_field_name'], + "value": history_item['fromString'], + "id": field_obj.id + }] + result['change_new']["custom_attributes"] = [{ + "name": custom_field['taiga_field_name'], + "value": history_item['toString'], + "id": field_obj.id + }] + has_data = True + else: + import pprint; pprint.pprint(history_item) + + if not has_data: + return None + + return result + + def _cleanup(self, project, options): + for epic_custom_field in project.epiccustomattributes.all(): + if project.epics.filter(custom_attributes_values__attributes_values__has_key=str(epic_custom_field.id)).count() == 0: + epic_custom_field.delete() + for us_custom_field in project.userstorycustomattributes.all(): + if project.user_stories.filter(custom_attributes_values__attributes_values__has_key=str(us_custom_field.id)).count() == 0: + us_custom_field.delete() + for task_custom_field in project.taskcustomattributes.all(): + if project.tasks.filter(custom_attributes_values__attributes_values__has_key=str(task_custom_field.id)).count() == 0: + task_custom_field.delete() + for issue_custom_field in project.issuecustomattributes.all(): + if project.issues.filter(custom_attributes_values__attributes_values__has_key=str(issue_custom_field.id)).count() == 0: + issue_custom_field.delete() + + @classmethod + def get_auth_url(cls, server, consumer_key, key_cert_data, verify=None): + if verify is None: + verify = server.startswith('https') + + oauth = OAuth1(consumer_key, signature_method=SIGNATURE_RSA, rsa_key=key_cert_data) + r = requests.post( + server + '/plugins/servlet/oauth/request-token', verify=verify, auth=oauth) + request = dict(parse_qsl(r.text)) + request_token = request['oauth_token'] + request_token_secret = request['oauth_token_secret'] + + return ( + request_token, + request_token_secret, + '{}/plugins/servlet/oauth/authorize?oauth_token={}'.format(server, request_token) + ) + + @classmethod + def get_access_token(cls, server, consumer_key, key_cert_data, request_token, request_token_secret, verify=False): + oauth = OAuth1( + consumer_key, + signature_method=SIGNATURE_RSA, + rsa_key=key_cert_data, + resource_owner_key=request_token, + resource_owner_secret=request_token_secret + ) + r = requests.post(server + '/plugins/servlet/oauth/access-token', verify=verify, auth=oauth) + access = dict(parse_qsl(r.text)) + + return { + 'access_token': access['oauth_token'], + 'access_token_secret': access['oauth_token_secret'], + 'consumer_key': consumer_key, + 'key_cert': key_cert_data + } diff --git a/taiga/importers/jira/normal.py b/taiga/importers/jira/normal.py new file mode 100644 index 00000000..45584545 --- /dev/null +++ b/taiga/importers/jira/normal.py @@ -0,0 +1,439 @@ +from collections import OrderedDict + +from django.template.defaultfilters import slugify +from taiga.projects.references.models import recalc_reference_counter +from taiga.projects.models import Project, ProjectTemplate, Membership, Points +from taiga.projects.userstories.models import UserStory, RolePoints +from taiga.projects.tasks.models import Task +from taiga.projects.issues.models import Issue +from taiga.projects.epics.models import Epic, RelatedUserStory +from taiga.projects.history.services import take_snapshot +from taiga.timeline.rebuilder import rebuild_timeline +from taiga.timeline.models import Timeline +from .common import JiraImporterCommon + + +class JiraNormalImporter(JiraImporterCommon): + def list_projects(self): + return [{"id": project['id'], + "name": project['name'], + "description": project['description'], + "is_private": True, + "importer_type": "normal"} for project in self._client.get('/project', {"expand": "description"})] + + def list_issue_types(self, project_id): + statuses = self._client.get("/project/{}/statuses".format(project_id)) + return statuses + + def import_project(self, project_id, options): + self.resolve_user_bindings(options) + project = self._import_project_data(project_id, options) + self._import_user_stories_data(project_id, project, options) + self._import_epics_data(project_id, project, options) + self._link_epics_with_user_stories(project_id, project, options) + self._import_issues_data(project_id, project, options) + self._cleanup(project, options) + Timeline.objects.filter(project=project).delete() + rebuild_timeline(None, None, project.id) + recalc_reference_counter(project) + return project + + def _import_project_data(self, project_id, options): + project = self._client.get("/project/{}".format(project_id)) + project_template = ProjectTemplate.objects.get(slug=options['template']) + + epic_statuses = OrderedDict() + for issue_type in options.get('types_bindings', {}).get("epic", []): + for status in issue_type['statuses']: + epic_statuses[status['name']] = status + + us_statuses = OrderedDict() + for issue_type in options.get('types_bindings', {}).get("us", []): + for status in issue_type['statuses']: + us_statuses[status['name']] = status + + task_statuses = OrderedDict() + for issue_type in options.get('types_bindings', {}).get("task", []): + for status in issue_type['statuses']: + task_statuses[status['name']] = status + + issue_statuses = OrderedDict() + for issue_type in options.get('types_bindings', {}).get("issue", []): + for status in issue_type['statuses']: + issue_statuses[status['name']] = status + + counter = 0 + if epic_statuses: + project_template.epic_statuses = [] + project_template.is_epics_activated = True + for epic_status in epic_statuses.values(): + project_template.epic_statuses.append({ + "name": epic_status['name'], + "slug": slugify(epic_status['name']), + "is_closed": False, + "color": "#999999", + "order": counter, + }) + counter += 1 + if epic_statuses: + project_template.default_options["epic_status"] = list(epic_statuses.values())[0]['name'] + + project_template.points = [{ + "value": None, + "name": "?", + "order": 0, + }] + + main_permissions = project_template.roles[0]['permissions'] + project_template.roles = [{ + "name": "Main", + "slug": "main", + "computable": True, + "permissions": main_permissions, + "order": 70, + }] + + counter = 0 + if us_statuses: + project_template.us_statuses = [] + for us_status in us_statuses.values(): + project_template.us_statuses.append({ + "name": us_status['name'], + "slug": slugify(us_status['name']), + "is_closed": False, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": counter, + }) + counter += 1 + if us_statuses: + project_template.default_options["us_status"] = list(us_statuses.values())[0]['name'] + + counter = 0 + if task_statuses: + project_template.task_statuses = [] + for task_status in task_statuses.values(): + project_template.task_statuses.append({ + "name": task_status['name'], + "slug": slugify(task_status['name']), + "is_closed": False, + "color": "#999999", + "order": counter, + }) + counter += 1 + if task_statuses: + project_template.default_options["task_status"] = list(task_statuses.values())[0]['name'] + + counter = 0 + if issue_statuses: + project_template.issue_statuses = [] + for issue_status in issue_statuses.values(): + project_template.issue_statuses.append({ + "name": issue_status['name'], + "slug": slugify(issue_status['name']), + "is_closed": False, + "color": "#999999", + "order": counter, + }) + counter += 1 + if issue_statuses: + project_template.default_options["issue_status"] = list(issue_statuses.values())[0]['name'] + + + main_permissions = project_template.roles[0]['permissions'] + project_template.roles = [{ + "name": "Main", + "slug": "main", + "computable": True, + "permissions": main_permissions, + "order": 70, + }] + + project = Project.objects.create( + name=options.get('name', None) or project['name'], + description=options.get('description', None) or project.get('description', ''), + owner=self._user, + creation_template=project_template, + is_private=options.get('is_private', False), + ) + + self._create_custom_fields(project) + + for user in options.get('users_bindings', {}).values(): + if user != self._user: + Membership.objects.get_or_create( + user=user, + project=project, + role=project.get_roles().get(slug="main"), + is_admin=False, + ) + return project + + def _import_user_stories_data(self, project_id, project, options): + users_bindings = options.get('users_bindings', {}) + + types = options.get('types_bindings', {}).get("us", []) + for issue_type in types: + counter = 0 + offset = 0 + while True: + issues = self._client.get("/search", { + "jql": "project={} AND issuetype={}".format(project_id, issue_type['id']), + "startAt": offset, + "fields": "*all", + "expand": "changelog,attachment", + }) + offset += issues['maxResults'] + + for issue in issues['issues']: + issue['fields']['issuelinks'] += self._client.get("/issue/{}/remotelink".format(issue['key'])) + assigned_to = users_bindings.get(issue['fields']['assignee']['key'] if issue['fields']['assignee'] else None, None) + owner = users_bindings.get(issue['fields']['creator']['key'] if issue['fields']['creator'] else None, self._user) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["jira", issue['fields']['url']] + + + us = UserStory.objects.create( + project=project, + owner=owner, + assigned_to=assigned_to, + status=project.us_statuses.get(name=issue['fields']['status']['name']), + kanban_order=counter, + sprint_order=counter, + backlog_order=counter, + subject=issue['fields']['summary'], + description=issue['fields']['description'] or '', + tags=issue['fields']['labels'], + external_reference=external_reference, + ) + + points_value = issue['fields'].get(self.greenhopper_fields.get('points', None), None) + if points_value: + (points, _) = Points.objects.get_or_create( + project=project, + value=points_value, + defaults={ + "name": str(points_value), + "order": points_value, + } + ) + RolePoints.objects.filter(user_story=us, role__slug="main").update(points_id=points.id) + else: + points = Points.objects.get(project=project, value__isnull=True) + RolePoints.objects.filter(user_story=us, role__slug="main").update(points_id=points.id) + + self._import_to_custom_fields(us, issue, options) + + us.ref = issue['key'].split("-")[1] + UserStory.objects.filter(id=us.id).update( + ref=us.ref, + modified_date=issue['fields']['updated'], + created_date=issue['fields']['created'] + ) + take_snapshot(us, comment="", user=None, delete=False) + self._import_subtasks(project_id, project, us, issue, options) + self._import_comments(us, issue, options) + self._import_attachments(us, issue, options) + self._import_changelog(project, us, issue, options) + counter += 1 + + if len(issues['issues']) < issues['maxResults']: + break + + def _import_subtasks(self, project_id, project, us, issue, options): + users_bindings = options.get('users_bindings', {}) + + if len(issue['fields']['subtasks']) == 0: + return + + counter = 0 + offset = 0 + while True: + issues = self._client.get("/search", { + "jql": "parent={}".format(issue['key']), + "startAt": offset, + "fields": "*all", + "expand": "changelog,attachment", + }) + offset += issues['maxResults'] + + for issue in issues['issues']: + issue['fields']['issuelinks'] += self._client.get("/issue/{}/remotelink".format(issue['key'])) + assigned_to = users_bindings.get(issue['fields']['assignee']['key'] if issue['fields']['assignee'] else None, None) + owner = users_bindings.get(issue['fields']['creator']['key'] if issue['fields']['creator'] else None, self._user) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["jira", issue['fields']['url']] + + task = Task.objects.create( + user_story=us, + project=project, + owner=owner, + assigned_to=assigned_to, + status=project.task_statuses.get(name=issue['fields']['status']['name']), + subject=issue['fields']['summary'], + description=issue['fields']['description'] or '', + tags=issue['fields']['labels'], + external_reference=external_reference, + ) + + self._import_to_custom_fields(task, issue, options) + + task.ref = issue['key'].split("-")[1] + Task.objects.filter(id=task.id).update( + ref=task.ref, + modified_date=issue['fields']['updated'], + created_date=issue['fields']['created'] + ) + take_snapshot(task, comment="", user=None, delete=False) + for subtask in issue['fields']['subtasks']: + print("WARNING: Ignoring subtask {} because parent isn't a User Story".format(subtask['key'])) + self._import_comments(task, issue, options) + self._import_attachments(task, issue, options) + self._import_changelog(project, task, issue, options) + counter += 1 + if len(issues['issues']) < issues['maxResults']: + break + + def _import_issues_data(self, project_id, project, options): + users_bindings = options.get('users_bindings', {}) + + types = options.get('types_bindings', {}).get("issue", []) + for issue_type in types: + counter = 0 + offset = 0 + while True: + issues = self._client.get("/search", { + "jql": "project={} AND issuetype={}".format(project_id, issue_type['id']), + "startAt": offset, + "fields": "*all", + "expand": "changelog,attachment", + }) + offset += issues['maxResults'] + + for issue in issues['issues']: + issue['fields']['issuelinks'] += self._client.get("/issue/{}/remotelink".format(issue['key'])) + assigned_to = users_bindings.get(issue['fields']['assignee']['key'] if issue['fields']['assignee'] else None, None) + owner = users_bindings.get(issue['fields']['creator']['key'] if issue['fields']['creator'] else None, self._user) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["jira", issue['fields']['url']] + + taiga_issue = Issue.objects.create( + project=project, + owner=owner, + assigned_to=assigned_to, + status=project.issue_statuses.get(name=issue['fields']['status']['name']), + subject=issue['fields']['summary'], + description=issue['fields']['description'] or '', + tags=issue['fields']['labels'], + external_reference=external_reference, + ) + + self._import_to_custom_fields(taiga_issue, issue, options) + + taiga_issue.ref = issue['key'].split("-")[1] + Issue.objects.filter(id=taiga_issue.id).update( + ref=taiga_issue.ref, + modified_date=issue['fields']['updated'], + created_date=issue['fields']['created'] + ) + take_snapshot(taiga_issue, comment="", user=None, delete=False) + for subtask in issue['fields']['subtasks']: + print("WARNING: Ignoring subtask {} because parent isn't a User Story".format(subtask['key'])) + self._import_comments(taiga_issue, issue, options) + self._import_attachments(taiga_issue, issue, options) + self._import_changelog(project, taiga_issue, issue, options) + counter += 1 + + if len(issues['issues']) < issues['maxResults']: + break + + def _import_epics_data(self, project_id, project, options): + users_bindings = options.get('users_bindings', {}) + + types = options.get('types_bindings', {}).get("epic", []) + for issue_type in types: + counter = 0 + offset = 0 + while True: + issues = self._client.get("/search", { + "jql": "project={} AND issuetype={}".format(project_id, issue_type['id']), + "startAt": offset, + "fields": "*all", + "expand": "changelog,attachment", + }) + offset += issues['maxResults'] + + for issue in issues['issues']: + issue['fields']['issuelinks'] += self._client.get("/issue/{}/remotelink".format(issue['key'])) + assigned_to = users_bindings.get(issue['fields']['assignee']['key'] if issue['fields']['assignee'] else None, None) + owner = users_bindings.get(issue['fields']['creator']['key'] if issue['fields']['creator'] else None, self._user) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["jira", issue['fields']['url']] + + epic = Epic.objects.create( + project=project, + owner=owner, + assigned_to=assigned_to, + status=project.epic_statuses.get(name=issue['fields']['status']['name']), + subject=issue['fields']['summary'], + description=issue['fields']['description'] or '', + epics_order=counter, + tags=issue['fields']['labels'], + external_reference=external_reference, + ) + + self._import_to_custom_fields(epic, issue, options) + + epic.ref = issue['key'].split("-")[1] + Epic.objects.filter(id=epic.id).update( + ref=epic.ref, + modified_date=issue['fields']['updated'], + created_date=issue['fields']['created'] + ) + take_snapshot(epic, comment="", user=None, delete=False) + for subtask in issue['fields']['subtasks']: + print("WARNING: Ignoring subtask {} because parent isn't a User Story".format(subtask['key'])) + self._import_comments(epic, issue, options) + self._import_attachments(epic, issue, options) + issue_with_changelog = self._client.get("/issue/{}".format(issue['key']), { + "expand": "changelog" + }) + self._import_changelog(project, epic, issue_with_changelog, options) + counter += 1 + + if len(issues['issues']) < issues['maxResults']: + break + + def _link_epics_with_user_stories(self, project_id, project, options): + types = options.get('types_bindings', {}).get("us", []) + for issue_type in types: + offset = 0 + while True: + issues = self._client.get("/search", { + "jql": "project={} AND issuetype={}".format(project_id, issue_type['id']), + "startAt": offset + }) + offset += issues['maxResults'] + + for issue in issues['issues']: + epic_key = issue['fields'][self.greenhopper_fields['link']] + if epic_key: + epic = project.epics.get(ref=int(epic_key.split("-")[1])) + us = project.user_stories.get(ref=int(issue['key'].split("-")[1])) + RelatedUserStory.objects.create( + user_story=us, + epic=epic, + order=1 + ) + + if len(issues['issues']) < issues['maxResults']: + break diff --git a/taiga/importers/jira/tasks.py b/taiga/importers/jira/tasks.py new file mode 100644 index 00000000..a1551f1b --- /dev/null +++ b/taiga/importers/jira/tasks.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import logging +import sys + +from django.utils.translation import ugettext as _ + +from taiga.base.mails import mail_builder +from taiga.users.models import User +from taiga.celery import app +from .normal import JiraNormalImporter + +logger = logging.getLogger('taiga.importers.jira') + + +@app.task(bind=True) +def import_project(self, user_id, url, token, project_id, options, importer_type): + user = User.object.get(id=user_id) + + if importer_type == "agile": + importer = JiraAgileImporter(user, url, token) + else: + importer = JiraNormalImporter(user, url, token) + + try: + project = importer.import_project(project_id, options) + except Exception as e: + # Error + ctx = { + "user": user, + "error_subject": _("Error importing jira project"), + "error_message": _("Error importing jira project"), + "project": project_id, + "exception": e + } + email = mail_builder.jira_import_error(admin, ctx) + email.send() + logger.error('Error importing jira project %s (by %s)', project_id, user, exc_info=sys.exc_info()) + else: + ctx = { + "project": project, + "user": user, + } + email = mail_builder.jira_import_success(user, ctx) + email.send() diff --git a/taiga/importers/management/commands/import_from_jira.py b/taiga/importers/management/commands/import_from_jira.py new file mode 100644 index 00000000..972e6ba6 --- /dev/null +++ b/taiga/importers/management/commands/import_from_jira.py @@ -0,0 +1,146 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.core.management.base import BaseCommand +from django.db.models import Q +from django.conf import settings + +from taiga.importers.jira.agile import JiraAgileImporter +from taiga.importers.jira.normal import JiraNormalImporter +from taiga.users.models import User +from taiga.projects.services import projects as service + +import unittest.mock +import timeit +import json + + +class Command(BaseCommand): + def add_arguments(self, parser): + parser.add_argument('--token', dest="token", type=str, + help='Auth token') + parser.add_argument('--server', dest="server", type=str, + help='Server address (default: https://jira.atlassian.com)', + default="https://jira.atlassian.com") + parser.add_argument('--project-id', dest="project_id", type=str, + help='Project ID or full name (ex: taigaio/taiga-back)') + parser.add_argument('--project-type', dest="project_type", type=str, + help='Project type in jira: project or board') + parser.add_argument('--template', dest='template', default="scrum", + help='template to use: scrum or scrum (default scrum)') + parser.add_argument('--ask-for-users', dest='ask_for_users', const=True, + action="store_const", default=False, + help='Import closed data') + parser.add_argument('--closed-data', dest='closed_data', const=True, + action="store_const", default=False, + help='Import closed data') + parser.add_argument('--keep-external-reference', dest='keep_external_reference', const=True, + action="store_const", default=False, + help='Store external reference of imported data') + + def handle(self, *args, **options): + admin = User.objects.get(username="admin") + server = options.get("server") + + if options.get('token', None) == "anon": + token = None + elif options.get('token', None): + token = json.loads(options.get('token')) + else: + (rtoken, rtoken_secret, url) = JiraNormalImporter.get_auth_url(server, settings.JIRA_CONSUMER_KEY, settings.JIRA_CERT, True) + print(url) + code = input("Go to the url and get back the code") + token = JiraNormalImporter.get_access_token(server, settings.JIRA_CONSUMER_KEY, settings.JIRA_CERT, rtoken, rtoken_secret, True) + print("Auth token: {}".format(json.dumps(token))) + + + if options.get('project_type', None) is None: + print("Select the type of project to import (project or board): ") + project_type = input("Project type: ") + else: + project_type = options.get('project_type') + + if project_type not in ["project", "board"]: + print("ERROR: Bad project type.") + return + + if project_type == "project": + importer = JiraNormalImporter(admin, server, token) + else: + importer = JiraAgileImporter(admin, server, token) + + if options.get('project_id', None): + project_id = options.get('project_id') + else: + print("Select the project to import:") + for project in importer.list_projects(): + print("- {}: {}".format(project['id'], project['name'])) + project_id = input("Project id or key: ") + + users_bindings = {} + if options.get('ask_for_users', None): + print("Add the username or email for next jira users:") + for user in importer.list_users(): + try: + users_bindings[user['key']] = User.objects.get(Q(email=user['email'])) + break + except User.DoesNotExist: + pass + + while True: + username_or_email = input("{}: ".format(user['full_name'])) + if username_or_email == "": + break + try: + users_bindings[user['key']] = User.objects.get(Q(username=username_or_email) | Q(email=username_or_email)) + break + except User.DoesNotExist: + print("ERROR: Invalid username or email") + + options = { + "template": options.get('template'), + "import_closed_data": options.get("closed_data", False), + "users_bindings": users_bindings, + "keep_external_reference": options.get('keep_external_reference'), + } + + if project_type == "project": + print("Bind jira issue types to (epic, us, issue)") + types_bindings = { + "epic": [], + "us": [], + "task": [], + "issue": [], + } + + for issue_type in importer.list_issue_types(project_id): + while True: + if issue_type['subtask']: + types_bindings['task'].append(issue_type) + break + + taiga_type = input("{}: ".format(issue_type['name'])) + if taiga_type not in ['epic', 'us', 'issue']: + print("use a valid taiga type (epic, us, issue)") + continue + + types_bindings[taiga_type].append(issue_type) + break + options["types_bindings"] = types_bindings + + importer.import_project(project_id, options) diff --git a/taiga/routers.py b/taiga/routers.py index 528f7696..1546ef8b 100644 --- a/taiga/routers.py +++ b/taiga/routers.py @@ -285,8 +285,10 @@ router.register(r"application-tokens", ApplicationToken, base_name="application- # Third party importers from taiga.importers.trello.api import TrelloImporterViewSet +from taiga.importers.jira.api import JiraImporterViewSet router.register(r"importers/trello", TrelloImporterViewSet, base_name="importers-trello") +router.register(r"importers/jira", JiraImporterViewSet, base_name="importers-jira") # Stats diff --git a/tests/integration/test_importers_jira_api.py b/tests/integration/test_importers_jira_api.py new file mode 100644 index 00000000..ebb96a11 --- /dev/null +++ b/tests/integration/test_importers_jira_api.py @@ -0,0 +1,259 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import pytest +import json + +from unittest import mock + +from django.core.urlresolvers import reverse + +from .. import factories as f +from taiga.base.utils import json +from taiga.base import exceptions as exc +from taiga.users.models import AuthData + + +pytestmark = pytest.mark.django_db + + +fake_token = "access.secret" + + +def test_auth_url(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-jira-auth-url")+"?url=http://jiraserver" + + with mock.patch('taiga.importers.jira.api.JiraNormalImporter') as JiraNormalImporter: + JiraNormalImporter.get_auth_url.return_value = ("test_oauth_token", "test_oauth_secret", "http://jira-server-url") + response = client.get(url, content_type="application/json") + + auth_data = user.auth_data.get(key="jira-oauth") + assert auth_data.extra['oauth_token'] == "test_oauth_token" + assert auth_data.extra['oauth_secret'] == "test_oauth_secret" + assert auth_data.extra['url'] == "http://jiraserver" + + assert response.status_code == 200 + assert 'url' in response.data + assert response.data['url'] == "http://jira-server-url" + + +def test_authorize(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-jira-auth-url") + authorize_url = reverse("importers-jira-authorize") + + AuthData.objects.get_or_create( + user=user, + key="jira-oauth", + value="", + extra={ + "oauth_token": "test-oauth-token", + "oauth_secret": "test-oauth-secret", + "url": "http://jiraserver", + } + ) + + with mock.patch('taiga.importers.jira.api.JiraNormalImporter') as JiraNormalImporter: + JiraNormalImporter.get_access_token.return_value = { + "access_token": "test-access-token", + "access_token_secret": "test-access-token-secret" + } + response = client.post(authorize_url, content_type="application/json", data={}) + + assert response.status_code == 200 + assert 'token' in response.data + assert response.data['token'] == "test-access-token.test-access-token-secret" + assert 'url' in response.data + assert response.data['url'] == "http://jiraserver" + + +def test_authorize_without_token_and_secret(client): + user = f.UserFactory.create() + client.login(user) + + authorize_url = reverse("importers-jira-authorize") + AuthData.objects.filter(user=user, key="jira-oauth").delete() + + response = client.post(authorize_url, content_type="application/json", data={}) + + assert response.status_code == 400 + assert 'token' not in response.data + + +def test_import_jira_list_users(client, settings): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-jira-list-users") + + with mock.patch('taiga.importers.jira.api.JiraNormalImporter') as JiraNormalImporterMock: + instance = mock.Mock() + instance.list_users.return_value = [ + {"id": 1, "fullName": "user1", "email": None}, + {"id": 2, "fullName": "user2", "email": None} + ] + JiraNormalImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "url": "http://jiraserver", "project": 1})) + + assert response.status_code == 200 + assert response.data[0]["id"] == 1 + assert response.data[1]["id"] == 2 + + +def test_import_jira_list_users_without_project(client, settings): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-jira-list-users") + + with mock.patch('taiga.importers.jira.api.JiraNormalImporter') as JiraNormalImporterMock: + instance = mock.Mock() + instance.list_users.return_value = [ + {"id": 1, "fullName": "user1", "email": None}, + {"id": 2, "fullName": "user2", "email": None} + ] + JiraNormalImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "url": "http://jiraserver"})) + + assert response.status_code == 400 + + +def test_import_jira_list_users_with_problem_on_request(client, settings): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-jira-list-users") + + with mock.patch('taiga.importers.jira.common.JiraClient') as JiraClientMock: + instance = mock.Mock() + instance.get.side_effect = exc.WrongArguments("Invalid Request") + JiraClientMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "url": "http://jiraserver", "project": 1})) + + assert response.status_code == 400 + + +def test_import_jira_list_projects(client, settings): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-jira-list-projects") + + with mock.patch('taiga.importers.jira.api.JiraNormalImporter') as JiraNormalImporterMock: + with mock.patch('taiga.importers.jira.api.JiraAgileImporter') as JiraAgileImporterMock: + instance = mock.Mock() + instance.list_projects.return_value = [{"name": "project1"}, {"name": "project2"}] + JiraNormalImporterMock.return_value = instance + instance_agile = mock.Mock() + instance_agile.list_projects.return_value = [{"name": "agile1"}, {"name": "agile2"}] + JiraAgileImporterMock.return_value = instance_agile + response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "url": "http://jiraserver"})) + + assert response.status_code == 200 + assert response.data[0] == {"name": "agile1"} + assert response.data[1] == {"name": "agile2"} + assert response.data[2] == {"name": "project1"} + assert response.data[3] == {"name": "project2"} + + +def test_import_jira_list_projects_with_problem_on_request(client, settings): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-jira-list-projects") + + with mock.patch('taiga.importers.jira.common.JiraClient') as JiraClientMock: + instance = mock.Mock() + instance.get.side_effect = exc.WrongArguments("Invalid Request") + JiraClientMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "url": "http://jiraserver"})) + + assert response.status_code == 400 + + +def test_import_jira_project_without_project_id(client, settings): + settings.CELERY_ENABLED = True + + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-jira-import-project") + + with mock.patch('taiga.importers.jira.tasks.JiraNormalImporter') as JiraNormalImporterMock: + response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "url": "http://jiraserver"})) + + assert response.status_code == 400 + + +def test_import_jira_project_without_url(client, settings): + settings.CELERY_ENABLED = True + + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-jira-import-project") + + with mock.patch('taiga.importers.jira.tasks.JiraNormalImporter') as JiraNormalImporterMock: + response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "project_id": 1})) + + assert response.status_code == 400 + + +def test_import_jira_project_with_celery_enabled(client, settings): + settings.CELERY_ENABLED = True + + user = f.UserFactory.create() + project = f.ProjectFactory.create(slug="async-imported-project") + client.login(user) + + url = reverse("importers-jira-import-project") + + with mock.patch('taiga.importers.jira.api.JiraNormalImporter') as ApiJiraNormalImporterMock: + with mock.patch('taiga.importers.jira.tasks.JiraNormalImporter') as TasksJiraNormalImporterMock: + TasksJiraNormalImporterMock.return_value.import_project.return_value = project + ApiJiraNormalImporterMock.return_value.list_issue_types.return_value = [] + response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "url": "http://jiraserver", "project": 1})) + + assert response.status_code == 202 + assert "task_id" in response.data + + +def test_import_jira_project_with_celery_disabled(client, settings): + settings.CELERY_ENABLED = False + + user = f.UserFactory.create() + project = f.ProjectFactory.create(slug="imported-project") + client.login(user) + + url = reverse("importers-jira-import-project") + + with mock.patch('taiga.importers.jira.api.JiraNormalImporter') as JiraNormalImporterMock: + instance = mock.Mock() + instance.import_project.return_value = project + instance.list_issue_types.return_value = [] + JiraNormalImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "url": "http://jiraserver", "project": 1})) + + assert response.status_code == 200 + assert "slug" in response.data + assert response.data['slug'] == "imported-project" From cca421b14d22d0bb11c3a5e2d4adcfaa44aca01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 18 Jan 2017 09:40:05 +0100 Subject: [PATCH 104/144] Add github importer --- settings/common.py | 2 + taiga/importers/exceptions.py | 5 + taiga/importers/github/api.py | 131 ++++ taiga/importers/github/importer.py | 604 ++++++++++++++++++ taiga/importers/github/tasks.py | 56 ++ .../management/commands/import_from_github.py | 100 +++ taiga/routers.py | 2 + .../integration/test_importers_github_api.py | 228 +++++++ 8 files changed, 1128 insertions(+) create mode 100644 taiga/importers/exceptions.py create mode 100644 taiga/importers/github/api.py create mode 100644 taiga/importers/github/importer.py create mode 100644 taiga/importers/github/tasks.py create mode 100644 taiga/importers/management/commands/import_from_github.py create mode 100644 tests/integration/test_importers_github_api.py diff --git a/settings/common.py b/settings/common.py index 7a894969..9ce0e415 100644 --- a/settings/common.py +++ b/settings/common.py @@ -561,6 +561,8 @@ MAX_PENDING_MEMBERSHIPS = 30 # Max number of unconfirmed memberships in a projec from .sr import * +GITHUB_API_CLIENT_ID = "" +GITHUB_API_CLIENT_SECRET = "" TRELLO_API_KEY = "" TRELLO_SECRET_KEY = "" diff --git a/taiga/importers/exceptions.py b/taiga/importers/exceptions.py new file mode 100644 index 00000000..da430079 --- /dev/null +++ b/taiga/importers/exceptions.py @@ -0,0 +1,5 @@ +class InvalidAuthResult(Exception): + pass + +class FailedRequest(Exception): + pass diff --git a/taiga/importers/github/api.py b/taiga/importers/github/api.py new file mode 100644 index 00000000..e8991c0d --- /dev/null +++ b/taiga/importers/github/api.py @@ -0,0 +1,131 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Taiga Agile LLC +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.utils.translation import ugettext as _ +from django.conf import settings + +from taiga.base.api import viewsets +from taiga.base import response +from taiga.base import exceptions as exc +from taiga.base.decorators import list_route +from taiga.users.models import AuthData, User +from taiga.users.services import get_user_photo_url +from taiga.users.gravatar import get_user_gravatar_id +from taiga.projects.serializers import ProjectSerializer + +from taiga.importers import permissions +from taiga.importers import exceptions +from .importer import GithubImporter +from . import tasks + + +class GithubImporterViewSet(viewsets.ViewSet): + permission_classes = (permissions.ImporterPermission,) + + @list_route(methods=["POST"]) + def list_users(self, request, *args, **kwargs): + self.check_permissions(request, "list_users", None) + + token = request.DATA.get('token', None) + project_id = request.DATA.get('project', None) + + if not project_id: + raise exc.WrongArguments(_("The project param is needed")) + + importer = GithubImporter(request.user, token) + users = importer.list_users(project_id) + for user in users: + if user['detected_user']: + user['user'] = { + 'id': user['detected_user'].id, + 'full_name': user['detected_user'].get_full_name(), + 'gravatar_id': get_user_gravatar_id(user['detected_user']), + 'photo': get_user_photo_url(user['detected_user']), + } + del(user['detected_user']) + return response.Ok(users) + + @list_route(methods=["POST"]) + def list_projects(self, request, *args, **kwargs): + self.check_permissions(request, "list_projects", None) + token = request.DATA.get('token', None) + importer = GithubImporter(request.user, token) + projects = importer.list_projects() + return response.Ok(projects) + + @list_route(methods=["POST"]) + def import_project(self, request, *args, **kwargs): + self.check_permissions(request, "import_project", None) + + token = request.DATA.get('token', None) + project_id = request.DATA.get('project', None) + if not project_id: + raise exc.WrongArguments(_("The project param is needed")) + + template = request.DATA.get('template', "scrum") + items_type = "user_stories" + if template == "issues": + items_type = "issues" + template = "scrum" + + options = { + "name": request.DATA.get('name', None), + "description": request.DATA.get('description', None), + "template": template, + "type": items_type, + "users_bindings": request.DATA.get("users_bindings", {}), + "keep_external_reference": request.DATA.get("keep_external_reference", False), + "is_private": request.DATA.get("is_private", False), + } + + if settings.CELERY_ENABLED: + task = tasks.import_project.delay(request.user.id, token, project_id, options) + return response.Accepted({"task_id": task.id}) + + importer = GithubImporter(request.user, token) + project = importer.import_project(project_id, options) + project_data = { + "slug": project.slug, + "my_permissions": ["view_us"], + "is_backlog_activated": project.is_backlog_activated, + "is_kanban_activated": project.is_kanban_activated, + } + + return response.Ok(project_data) + + @list_route(methods=["GET"]) + def auth_url(self, request, *args, **kwargs): + self.check_permissions(request, "auth_url", None) + callback_uri = request.QUERY_PARAMS.get('uri') + url = GithubImporter.get_auth_url(settings.GITHUB_API_CLIENT_ID, callback_uri) + return response.Ok({"url": url}) + + @list_route(methods=["POST"]) + def authorize(self, request, *args, **kwargs): + self.check_permissions(request, "authorize", None) + + code = request.DATA.get('code', None) + if code is None: + raise exc.BadRequest(_("Code param needed")) + + try: + token = GithubImporter.get_access_token(settings.GITHUB_API_CLIENT_ID, settings.GITHUB_API_CLIENT_SECRET, code) + return response.Ok({ + "token": token + }) + except exceptions.InvalidAuthResult: + raise exc.BadRequest(_("Invalid auth data")) + except exceptions.FailedRequest: + raise exc.BadRequest(_("Third party service failing")) diff --git a/taiga/importers/github/importer.py b/taiga/importers/github/importer.py new file mode 100644 index 00000000..b042feef --- /dev/null +++ b/taiga/importers/github/importer.py @@ -0,0 +1,604 @@ +import requests +from urllib.parse import parse_qsl +from django.core.files.base import ContentFile + +from taiga.projects.models import Project, ProjectTemplate, Membership +from taiga.projects.references.models import recalc_reference_counter +from taiga.projects.userstories.models import UserStory +from taiga.projects.issues.models import Issue +from taiga.projects.milestones.models import Milestone +from taiga.projects.history.services import take_snapshot +from taiga.projects.history.services import (make_diff_from_dicts, + make_diff_values, + make_key_from_model_object, + get_typename_for_model_class, + FrozenDiff) +from taiga.projects.history.models import HistoryEntry +from taiga.projects.history.choices import HistoryType +from taiga.timeline.rebuilder import rebuild_timeline +from taiga.timeline.models import Timeline +from taiga.users.models import User, AuthData + + +class GithubClient: + def __init__(self, token): + self.api_url = "https://api.github.com/{}" + self.token = token + + def get(self, uri_path, query_params=None): + headers = { + "Content-Type": "application/json", + "X-GitHub-Media-Type": "github.v3" + } + if self.token: + headers['Authorization'] = 'token {}'.format(self.token) + + if query_params is None: + query_params = {} + + if uri_path[0] == '/': + uri_path = uri_path[1:] + url = self.api_url.format(uri_path) + + response = requests.get(url, params=query_params, headers=headers) + + if response.status_code == 401: + raise Exception("Unauthorized: %s at %s" % (response.text, url), response) + if response.status_code != 200: + raise Exception("Resource Unavailable: %s at %s" % (response.text, url), response) + + return response.json() + + +class GithubImporter: + def __init__(self, user, token, import_closed_data=False): + self._import_closed_data = import_closed_data + self._user = user + self._client = GithubClient(token) + self._me = self._client.get("/user") + + def list_projects(self): + projects = [] + page = 1 + while True: + repos = self._client.get("/user/repos", { + "sort": "full_name", + "page": page, + "per_page": 100 + }) + page += 1 + + for repo in repos: + projects.append({ + "id": repo['full_name'], + "name": repo['full_name'], + "description": repo['description'], + "is_private": repo['private'], + }) + + if len(repos) < 100: + break + return projects + + def list_users(self, project_full_name): + collaborators = self._client.get("/repos/{}/collaborators".format(project_full_name)) + collaborators = [self._client.get("/users/{}".format(u['login'])) for u in collaborators] + return [{"id": u['id'], + "username": u['login'], + "full_name": u.get('name', u['login']), + "detected_user": self._get_user(u) } for u in collaborators] + + def _get_user(self, user, default=None): + if not user: + return default + + try: + return AuthData.objects.get(key="github", value=user['id']).user + except AuthData.DoesNotExist: + pass + + try: + return User.objects.get(email=user.get('email', "not-valid")) + except User.DoesNotExist: + pass + + return default + + def import_project(self, project_full_name, options={"keep_external_reference": False, "template": "kanban", "type": "user_stories"}): + repo = self._client.get('/repos/{}'.format(project_full_name)) + project = self._import_project_data(repo, options) + if options.get('type', None) == "user_stories": + self._import_user_stories_data(project, repo, options) + elif options.get('type', None) == "issues": + self._import_issues_data(project, repo, options) + self._import_comments(project, repo, options) + self._import_history(project, repo, options) + Timeline.objects.filter(project=project).delete() + rebuild_timeline(None, None, project.id) + recalc_reference_counter(project) + return project + + def _import_project_data(self, repo, options): + users_bindings = options.get('users_bindings', {}) + project_template = ProjectTemplate.objects.get(slug=options['template']) + + if options['type'] == "user_stories": + project_template.us_statuses = [] + project_template.us_statuses.append({ + "name": "Open", + "slug": "open", + "is_closed": False, + "is_archived": False, + "color": "#ff8a84", + "wip_limit": None, + "order": 1, + }) + project_template.us_statuses.append({ + "name": "Closed", + "slug": "closed", + "is_closed": True, + "is_archived": False, + "color": "#669900", + "wip_limit": None, + "order": 2, + }) + project_template.default_options["us_status"] = "Open" + elif options['type'] == "issues": + project_template.issue_statuses = [] + project_template.issue_statuses.append({ + "name": "Open", + "slug": "open", + "is_closed": False, + "color": "#ff8a84", + "order": 1, + }) + project_template.issue_statuses.append({ + "name": "Closed", + "slug": "closed", + "is_closed": True, + "color": "#669900", + "order": 2, + }) + project_template.default_options["issue_status"] = "Open" + + project_template.roles.append({ + "name": "Github", + "slug": "github", + "computable": False, + "permissions": project_template.roles[0]['permissions'], + "order": 70, + }) + + tags_colors = [] + for label in self._client.get("/repos/{}/labels".format(repo['full_name'])): + name = label['name'].lower() + color = "#{}".format(label['color']) + tags_colors.append([name, color]) + + project = Project.objects.create( + name=options.get('name', None) or repo['full_name'], + description=options.get('description', None) or repo['description'], + owner=self._user, + tags_colors=tags_colors, + creation_template=project_template, + is_private=options.get('is_private', False), + ) + + if 'organization' in repo and repo['organization'].get('avatar_url', None): + data = requests.get(repo['organization']['avatar_url']) + project.logo.save("logo.png", ContentFile(data.content), save=True) + + for user in self._client.get("/repos/{}/collaborators".format(repo['full_name'])): + taiga_user = users_bindings.get(user['id'], None) + if taiga_user is None or taiga_user == self._user: + continue + + Membership.objects.create( + user=taiga_user, + project=project, + role=project.get_roles().get(slug="github"), + is_admin=False, + invited_by=self._user, + ) + + for milestone in self._client.get("/repos/{}/milestones".format(repo['full_name'])): + taiga_milestone = Milestone.objects.create( + name=milestone['title'], + owner=users_bindings.get(milestone.get('creator', {}).get('id', None), self._user), + project=project, + estimated_start=milestone['created_at'][:10], + estimated_finish=milestone['due_on'][:10], + ) + Milestone.objects.filter(id=taiga_milestone.id).update( + created_date=milestone['created_at'], + modified_date=milestone['updated_at'], + ) + return project + + def _import_user_stories_data(self, project, repo, options): + users_bindings = options.get('users_bindings', {}) + + page = 1 + while True: + issues = self._client.get("/repos/{}/issues".format(repo['full_name']), { + "state": "all", + "sort": "created", + "direction": "asc", + "page": page, + "per_page": 100 + }) + page += 1 + for issue in issues: + tags = [] + for label in issue['labels']: + tags.append(label['name'].lower()) + + assigned_to = users_bindings.get(issue['assignee']['id'] if issue['assignee'] else None, None) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["github", issue['html_url']] + + us = UserStory.objects.create( + ref=issue['number'], + project=project, + owner=users_bindings.get(issue['user']['id'], self._user), + milestone=project.milestones.get(name=issue['milestone']['title']) if issue['milestone'] else None, + assigned_to=assigned_to, + status=project.us_statuses.get(slug=issue['state']), + kanban_order=issue['number'], + sprint_order=issue['number'], + backlog_order=issue['number'], + subject=issue['title'], + description=issue.get("body", "") or "", + tags=tags, + external_reference=external_reference, + modified_date=issue['updated_at'], + created_date=issue['created_at'], + ) + + assignees = issue.get('assignees', []) + if len(assignees) > 1: + for assignee in assignees: + if assignee['id'] != issue.get('assignee', {}).get('id', None): + assignee_user = users_bindings.get(assignee['id'], None) + if assignee_user is not None: + us.add_watcher(assignee_user) + + UserStory.objects.filter(id=us.id).update( + ref=issue['number'], + modified_date=issue['updated_at'], + created_date=issue['created_at'] + ) + + take_snapshot(us, comment="", user=None, delete=False) + + if len(issues) < 100: + break + + def _import_issues_data(self, project, repo, options): + users_bindings = options.get('users_bindings', {}) + + page = 1 + while True: + issues = self._client.get("/repos/{}/issues".format(repo['full_name']), { + "state": "all", + "sort": "created", + "direction": "asc", + "page": page, + "per_page": 100 + }) + page += 1 + for issue in issues: + tags = [] + for label in issue['labels']: + tags.append(label['name'].lower()) + + assigned_to = users_bindings.get(issue['assignee']['id'] if issue['assignee'] else None, None) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["github", issue['html_url']] + + taiga_issue = Issue.objects.create( + ref=issue['number'], + project=project, + owner=users_bindings.get(issue['user']['id'], self._user), + assigned_to=assigned_to, + status=project.issue_statuses.get(slug=issue['state']), + subject=issue['title'], + description=issue.get('body', "") or "", + tags=tags, + external_reference=external_reference, + modified_date=issue['updated_at'], + created_date=issue['created_at'], + ) + + assignees = issue.get('assignees', []) + if len(assignees) > 1: + for assignee in assignees: + if assignee['id'] != issue.get('assignee', {}).get('id', None): + assignee_user = users_bindings.get(assignee['id'], None) + if assignee_user is not None: + taiga_issue.add_watcher(assignee_user) + + Issue.objects.filter(id=taiga_issue.id).update( + ref=issue['number'], + modified_date=issue['updated_at'], + created_date=issue['created_at'] + ) + + take_snapshot(taiga_issue, comment="", user=None, delete=False) + + if len(issues) < 100: + break + + def _import_comments(self, project, repo, options): + users_bindings = options.get('users_bindings', {}) + + page = 1 + while True: + comments = self._client.get("/repos/{}/issues/comments".format(repo['full_name']), { + "page": page, + "per_page": 100 + }) + page += 1 + + for comment in comments: + issue_id = comment['issue_url'].split("/")[-1] + if options.get('type', None) == "user_stories": + obj = UserStory.objects.get(project=project, ref=issue_id) + elif options.get('type', None) == "issues": + obj = Issue.objects.get(project=project, ref=issue_id) + + snapshot = take_snapshot( + obj, + comment=comment['body'], + user=users_bindings.get(comment['user']['id'], User(full_name=comment['user'].get('name', None) or comment['user']['login'])), + delete=False + ) + HistoryEntry.objects.filter(id=snapshot.id).update(created_at=comment['created_at']) + + if len(comments) < 100: + break + + def _import_history(self, project, repo, options): + cumulative_data = {} + page = 1 + all_events = [] + while True: + events = self._client.get("/repos/{}/issues/events".format(repo['full_name']), { + "page": page, + "per_page": 100 + }) + page += 1 + all_events = all_events + events + + if len(events) < 100: + break + + for event in sorted(all_events, key=lambda x: x['id']): + if options.get('type', None) == "user_stories": + obj = UserStory.objects.get(project=project, ref=event['issue']['number']) + elif options.get('type', None) == "issues": + obj = Issue.objects.get(project=project, ref=event['issue']['number']) + + if event['issue']['number'] in cumulative_data: + obj_cumulative_data = cumulative_data[event['issue']['number']] + else: + obj_cumulative_data = { + "tags": set(), + "assigned_to": None, + "assigned_to_github_id": None, + "assigned_to_name": None, + "milestone": None, + } + cumulative_data[event['issue']['number']] = obj_cumulative_data + self._import_event(obj, event, options, obj_cumulative_data) + + def _import_event(self, obj, event, options, cumulative_data): + typename = get_typename_for_model_class(type(obj)) + key = make_key_from_model_object(obj) + event_data = self._transform_event_data(obj, event, options, cumulative_data) + if event_data is None: + return + + change_old = event_data['change_old'] + change_new = event_data['change_new'] + user = event_data['user'] + + diff = make_diff_from_dicts(change_old, change_new) + fdiff = FrozenDiff(key, diff, {}) + values = make_diff_values(typename, fdiff) + values.update(event_data['update_values']) + entry = HistoryEntry.objects.create( + user=user, + project_id=obj.project.id, + key=key, + type=HistoryType.change, + snapshot=None, + diff=fdiff.diff, + values=values, + comment="", + comment_html="", + is_hidden=False, + is_snapshot=False, + ) + HistoryEntry.objects.filter(id=entry.id).update(created_at=event['created_at']) + return HistoryEntry.objects.get(id=entry.id) + + def _transform_event_data(self, obj, event, options, cumulative_data): + users_bindings = options.get('users_bindings', {}) + + ignored_events = ["committed", "cross-referenced", "head_ref_deleted", + "head_ref_restored", "locked", "unlocked", "merged", + "referenced", "mentioned", "subscribed", + "unsubscribed"] + + if event['event'] in ignored_events: + return None + + user = {"pk": None, "name": event['actor'].get('name', event['actor']['login'])} + taiga_user = users_bindings.get(event['actor']['id'], None) if event['actor'] else None + if taiga_user: + user = {"pk": taiga_user.id, "name": taiga_user.get_full_name()} + + result = { + "change_old": {}, + "change_new": {}, + "user": user, + "update_values": {}, + } + + if event['event'] == "renamed": + result['change_old']["subject"] = event['rename']['from'] + result['change_new']["subject"] = event['rename']['to'] + elif event['event'] == "reopened": + if isinstance(obj, Issue): + result['change_old']["status"] = obj.project.issue_statuses.get(name='Closed').id + result['change_new']["status"] = obj.project.issue_statuses.get(name='Open').id + elif isinstance(obj, UserStory): + result['change_old']["status"] = obj.project.us_statuses.get(name='Closed').id + result['change_new']["status"] = obj.project.us_statuses.get(name='Open').id + elif event['event'] == "closed": + if isinstance(obj, Issue): + result['change_old']["status"] = obj.project.issue_statuses.get(name='Open').id + result['change_new']["status"] = obj.project.issue_statuses.get(name='Closed').id + elif isinstance(obj, UserStory): + result['change_old']["status"] = obj.project.us_statuses.get(name='Open').id + result['change_new']["status"] = obj.project.us_statuses.get(name='Closed').id + elif event['event'] == "assigned": + AssignedEventHandler(result, cumulative_data, users_bindings).handle(event) + elif event['event'] == "unassigned": + UnassignedEventHandler(result, cumulative_data, users_bindings).handle(event) + elif event['event'] == "demilestoned": + if isinstance(obj, UserStory): + try: + result['change_old']["milestone"] = obj.project.milestones.get(name=event['milestone']['title']).id + except Milestone.DoesNotExist: + result['change_old']["milestone"] = 0 + result['update_values'] = {"milestone": {"0": event['milestone']['title']}} + result['change_new']["milestone"] = None + cumulative_data['milestone'] = None + elif event['event'] == "milestoned": + if isinstance(obj, UserStory): + result['update_values']["milestone"] = {} + if cumulative_data['milestone'] is not None: + result['update_values']['milestone'][str(cumulative_data['milestone'])] = cumulative_data['milestone_name'] + result['change_old']["milestone"] = cumulative_data['milestone'] + try: + taiga_milestone = obj.project.milestones.get(name=event['milestone']['title']) + cumulative_data["milestone"] = taiga_milestone.id + cumulative_data['milestone_name'] = taiga_milestone.name + except Milestone.DoesNotExist: + if cumulative_data['milestone'] == 0: + cumulative_data['milestone'] = -1 + else: + cumulative_data['milestone'] = 0 + cumulative_data['milestone_name'] = event['milestone']['title'] + result['change_new']["milestone"] = cumulative_data['milestone'] + result['update_values']['milestone'][str(cumulative_data['milestone'])] = cumulative_data['milestone_name'] + elif event['event'] == "labeled": + result['change_old']["tags"] = list(cumulative_data['tags']) + cumulative_data['tags'].add(event['label']['name'].lower()) + result['change_new']["tags"] = list(cumulative_data['tags']) + elif event['event'] == "unlabeled": + result['change_old']["tags"] = list(cumulative_data['tags']) + if event['label']['name'].lower() in cumulative_data['tags']: + cumulative_data['tags'].remove(event['label']['name'].lower()) + result['change_new']["tags"] = list(cumulative_data['tags']) + + return result + + @classmethod + def get_auth_url(cls, client_id, callback_uri=None): + if callback_uri is None: + return "https://github.com/login/oauth/authorize?client_id={}&scope=user,repo".format(client_id) + return "https://github.com/login/oauth/authorize?client_id={}&scope=user,repo&redirect_uri={}".format(client_id, callback_uri) + + @classmethod + def get_access_token(cls, client_id, client_secret, code): + try: + result = requests.post("https://github.com/login/oauth/access_token", { + "client_id": client_id, + "client_secret": client_secret, + "code": code, + }) + except Exception: + raise FailedRequest() + + if result.status_code > 299: + raise InvalidAuthResult() + else: + return dict(parse_qsl(result.content))[b'access_token'].decode('utf-8') + + +class AssignedEventHandler: + def __init__(self, result, cumulative_data, users_bindings): + self.result = result + self.cumulative_data = cumulative_data + self.users_bindings = users_bindings + + def handle(self, event): + if self.cumulative_data['assigned_to_github_id'] is None: + self.result['update_values']["users"] = {} + self.generate_change_old(event) + self.generate_update_values_from_cumulative_data(event) + user = self.users_bindings.get(event['assignee']['id'], None) + self.generate_change_new(event, user) + self.update_cumulative_data(event, user) + self.generate_update_values_from_cumulative_data(event) + + def generate_change_old(self, event): + self.result['change_old']["assigned_to"] = self.cumulative_data['assigned_to'] + + def generate_update_values_from_cumulative_data(self, event): + if self.cumulative_data['assigned_to_name'] is not None: + self.result['update_values']["users"][str(self.cumulative_data['assigned_to'])] = self.cumulative_data['assigned_to_name'] + + def generate_change_new(self, event, user): + if user is None: + self.result['change_new']["assigned_to"] = 0 + else: + self.result['change_new']["assigned_to"] = user.id + + def update_cumulative_data(self, event, user): + self.cumulative_data['assigned_to_github_id'] = event['assignee']['id'] + if user is None: + self.cumulative_data['assigned_to'] = 0 + self.cumulative_data['assigned_to_name'] = event['assignee']['login'] + else: + self.cumulative_data['assigned_to'] = user.id + self.cumulative_data['assigned_to_name'] = user.get_full_name() + + +class UnassignedEventHandler: + def __init__(self, result, cumulative_data, users_bindings): + self.result = result + self.cumulative_data = cumulative_data + self.users_bindings = users_bindings + + def handle(self, event): + if self.cumulative_data['assigned_to_github_id'] == event['assignee']['id']: + self.result['update_values']["users"] = {} + + self.generate_change_old(event) + self.generate_update_values_from_cumulative_data(event) + self.generate_change_new(event) + self.update_cumulative_data(event) + self.generate_update_values_from_cumulative_data(event) + + def generate_change_old(self, event): + self.result['change_old']["assigned_to"] = self.cumulative_data['assigned_to'] + + def generate_update_values_from_cumulative_data(self, event): + if self.cumulative_data['assigned_to_name'] is not None: + self.result['update_values']["users"][str(self.cumulative_data['assigned_to'])] = self.cumulative_data['assigned_to_name'] + + def generate_change_new(self, event): + self.result['change_new']["assigned_to"] = None + + def update_cumulative_data(self, event): + self.cumulative_data['assigned_to_github_id'] = None + self.cumulative_data['assigned_to'] = None + self.cumulative_data['assigned_to_name'] = None diff --git a/taiga/importers/github/tasks.py b/taiga/importers/github/tasks.py new file mode 100644 index 00000000..f1069e9e --- /dev/null +++ b/taiga/importers/github/tasks.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import logging +import sys + +from django.utils.translation import ugettext as _ + +from taiga.base.mails import mail_builder +from taiga.celery import app +from taiga.users.models import User +from .importer import GithubImporter + +logger = logging.getLogger('taiga.importers.github') + + +@app.task(bind=True) +def import_project(self, user_id, token, project_id, options): + user = User.object.get(id=user_id) + importer = GithubImporter(user, token) + try: + project = importer.import_project(project_id, options) + except Exception as e: + # Error + ctx = { + "user": user, + "error_subject": _("Error importing github project"), + "error_message": _("Error importing github project"), + "project": project_id, + "exception": e + } + email = mail_builder.github_import_error(admin, ctx) + email.send() + logger.error('Error importing github project %s (by %s)', project_id, user, exc_info=sys.exc_info()) + else: + ctx = { + "project": project, + "user": user, + } + email = mail_builder.github_import_success(user, ctx) + email.send() diff --git a/taiga/importers/management/commands/import_from_github.py b/taiga/importers/management/commands/import_from_github.py new file mode 100644 index 00000000..9c93a527 --- /dev/null +++ b/taiga/importers/management/commands/import_from_github.py @@ -0,0 +1,100 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.core.management.base import BaseCommand +from django.conf import settings +from django.db.models import Q + +from taiga.importers.github.importer import GithubImporter +from taiga.users.models import User, AuthData +from taiga.projects.services import projects as service + +import unittest.mock +import timeit + + +class Command(BaseCommand): + def add_arguments(self, parser): + parser.add_argument('--token', dest="token", type=str, + help='Auth token') + parser.add_argument('--project-id', dest="project_id", type=str, + help='Project ID or full name (ex: taigaio/taiga-back)') + parser.add_argument('--template', dest='template', default="kanban", + help='template to use: scrum or kanban (default kanban)') + parser.add_argument('--type', dest='type', default="user_stories", + help='type of object to use: user_stories or issues (default user_stories)') + parser.add_argument('--ask-for-users', dest='ask_for_users', const=True, + action="store_const", default=False, + help='Import closed data') + parser.add_argument('--keep-external-reference', dest='keep_external_reference', const=True, + action="store_const", default=False, + help='Store external reference of imported data') + + def handle(self, *args, **options): + admin = User.objects.get(username="admin") + + if options.get('token', None): + token = options.get('token') + else: + url = GithubImporter.get_auth_url(settings.GITHUB_API_CLIENT_ID) + print("Go to here and come with your code (in the redirected url): {}".format(url)) + code = input("Code: ") + access_data = GithubImporter.get_access_token(settings.GITHUB_API_CLIENT_ID, settings.GITHUB_API_CLIENT_SECRET, code) + token = access_data + + importer = GithubImporter(admin, token) + + if options.get('project_id', None): + project_id = options.get('project_id') + else: + print("Select the project to import:") + for project in importer.list_projects(): + print("- {}: {}".format(project['id'], project['name'])) + project_id = input("Project id: ") + + users_bindings = {} + if options.get('ask_for_users', None): + print("Add the username or email for next github users:") + + for user in importer.list_users(project_id): + while True: + if user['detected_user'] is not None: + print("User automatically detected: {} as {}".format(user['full_name'], user['detected_user'])) + users_bindings[user['id']] = user['detected_user'] + break + + if not options.get('ask_for_users', False): + break + + username_or_email = input("{}: ".format(user['full_name'] or user['username'])) + if username_or_email == "": + break + try: + users_bindings[user['id']] = User.objects.get(Q(username=username_or_email) | Q(email=username_or_email)) + break + except User.DoesNotExist: + print("ERROR: Invalid username or email") + + options = { + "template": options.get('template'), + "type": options.get('type'), + "users_bindings": users_bindings, + "keep_external_reference": options.get('keep_external_reference') + } + + importer.import_project(project_id, options) diff --git a/taiga/routers.py b/taiga/routers.py index 1546ef8b..961b7d19 100644 --- a/taiga/routers.py +++ b/taiga/routers.py @@ -286,9 +286,11 @@ router.register(r"application-tokens", ApplicationToken, base_name="application- # Third party importers from taiga.importers.trello.api import TrelloImporterViewSet from taiga.importers.jira.api import JiraImporterViewSet +from taiga.importers.github.api import GithubImporterViewSet router.register(r"importers/trello", TrelloImporterViewSet, base_name="importers-trello") router.register(r"importers/jira", JiraImporterViewSet, base_name="importers-jira") +router.register(r"importers/github", GithubImporterViewSet, base_name="importers-github") # Stats diff --git a/tests/integration/test_importers_github_api.py b/tests/integration/test_importers_github_api.py new file mode 100644 index 00000000..bda1c928 --- /dev/null +++ b/tests/integration/test_importers_github_api.py @@ -0,0 +1,228 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import pytest +import json + +from unittest import mock + +from django.core.urlresolvers import reverse + +from .. import factories as f +from taiga.importers import exceptions +from taiga.base.utils import json +from taiga.base import exceptions as exc + + +pytestmark = pytest.mark.django_db + + +def test_auth_url(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-github-auth-url")+"?uri=http://localhost:9001/project/new?from=github" + + response = client.get(url, content_type="application/json") + + assert response.status_code == 200 + assert 'url' in response.data + assert response.data['url'] == "https://github.com/login/oauth/authorize?client_id=&scope=user,repo&redirect_uri=http://localhost:9001/project/new?from=github" + +def test_authorize(client, settings): + user = f.UserFactory.create() + client.login(user) + + authorize_url = reverse("importers-github-authorize") + + with mock.patch('taiga.importers.github.api.GithubImporter') as GithubImporterMock: + GithubImporterMock.get_access_token.return_value = "token" + response = client.post(authorize_url, content_type="application/json", data=json.dumps({"code": "code"})) + assert GithubImporterMock.get_access_token.calledWith(settings.GITHUB_API_CLIENT_ID, settings.GITHUB_API_CLIENT_SECRET, "code") + + assert response.status_code == 200 + assert 'token' in response.data + assert response.data['token'] == "token" + +def test_authorize_without_code(client): + user = f.UserFactory.create() + client.login(user) + + authorize_url = reverse("importers-github-authorize") + + response = client.post(authorize_url, content_type="application/json", data=json.dumps({})) + + assert response.status_code == 400 + assert 'token' not in response.data + assert '_error_message' in response.data + assert response.data['_error_message'] == "Code param needed" + + +def test_authorize_with_bad_verify(client, settings): + user = f.UserFactory.create() + client.login(user) + + authorize_url = reverse("importers-github-authorize") + + with mock.patch('taiga.importers.github.api.GithubImporter') as GithubImporterMock: + GithubImporterMock.get_access_token.side_effect = exceptions.InvalidAuthResult() + response = client.post(authorize_url, content_type="application/json", data=json.dumps({"code": "bad"})) + assert GithubImporterMock.get_access_token.calledWith(settings.GITHUB_API_CLIENT_ID, settings.GITHUB_API_CLIENT_SECRET, "bad") + + assert response.status_code == 400 + assert 'token' not in response.data + assert '_error_message' in response.data + assert response.data['_error_message'] == "Invalid auth data" + + +def test_import_github_list_users(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-github-list-users") + + with mock.patch('taiga.importers.github.api.GithubImporter') as GithubImporterMock: + instance = mock.Mock() + instance.list_users.return_value = [ + {"id": 1, "username": "user1", "full_name": "user1", "detected_user": None}, + {"id": 2, "username": "user2", "full_name": "user2", "detected_user": None} + ] + GithubImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 200 + assert response.data[0]["id"] == 1 + assert response.data[1]["id"] == 2 + + +def test_import_github_list_users_without_project(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-github-list-users") + + with mock.patch('taiga.importers.github.api.GithubImporter') as GithubImporterMock: + instance = mock.Mock() + instance.list_users.return_value = [ + {"id": 1, "username": "user1", "full_name": "user1", "detected_user": None}, + {"id": 2, "username": "user2", "full_name": "user2", "detected_user": None} + ] + GithubImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 400 + + +def test_import_github_list_users_with_problem_on_request(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-github-list-users") + + with mock.patch('taiga.importers.github.importer.GithubClient') as GithubClientMock: + instance = mock.Mock() + instance.get.side_effect = exc.WrongArguments("Invalid Request") + GithubClientMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 400 + + +def test_import_github_list_projects(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-github-list-projects") + + with mock.patch('taiga.importers.github.api.GithubImporter') as GithubImporterMock: + instance = mock.Mock() + instance.list_projects.return_value = ["project1", "project2"] + GithubImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 200 + assert response.data[0] == "project1" + assert response.data[1] == "project2" + + +def test_import_github_list_projects_with_problem_on_request(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-github-list-projects") + + with mock.patch('taiga.importers.github.importer.GithubClient') as GithubClientMock: + instance = mock.Mock() + instance.get.side_effect = exc.WrongArguments("Invalid Request") + GithubClientMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 400 + + +def test_import_github_project_without_project_id(client, settings): + settings.CELERY_ENABLED = True + + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-github-import-project") + + with mock.patch('taiga.importers.github.tasks.GithubImporter') as GithubImporterMock: + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 400 + + +def test_import_github_project_with_celery_enabled(client, settings): + settings.CELERY_ENABLED = True + + user = f.UserFactory.create() + project = f.ProjectFactory.create(slug="async-imported-project") + client.login(user) + + url = reverse("importers-github-import-project") + + with mock.patch('taiga.importers.github.tasks.GithubImporter') as GithubImporterMock: + instance = mock.Mock() + instance.import_project.return_value = project + GithubImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 202 + assert "task_id" in response.data + + +def test_import_github_project_with_celery_disabled(client, settings): + settings.CELERY_ENABLED = False + + user = f.UserFactory.create() + project = f.ProjectFactory.create(slug="imported-project") + client.login(user) + + url = reverse("importers-github-import-project") + + with mock.patch('taiga.importers.github.api.GithubImporter') as GithubImporterMock: + instance = mock.Mock() + instance.import_project.return_value = project + GithubImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 200 + assert "slug" in response.data + assert response.data['slug'] == "imported-project" From 477d9647700d0a65d95f8639f6d037e680ffa181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 18 Jan 2017 09:40:37 +0100 Subject: [PATCH 105/144] Add asana importer --- requirements.txt | 1 + settings/common.py | 4 + taiga/importers/asana/api.py | 135 +++++++ taiga/importers/asana/importer.py | 351 ++++++++++++++++++ taiga/importers/asana/tasks.py | 56 +++ taiga/importers/exceptions.py | 3 + .../management/commands/import_from_asana.py | 101 +++++ taiga/routers.py | 2 + tests/integration/test_importers_asana_api.py | 236 ++++++++++++ 9 files changed, 889 insertions(+) create mode 100644 taiga/importers/asana/api.py create mode 100644 taiga/importers/asana/importer.py create mode 100644 taiga/importers/asana/tasks.py create mode 100644 taiga/importers/management/commands/import_from_asana.py create mode 100644 tests/integration/test_importers_asana_api.py diff --git a/requirements.txt b/requirements.txt index 11efe393..8f633141 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,3 +39,4 @@ psd-tools==1.4 CairoSVG==2.0.1 cryptography==1.7.1 PyJWT==1.4.2 +asana==0.6.2 diff --git a/settings/common.py b/settings/common.py index 9ce0e415..a0156181 100644 --- a/settings/common.py +++ b/settings/common.py @@ -567,6 +567,10 @@ GITHUB_API_CLIENT_SECRET = "" TRELLO_API_KEY = "" TRELLO_SECRET_KEY = "" +ASANA_APP_CALLBACK_URL = "" +ASANA_APP_ID = "" +ASANA_APP_SECRET = "" + JIRA_CONSUMER_KEY = "" JIRA_CERT = "" JIRA_PUB_CERT = "" diff --git a/taiga/importers/asana/api.py b/taiga/importers/asana/api.py new file mode 100644 index 00000000..3982a958 --- /dev/null +++ b/taiga/importers/asana/api.py @@ -0,0 +1,135 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Taiga Agile LLC +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.utils.translation import ugettext as _ +from django.conf import settings + +from taiga.base.api import viewsets +from taiga.base import response +from taiga.base import exceptions as exc +from taiga.base.decorators import list_route +from taiga.users.models import AuthData, User +from taiga.users.services import get_user_photo_url +from taiga.users.gravatar import get_user_gravatar_id +from taiga.projects.serializers import ProjectSerializer + +from taiga.importers import permissions, exceptions +from .importer import AsanaImporter +from . import tasks + + +class AsanaImporterViewSet(viewsets.ViewSet): + permission_classes = (permissions.ImporterPermission,) + + @list_route(methods=["POST"]) + def list_users(self, request, *args, **kwargs): + self.check_permissions(request, "list_users", None) + + token = request.DATA.get('token', None) + project_id = request.DATA.get('project', None) + + if not project_id: + raise exc.WrongArguments(_("The project param is needed")) + + importer = AsanaImporter(request.user, token) + + try: + users = importer.list_users(project_id) + except exceptions.InvalidRequest: + raise exc.BadRequest(_('Invalid asana api request')) + except exceptions.FailedRequest: + raise exc.BadRequest(_('Failed to make the request to asana api')) + + for user in users: + if user['detected_user']: + user['user'] = { + 'id': user['detected_user'].id, + 'full_name': user['detected_user'].get_full_name(), + 'gravatar_id': get_user_gravatar_id(user['detected_user']), + 'photo': get_user_photo_url(user['detected_user']), + } + del(user['detected_user']) + return response.Ok(users) + + @list_route(methods=["POST"]) + def list_projects(self, request, *args, **kwargs): + self.check_permissions(request, "list_projects", None) + token = request.DATA.get('token', None) + importer = AsanaImporter(request.user, token) + try: + projects = importer.list_projects() + except exceptions.InvalidRequest: + raise exc.BadRequest(_('Invalid asana api request')) + except exceptions.FailedRequest: + raise exc.BadRequest(_('Failed to make the request to asana api')) + return response.Ok(projects) + + @list_route(methods=["POST"]) + def import_project(self, request, *args, **kwargs): + self.check_permissions(request, "import_project", None) + + token = request.DATA.get('token', None) + project_id = request.DATA.get('project', None) + if not project_id: + raise exc.WrongArguments(_("The project param is needed")) + + options = { + "name": request.DATA.get('name', None), + "description": request.DATA.get('description', None), + "template": request.DATA.get('template', "scrum"), + "users_bindings": request.DATA.get("users_bindings", {}), + "keep_external_reference": request.DATA.get("keep_external_reference", False), + "is_private": request.DATA.get("is_private", False), + } + + if settings.CELERY_ENABLED: + task = tasks.import_project.delay(request.user.id, token, project_id, options) + return response.Accepted({"task_id": task.id}) + + importer = AsanaImporter(request.user, token) + project = importer.import_project(project_id, options) + project_data = { + "slug": project.slug, + "my_permissions": ["view_us"], + "is_backlog_activated": project.is_backlog_activated, + "is_kanban_activated": project.is_kanban_activated, + } + + return response.Ok(project_data) + + @list_route(methods=["GET"]) + def auth_url(self, request, *args, **kwargs): + self.check_permissions(request, "auth_url", None) + + url = AsanaImporter.get_auth_url(settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) + + return response.Ok({"url": url}) + + @list_route(methods=["POST"]) + def authorize(self, request, *args, **kwargs): + self.check_permissions(request, "authorize", None) + + code = request.DATA.get('code', None) + if code is None: + raise exc.BadRequest(_("Code param needed")) + + try: + asana_token = AsanaImporter.get_access_token(code, settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) + except exceptions.InvalidRequest: + raise exc.BadRequest(_('Invalid asana api request')) + except exceptions.FailedRequest: + raise exc.BadRequest(_('Failed to make the request to asana api')) + + return response.Ok({"token": asana_token}) diff --git a/taiga/importers/asana/importer.py b/taiga/importers/asana/importer.py new file mode 100644 index 00000000..6c3c675a --- /dev/null +++ b/taiga/importers/asana/importer.py @@ -0,0 +1,351 @@ +import requests +import asana +import json +from django.core.files.base import ContentFile +from django.contrib.contenttypes.models import ContentType + +from taiga.projects.models import Project, ProjectTemplate, Membership +from taiga.projects.userstories.models import UserStory +from taiga.projects.tasks.models import Task +from taiga.projects.attachments.models import Attachment +from taiga.projects.history.services import take_snapshot +from taiga.projects.history.models import HistoryEntry +from taiga.projects.custom_attributes.models import UserStoryCustomAttribute, TaskCustomAttribute +from taiga.users.models import User +from taiga.timeline.rebuilder import rebuild_timeline +from taiga.timeline.models import Timeline +from taiga.importers import exceptions + + +class AsanaClient(asana.Client): + def request(self, method, path, **options): + try: + return super().request(method, path, **options) + except asana.error.AsanaError: + raise exceptions.InvalidRequest() + except Exception as e: + raise exceptions.FailedRequest() + + +class AsanaImporter: + def __init__(self, user, token, import_closed_data=False): + self._import_closed_data = import_closed_data + self._user = user + self._client = AsanaClient.oauth(token=token) + + def list_projects(self): + projects = [] + for ws in self._client.workspaces.find_all(): + for project in self._client.projects.find_all(workspace=ws['id']): + project = self._client.projects.find_by_id(project['id']) + projects.append({ + "id": project['id'], + "name": "{}/{}".format(ws['name'], project['name']), + "description": project['notes'], + "is_private": True, + }) + return projects + + def list_users(self, project_id): + users = [] + for ws in self._client.workspaces.find_all(): + for user in self._client.users.find_by_workspace(ws['id'], fields=["id", "name", "email"]): + users.append({ + "id": user["id"], + "full_name": user['name'], + "detected_user": self._get_user(user) + }) + return users + + def _get_user(self, user, default=None): + if not user: + return default + + try: + return User.objects.get(email=user['email']) + except User.DoesNotExist: + pass + + return default + + def import_project(self, project_id, options): + project = self._client.projects.find_by_id(project_id) + taiga_project = self._import_project_data(project, options) + self._import_user_stories_data(taiga_project, project, options) + Timeline.objects.filter(project=taiga_project).delete() + rebuild_timeline(None, None, taiga_project.id) + return taiga_project + + def _import_project_data(self, project, options): + users_bindings = options.get('users_bindings', {}) + project_template = ProjectTemplate.objects.get(slug=options.get('template', 'scrum')) + + project_template.us_statuses = [] + project_template.us_statuses.append({ + "name": "Open", + "slug": "open", + "is_closed": False, + "is_archived": False, + "color": "#ff8a84", + "wip_limit": None, + "order": 1, + }) + project_template.us_statuses.append({ + "name": "Closed", + "slug": "closed", + "is_closed": True, + "is_archived": False, + "color": "#669900", + "wip_limit": None, + "order": 2, + }) + project_template.default_options["us_status"] = "Open" + + project_template.task_statuses = [] + project_template.task_statuses.append({ + "name": "Open", + "slug": "open", + "is_closed": False, + "color": "#ff8a84", + "order": 1, + }) + project_template.task_statuses.append({ + "name": "Closed", + "slug": "closed", + "is_closed": True, + "color": "#669900", + "order": 2, + }) + project_template.default_options["task_status"] = "Open" + + project_template.roles.append({ + "name": "Asana", + "slug": "asana", + "computable": False, + "permissions": project_template.roles[0]['permissions'], + "order": 70, + }) + + tags_colors = [] + for tag in self._client.tags.find_by_workspace(project['workspace']['id'], fields=["name", "color"]): + name = tag['name'].lower() + color = tag['color'] + tags_colors.append([name, color]) + + taiga_project = Project.objects.create( + name=options.get('name', None) or project['name'], + description=options.get('description', None) or project['notes'], + owner=self._user, + tags_colors=tags_colors, + creation_template=project_template, + is_private=options.get('is_private', False) + ) + + for user in self._client.users.find_by_workspace(project['workspace']['id']): + taiga_user = users_bindings.get(user['id'], None) + if taiga_user is None or taiga_user == self._user: + continue + + Membership.objects.create( + user=taiga_user, + project=taiga_project, + role=taiga_project.get_roles().get(slug="asana"), + is_admin=False, + invited_by=self._user, + ) + + UserStoryCustomAttribute.objects.create( + name="Due date", + description="Due date", + type="date", + order=1, + project=taiga_project + ) + + TaskCustomAttribute.objects.create( + name="Due date", + description="Due date", + type="date", + order=1, + project=taiga_project + ) + + return taiga_project + + def _import_user_stories_data(self, taiga_project, project, options): + users_bindings = options.get('users_bindings', {}) + tasks = self._client.tasks.find_by_project( + project['id'], + fields=["parent", "tags", "name", "notes", "tags.name", + "completed", "followers", "modified_at", "created_at", + "project", "due_on"] + ) + due_date_field = taiga_project.userstorycustomattributes.first() + + for task in tasks: + if task['parent']: + continue + + tags = [] + for tag in task['tags']: + tags.append(tag['name'].lower()) + + assigned_to = users_bindings.get(task.get('assignee', {}).get('id', None)) or None + + external_reference = None + if options.get('keep_external_reference', False): + external_url = "https://app.asana.com/0/{}/{}".format( + project['id'], + task['id'], + ) + external_reference = ["asana", external_url] + + us = UserStory.objects.create( + project=taiga_project, + owner=self._user, + assigned_to=assigned_to, + status=taiga_project.us_statuses.get(slug="closed" if task['completed'] else "open"), + kanban_order=task['id'], + sprint_order=task['id'], + backlog_order=task['id'], + subject=task['name'], + description=task.get('notes', ""), + tags=tags, + external_reference=external_reference + ) + + if task['due_on']: + us.custom_attributes_values.attributes_values = {due_date_field.id: task['due_on']} + us.custom_attributes_values.save() + + for follower in task['followers']: + follower_user = users_bindings.get(follower['id'], None) + if follower_user is not None: + us.add_watcher(follower_user) + + UserStory.objects.filter(id=us.id).update( + modified_date=task['modified_at'], + created_date=task['created_at'] + ) + + subtasks = self._client.tasks.subtasks( + task['id'], + fields=["parent", "tags", "name", "notes", "tags.name", + "completed", "followers", "modified_at", "created_at", + "due_on"] + ) + for subtask in subtasks: + self._import_task_data(taiga_project, us, project, subtask, options) + + take_snapshot(us, comment="", user=None, delete=False) + self._import_history(us, task, options) + self._import_attachments(us, task, options) + + def _import_task_data(self, taiga_project, us, assana_project, task, options): + users_bindings = options.get('users_bindings', {}) + tags = [] + for tag in task['tags']: + tags.append(tag['name'].lower()) + due_date_field = taiga_project.taskcustomattributes.first() + + assigned_to = users_bindings.get(task.get('assignee', {}).get('id', None)) or None + + external_reference = None + if options.get('keep_external_reference', False): + external_url = "https://app.asana.com/0/{}/{}".format( + assana_project['id'], + task['id'], + ) + external_reference = ["asana", external_url] + + taiga_task = Task.objects.create( + project=taiga_project, + user_story=us, + owner=self._user, + assigned_to=assigned_to, + status=taiga_project.task_statuses.get(slug="closed" if task['completed'] else "open"), + us_order=task['id'], + taskboard_order=task['id'], + subject=task['name'], + description=task.get('notes', ""), + tags=tags, + external_reference=external_reference + ) + + if task['due_on']: + taiga_task.custom_attributes_values.attributes_values = {due_date_field.id: task['due_on']} + taiga_task.custom_attributes_values.save() + + for follower in task['followers']: + follower_user = users_bindings.get(follower['id'], None) + if follower_user is not None: + taiga_task.add_watcher(follower_user) + + Task.objects.filter(id=taiga_task.id).update( + modified_date=task['modified_at'], + created_date=task['created_at'] + ) + + subtasks = self._client.tasks.subtasks( + task['id'], + fields=["parent", "tags", "name", "notes", "tags.name", + "completed", "followers", "modified_at", "created_at", + "due_on"] + ) + for subtask in subtasks: + self._import_task_data(taiga_project, us, assana_project, subtask, options) + + take_snapshot(taiga_task, comment="", user=None, delete=False) + self._import_history(taiga_task, task, options) + self._import_attachments(taiga_task, task, options) + + def _import_history(self, obj, task, options): + users_bindings = options.get('users_bindings', {}) + stories = self._client.stories.find_by_task(task['id']) + for story in stories: + if story['type'] == "comment": + snapshot = take_snapshot( + obj, + comment=story['text'], + user=users_bindings.get(story['created_by']['id'], User(full_name=story['created_by']['name'])), + delete=False + ) + HistoryEntry.objects.filter(id=snapshot.id).update(created_at=story['created_at']) + + def _import_attachments(self, obj, task, options): + attachments = self._client.attachments.find_by_task( + task['id'], + fields=['name', 'download_url', 'created_at'] + ) + for attachment in attachments: + data = requests.get(attachment['download_url']) + att = Attachment( + owner=self._user, + project=obj.project, + content_type=ContentType.objects.get_for_model(obj), + object_id=obj.id, + name=attachment['name'], + size=len(data.content), + created_date=attachment['created_at'], + is_deprecated=False, + ) + att.attached_file.save(attachment['name'], ContentFile(data.content), save=True) + + @classmethod + def get_auth_url(cls, client_id, client_secret, callback_url=None): + client = AsanaClient.oauth( + client_id=client_id, + client_secret=client_secret, + redirect_uri=callback_url + ) + (url, state) = client.session.authorization_url() + return url + + @classmethod + def get_access_token(cls, code, client_id, client_secret, callback_url=None): + client = AsanaClient.oauth( + client_id=client_id, + client_secret=client_secret, + redirect_uri=callback_url + ) + return client.session.fetch_token(code=code) diff --git a/taiga/importers/asana/tasks.py b/taiga/importers/asana/tasks.py new file mode 100644 index 00000000..5d36bed9 --- /dev/null +++ b/taiga/importers/asana/tasks.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import logging +import sys + +from django.utils.translation import ugettext as _ + +from taiga.base.mails import mail_builder +from taiga.users.models import User +from taiga.celery import app +from .importer import AsanaImporter + +logger = logging.getLogger('taiga.importers.asana') + + +@app.task(bind=True) +def import_project(self, user_id, token, project_id, options): + user = User.object.get(id=user_id) + importer = AsanaImporter(user, token) + try: + project = importer.import_project(project_id, options) + except Exception as e: + # Error + ctx = { + "user": user, + "error_subject": _("Error importing asana project"), + "error_message": _("Error importing asana project"), + "project": project_id, + "exception": e + } + email = mail_builder.asana_import_error(admin, ctx) + email.send() + logger.error('Error importing asana project %s (by %s)', project_id, user, exc_info=sys.exc_info()) + else: + ctx = { + "project": project, + "user": user, + } + email = mail_builder.asana_import_success(user, ctx) + email.send() diff --git a/taiga/importers/exceptions.py b/taiga/importers/exceptions.py index da430079..ebb8de86 100644 --- a/taiga/importers/exceptions.py +++ b/taiga/importers/exceptions.py @@ -1,3 +1,6 @@ +class InvalidRequest(Exception): + pass + class InvalidAuthResult(Exception): pass diff --git a/taiga/importers/management/commands/import_from_asana.py b/taiga/importers/management/commands/import_from_asana.py new file mode 100644 index 00000000..d7d7dd21 --- /dev/null +++ b/taiga/importers/management/commands/import_from_asana.py @@ -0,0 +1,101 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.core.management.base import BaseCommand +from django.conf import settings +from django.db.models import Q + +from taiga.importers.asana.importer import AsanaImporter +from taiga.users.models import User, AuthData +from taiga.projects.services import projects as service + +import unittest.mock +import timeit +import json + + +class Command(BaseCommand): + def add_arguments(self, parser): + parser.add_argument('--token', dest="token", type=str, + help='Auth token') + parser.add_argument('--project-id', dest="project_id", type=str, + help='Project ID or full name (ex: taigaio/taiga-back)') + parser.add_argument('--template', dest='template', default="kanban", + help='template to use: scrum or kanban (default kanban)') + parser.add_argument('--type', dest='type', default="user_stories", + help='type of object to use: user_stories or issues (default user_stories)') + parser.add_argument('--ask-for-users', dest='ask_for_users', const=True, + action="store_const", default=False, + help='Import closed data') + parser.add_argument('--keep-external-reference', dest='keep_external_reference', const=True, + action="store_const", default=False, + help='Store external reference of imported data') + + def handle(self, *args, **options): + admin = User.objects.get(username="admin") + + if options.get('token', None): + token = json.loads(options.get('token')) + else: + url = AsanaImporter.get_auth_url(settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) + print("Go to here and come with your code (in the redirected url): {}".format(url)) + code = input("Code: ") + access_data = AsanaImporter.get_access_token(code, settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) + token = access_data + + importer = AsanaImporter(admin, token) + + if options.get('project_id', None): + project_id = options.get('project_id') + else: + print("Select the project to import:") + for project in importer.list_projects(): + print("- {}: {}".format(project['id'], project['name'])) + project_id = input("Project id: ") + + users_bindings = {} + if options.get('ask_for_users', None): + print("Add the username or email for next asana users:") + + for user in importer.list_users(project_id): + while True: + if user['detected_user'] is not None: + print("User automatically detected: {} as {}".format(user['full_name'], user['detected_user'])) + users_bindings[user['id']] = user['detected_user'] + break + + if not options.get('ask_for_users', False): + break + + username_or_email = input("{}: ".format(user['full_name'] or user['username'])) + if username_or_email == "": + break + try: + users_bindings[user['id']] = User.objects.get(Q(username=username_or_email) | Q(email=username_or_email)) + break + except User.DoesNotExist: + print("ERROR: Invalid username or email") + + options = { + "template": options.get('template'), + "type": options.get('type'), + "users_bindings": users_bindings, + "keep_external_reference": options.get('keep_external_reference') + } + + importer.import_project(project_id, options) diff --git a/taiga/routers.py b/taiga/routers.py index 961b7d19..382ede82 100644 --- a/taiga/routers.py +++ b/taiga/routers.py @@ -287,10 +287,12 @@ router.register(r"application-tokens", ApplicationToken, base_name="application- from taiga.importers.trello.api import TrelloImporterViewSet from taiga.importers.jira.api import JiraImporterViewSet from taiga.importers.github.api import GithubImporterViewSet +from taiga.importers.asana.api import AsanaImporterViewSet router.register(r"importers/trello", TrelloImporterViewSet, base_name="importers-trello") router.register(r"importers/jira", JiraImporterViewSet, base_name="importers-jira") router.register(r"importers/github", GithubImporterViewSet, base_name="importers-github") +router.register(r"importers/asana", AsanaImporterViewSet, base_name="importers-asana") # Stats diff --git a/tests/integration/test_importers_asana_api.py b/tests/integration/test_importers_asana_api.py new file mode 100644 index 00000000..bc158694 --- /dev/null +++ b/tests/integration/test_importers_asana_api.py @@ -0,0 +1,236 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import pytest +import json + +from unittest import mock + +from django.core.urlresolvers import reverse + +from .. import factories as f +from taiga.importers import exceptions +from taiga.base.utils import json +from taiga.base import exceptions as exc + + +pytestmark = pytest.mark.django_db + + +def test_auth_url(client, settings): + user = f.UserFactory.create() + client.login(user) + settings.ASANA_APP_CALLBACK_URL = "http://testserver/url" + settings.ASANA_APP_ID = "test-id" + settings.ASANA_APP_SECRET = "test-secret" + + url = reverse("importers-asana-auth-url") + + with mock.patch('taiga.importers.asana.api.AsanaImporter') as AsanaImporterMock: + AsanaImporterMock.get_auth_url.return_value = "https://auth_url" + response = client.get(url, content_type="application/json") + assert AsanaImporterMock.get_auth_url.calledWith(settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) + + assert response.status_code == 200 + assert 'url' in response.data + assert response.data['url'] == "https://auth_url" + + +def test_authorize(client, settings): + user = f.UserFactory.create() + client.login(user) + + authorize_url = reverse("importers-asana-authorize") + + with mock.patch('taiga.importers.asana.api.AsanaImporter') as AsanaImporterMock: + AsanaImporterMock.get_access_token.return_value = "token" + response = client.post(authorize_url, content_type="application/json", data=json.dumps({"code": "code"})) + assert AsanaImporterMock.get_access_token.calledWith(settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, "code") + + assert response.status_code == 200 + assert 'token' in response.data + assert response.data['token'] == "token" + + +def test_authorize_without_code(client): + user = f.UserFactory.create() + client.login(user) + + authorize_url = reverse("importers-asana-authorize") + + response = client.post(authorize_url, content_type="application/json", data=json.dumps({})) + + assert response.status_code == 400 + assert 'token' not in response.data + assert '_error_message' in response.data + assert response.data['_error_message'] == "Code param needed" + + +def test_authorize_with_bad_verify(client, settings): + user = f.UserFactory.create() + client.login(user) + + authorize_url = reverse("importers-asana-authorize") + + with mock.patch('taiga.importers.asana.api.AsanaImporter') as AsanaImporterMock: + AsanaImporterMock.get_access_token.side_effect = exceptions.InvalidRequest() + response = client.post(authorize_url, content_type="application/json", data=json.dumps({"code": "bad"})) + assert AsanaImporterMock.get_access_token.calledWith(settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, "bad") + + assert response.status_code == 400 + assert 'token' not in response.data + assert '_error_message' in response.data + assert response.data['_error_message'] == "Invalid asana api request" + + +def test_import_asana_list_users(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-asana-list-users") + + with mock.patch('taiga.importers.asana.api.AsanaImporter') as AsanaImporterMock: + instance = mock.Mock() + instance.list_users.return_value = [ + {"id": 1, "username": "user1", "full_name": "user1", "detected_user": None}, + {"id": 2, "username": "user2", "full_name": "user2", "detected_user": None} + ] + AsanaImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 200 + assert response.data[0]["id"] == 1 + assert response.data[1]["id"] == 2 + + +def test_import_asana_list_users_without_project(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-asana-list-users") + + with mock.patch('taiga.importers.asana.api.AsanaImporter') as AsanaImporterMock: + instance = mock.Mock() + instance.list_users.return_value = [ + {"id": 1, "username": "user1", "full_name": "user1", "detected_user": None}, + {"id": 2, "username": "user2", "full_name": "user2", "detected_user": None} + ] + AsanaImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 400 + + +def test_import_asana_list_users_with_problem_on_request(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-asana-list-users") + + with mock.patch('taiga.importers.asana.importer.AsanaClient') as AsanaClientMock: + instance = mock.Mock() + instance.workspaces.find_all.side_effect = exceptions.InvalidRequest() + AsanaClientMock.oauth.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 400 + + +def test_import_asana_list_projects(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-asana-list-projects") + + with mock.patch('taiga.importers.asana.api.AsanaImporter') as AsanaImporterMock: + instance = mock.Mock() + instance.list_projects.return_value = ["project1", "project2"] + AsanaImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 200 + assert response.data[0] == "project1" + assert response.data[1] == "project2" + + +def test_import_asana_list_projects_with_problem_on_request(client): + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-asana-list-projects") + + with mock.patch('taiga.importers.asana.importer.AsanaClient') as AsanaClientMock: + instance = mock.Mock() + instance.workspaces.find_all.side_effect = exc.WrongArguments("Invalid Request") + AsanaClientMock.oauth.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 400 + + +def test_import_asana_project_without_project_id(client, settings): + settings.CELERY_ENABLED = True + + user = f.UserFactory.create() + client.login(user) + + url = reverse("importers-asana-import-project") + + with mock.patch('taiga.importers.asana.tasks.AsanaImporter') as AsanaImporterMock: + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) + + assert response.status_code == 400 + + +def test_import_asana_project_with_celery_enabled(client, settings): + settings.CELERY_ENABLED = True + + user = f.UserFactory.create() + project = f.ProjectFactory.create(slug="async-imported-project") + client.login(user) + + url = reverse("importers-asana-import-project") + + with mock.patch('taiga.importers.asana.tasks.AsanaImporter') as AsanaImporterMock: + instance = mock.Mock() + instance.import_project.return_value = project + AsanaImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 202 + assert "task_id" in response.data + + +def test_import_asana_project_with_celery_disabled(client, settings): + settings.CELERY_ENABLED = False + + user = f.UserFactory.create() + project = f.ProjectFactory.create(slug="imported-project") + client.login(user) + + url = reverse("importers-asana-import-project") + + with mock.patch('taiga.importers.asana.api.AsanaImporter') as AsanaImporterMock: + instance = mock.Mock() + instance.import_project.return_value = project + AsanaImporterMock.return_value = instance + response = client.post(url, content_type="application/json", data=json.dumps({"token": "token", "project": 1})) + + assert response.status_code == 200 + assert "slug" in response.data + assert response.data['slug'] == "imported-project" From 15c2868d24e6755224a3deeb7f0cd4ae66436240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 18 Jan 2017 09:42:34 +0100 Subject: [PATCH 106/144] Add pivotal importer prototype --- .../commands/import_from_pivotal.py | 93 +++ taiga/importers/pivotal/api.py | 143 ++++ taiga/importers/pivotal/importer.py | 702 ++++++++++++++++++ taiga/importers/pivotal/tasks.py | 56 ++ 4 files changed, 994 insertions(+) create mode 100644 taiga/importers/management/commands/import_from_pivotal.py create mode 100644 taiga/importers/pivotal/api.py create mode 100644 taiga/importers/pivotal/importer.py create mode 100644 taiga/importers/pivotal/tasks.py diff --git a/taiga/importers/management/commands/import_from_pivotal.py b/taiga/importers/management/commands/import_from_pivotal.py new file mode 100644 index 00000000..f3430c69 --- /dev/null +++ b/taiga/importers/management/commands/import_from_pivotal.py @@ -0,0 +1,93 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.core.management.base import BaseCommand +from django.db.models import Q + +from taiga.importers.pivotal import PivotalImporter +from taiga.users.models import User +from taiga.projects.services import projects as service + +import unittest.mock +import timeit + + +class Command(BaseCommand): + def add_arguments(self, parser): + parser.add_argument('--token', dest="token", type=str, + help='Auth token') + parser.add_argument('--project-id', dest="project_id", type=str, + help='Project ID or full name (ex: taigaio/taiga-back)') + parser.add_argument('--template', dest='template', default="scrum", + help='template to use: scrum or scrum (default scrum)') + parser.add_argument('--ask-for-users', dest='ask_for_users', const=True, + action="store_const", default=False, + help='Import closed data') + parser.add_argument('--closed-data', dest='closed_data', const=True, + action="store_const", default=False, + help='Import closed data') + parser.add_argument('--keep-external-reference', dest='keep_external_reference', const=True, + action="store_const", default=False, + help='Store external reference of imported data') + + def handle(self, *args, **options): + admin = User.objects.get(username="admin") + + if options.get('token', None): + token = options.get('token') + else: + print("You need a user token") + return + + importer = PivotalImporter(admin, token) + + if options.get('project_id', None): + project_id = options.get('project_id') + else: + print("Select the project to import:") + for project in importer.list_projects(): + print("- {}: {}".format(project['project_id'], project['project_name'])) + project_id = input("Project id: ") + + users_bindings = {} + if options.get('ask_for_users', None): + print("Add the username or email for next pivotal users:") + for user in importer.list_users(project_id): + try: + users_bindings[user['id']] = User.objects.get(Q(email=user['person'].get('email', "not-valid"))) + break + except User.DoesNotExist: + pass + + while True: + username_or_email = input("{}: ".format(user['person']['name'])) + if username_or_email == "": + break + try: + users_bindings[user['id']] = User.objects.get(Q(username=username_or_email) | Q(email=username_or_email)) + break + except User.DoesNotExist: + print("ERROR: Invalid username or email") + + options = { + "template": options.get('template'), + "import_closed_data": options.get("closed_data", False), + "users_bindings": users_bindings, + "keep_external_reference": options.get('keep_external_reference') + } + importer.import_project(project_id, options) diff --git a/taiga/importers/pivotal/api.py b/taiga/importers/pivotal/api.py new file mode 100644 index 00000000..1176f9aa --- /dev/null +++ b/taiga/importers/pivotal/api.py @@ -0,0 +1,143 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Taiga Agile LLC +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.utils.translation import ugettext as _ +from django.conf import settings + +from taiga.base.api import viewsets +from taiga.base import response +from taiga.base import exceptions as exc +from taiga.base.decorators import list_route +from taiga.users.models import AuthData, User +from taiga.users.services import get_user_photo_url +from taiga.users.gravatar import get_user_gravatar_id +from taiga.projects.serializers import ProjectSerializer + +from taiga.importers import permissions +from .importer import PivotalImporter +from . import tasks + + +class PivotalImporterViewSet(viewsets.ViewSet): + permission_classes = (permissions.ImporterPermission,) + + @list_route(methods=["POST"]) + def list_users(self, request, *args, **kwargs): + self.check_permissions(request, "list_users", None) + + token = request.DATA.get('token', None) + project_id = request.DATA.get('project', None) + + if not project_id: + raise exc.WrongArguments(_("The project param is needed")) + + importer = PivotalImporter(request.user, token) + users = importer.list_users(project_id) + for user in users: + user['user'] = None + if not user['email']: + continue + + try: + taiga_user = User.objects.get(email=user['email']) + except User.DoesNotExist: + continue + + user['user'] = { + 'id': taiga_user.id, + 'full_name': taiga_user.get_full_name(), + 'gravatar_id': get_user_gravatar_id(taiga_user), + 'photo': get_user_photo_url(taiga_user), + } + return response.Ok(users) + + @list_route(methods=["POST"]) + def list_projects(self, request, *args, **kwargs): + self.check_permissions(request, "list_projects", None) + token = request.DATA.get('token', None) + importer = PivotalImporter(request.user, token) + projects = importer.list_projects() + return response.Ok(projects) + + @list_route(methods=["POST"]) + def import_project(self, request, *args, **kwargs): + self.check_permissions(request, "import_project", None) + + token = request.DATA.get('token', None) + project_id = request.DATA.get('project', None) + if not project_id: + raise exc.WrongArguments(_("The project param is needed")) + + options = { + "template": request.DATA.get('template', "kanban"), + "users_bindings": request.DATA.get("users_bindings", {}), + "keep_external_reference": request.DATA.get("keep_external_reference", False), + "is_private": request.DATA.get("is_private", False), + } + + if settings.CELERY_ENABLED: + task = tasks.import_project.delay(request.user.id, token, project_id, options) + return response.Accepted({"pivotal_import_id": task.id}) + + importer = PivotalImporter(request.user, token) + project = importer.import_project(project_id, options) + project_data = { + "slug": project.slug, + "my_permissions": ["view_us"], + "is_backlog_activated": project.is_backlog_activated, + "is_kanban_activated": project.is_kanban_activated, + } + + return response.Ok(project_data) + + @list_route(methods=["GET"]) + def auth_url(self, request, *args, **kwargs): + self.check_permissions(request, "auth_url", None) + + (oauth_token, oauth_secret, url) = PivotalImporter.get_auth_url() + + (auth_data, created) = AuthData.objects.get_or_create( + user=request.user, + key="pivotal-oauth", + defaults={ + "value": "", + "extra": {}, + } + ) + auth_data.extra = { + "oauth_token": oauth_token, + "oauth_secret": oauth_secret, + } + auth_data.save() + + return response.Ok({"url": url}) + + @list_route(methods=["POST"]) + def authorize(self, request, *args, **kwargs): + self.check_permissions(request, "authorize", None) + + try: + oauth_data = request.user.auth_data.get(key="pivotal-oauth") + oauth_token = oauth_data.extra['oauth_token'] + oauth_secret = oauth_data.extra['oauth_secret'] + oauth_verifier = request.DATA.get('code') + oauth_data.delete() + pivotal_token = PivotalImporter.get_access_token(oauth_token, oauth_secret, oauth_verifier)['oauth_token'] + except Exception as e: + raise exc.WrongArguments(_("Invalid or expired auth token")) + + return response.Ok({ + "token": pivotal_token + }) diff --git a/taiga/importers/pivotal/importer.py b/taiga/importers/pivotal/importer.py new file mode 100644 index 00000000..6f1456ca --- /dev/null +++ b/taiga/importers/pivotal/importer.py @@ -0,0 +1,702 @@ +from django.core.files.base import ContentFile +from django.contrib.contenttypes.models import ContentType +import requests + +from taiga.users.models import User +from taiga.projects.references.models import recalc_reference_counter +from taiga.projects.models import Project, ProjectTemplate, Membership, Points +from taiga.projects.userstories.models import UserStory, RolePoints +from taiga.projects.tasks.models import Task +from taiga.projects.milestones.models import Milestone +from taiga.projects.epics.models import Epic, RelatedUserStory +from taiga.projects.attachments.models import Attachment +from taiga.projects.history.services import take_snapshot +from taiga.projects.history.services import (make_diff_from_dicts, + make_diff_values, + make_key_from_model_object, + get_typename_for_model_class, + FrozenDiff) +from taiga.projects.history.models import HistoryEntry +from taiga.projects.history.choices import HistoryType +from taiga.projects.custom_attributes.models import UserStoryCustomAttribute +from taiga.mdrender.service import render as mdrender +from taiga.timeline.rebuilder import rebuild_timeline +from taiga.timeline.models import Timeline + + +class PivotalClient: + def __init__(self, token): + self.api_url = "https://www.pivotaltracker.com/services/v5/{}" + self.token = token + self.me = self.get('/me') + + def get(self, uri_path, query_params=None): + headers = { + 'X-TrackerToken': self.token + } + if query_params is None: + query_params = {} + + if uri_path[0] == '/': + uri_path = uri_path[1:] + url = self.api_url.format(uri_path) + + response = requests.get(url, params=query_params, headers=headers) + + if response.status_code == 401: + raise Exception("Unauthorized: %s at %s" % (response.text, url), response) + if response.status_code != 200: + raise Exception("Resource Unavailable: %s at %s" % (response.text, url), response) + + return response.json() + + def get_attachment(self, attachment_id): + headers = { + 'X-TrackerToken': self.token + } + url = "https://www.pivotaltracker.com/file_attachments/{}/download".format(attachment_id) + response = requests.get(url, headers=headers) + return response.content + + +class PivotalImporter: + def __init__(self, user, token): + self._user = user + self._client = PivotalClient(token=token) + + def list_projects(self): + return self._client.me['projects'] + + def list_users(self, project_id): + return self._client.get("/projects/{}/memberships".format(project_id)) + + def import_project(self, project_id, options={"template": "scrum", "users_bindings": {}, "keep_external_reference": False}): + (project, project_data) = self._import_project_data(project_id, options) + self._import_epics_data(project_data, project, options) + self._import_user_stories_data(project_data, project, options) + Timeline.objects.filter(project=project).delete() + rebuild_timeline(None, None, project.id) + recalc_reference_counter(project) + + def _import_project_data(self, project_id, options): + project_data = self._client.get( + "/projects/{}".format(project_id), + { + "fields": ",".join([ + "point_scale", + "name", + "description", + "labels(name)", + ]) + } + ) + project_data['iterations'] = self._client.get( + "/projects/{}/iterations".format(project_id), + { + "fields": ",".join([ + "number", + "start", + "finish", + "stories", + ]) + } + ) + project_data['epics'] = self._client.get( + "/projects/{}/epics".format(project_data['id']), + { + "fields": ",".join([ + "name", + "label", + "description", + "comments(text,file_attachments,google_attachments,person,created_at)", + "follower_ids", + "created_at", + "updated_at", + "url", + ]) + } + ) + + project_template = ProjectTemplate.objects.get(slug=options['template']) + project_template.is_epics_activated = True + project_template.us_statuses = [] + project_template.points = [{ + "value": None, + "name": "?", + "order": 1, + }] + + counter = 2 + for points in project_data['point_scale'].split(","): + project_template.points.append({ + "value": int(points), + "name": points, + "order": counter + }) + counter += 1 + + project_template.us_statuses.append({ + "name": "Unscheduled", + "slug": "unscheduled", + "is_closed": True, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": 1, + }) + project_template.us_statuses.append({ + "name": "Unstarted", + "slug": "unstarted", + "is_closed": False, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": 2, + }) + project_template.us_statuses.append({ + "name": "Planned", + "slug": "planned", + "is_closed": False, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": 3, + }) + project_template.us_statuses.append({ + "name": "Started", + "slug": "started", + "is_closed": False, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": 4, + }) + project_template.us_statuses.append({ + "name": "Finished", + "slug": "finished", + "is_closed": False, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": 5, + }) + project_template.us_statuses.append({ + "name": "Delivered", + "slug": "delivered", + "is_closed": True, + "is_archived": False, + "color": "#999999", + "wip_limit": None, + "order": 6, + }) + project_template.us_statuses.append({ + "name": "Rejected", + "slug": "rejected", + "is_closed": True, + "is_archived": True, + "color": "#999999", + "wip_limit": None, + "order": 7, + }) + project_template.us_statuses.append({ + "name": "Accepted", + "slug": "accepted", + "is_closed": True, + "is_archived": True, + "color": "#999999", + "wip_limit": None, + "order": 8, + }) + project_template.default_options["us_status"] = "Unscheduled" + + project_template.task_statuses = [] + project_template.task_statuses.append({ + "name": "Incomplete", + "slug": "incomplete", + "is_closed": False, + "color": "#ff8a84", + "order": 1, + }) + project_template.task_statuses.append({ + "name": "Complete", + "slug": "complete", + "is_closed": True, + "color": "#669900", + "order": 2, + }) + project_template.default_options["task_status"] = "Incomplete" + + main_permissions = project_template.roles[0]['permissions'] + project_template.roles = [{ + "name": "Main", + "slug": "main", + "computable": True, + "permissions": main_permissions, + "order": 70, + }] + + tags_colors = [] + for label in project_data['labels']: + name = label['name'].lower() + tags_colors.append([name, None]) + + project = Project.objects.create( + name=project_data['name'], + description=project_data.get('description', ''), + owner=self._user, + tags_colors=tags_colors, + creation_template=project_template + ) + + UserStoryCustomAttribute.objects.create( + name="Due date", + description="Due date", + type="date", + order=1, + project=project + ) + UserStoryCustomAttribute.objects.create( + name="Type", + description="Story type", + type="text", + order=2, + project=project + ) + for user in options.get('users_bindings', {}).values(): + if user != self._user: + Membership.objects.get_or_create( + user=user, + project=project, + role=project.get_roles().get(slug="main"), + is_admin=False, + ) + + for iteration in project_data['iterations']: + milestone = Milestone.objects.create( + name="Sprint {}".format(iteration['number']), + slug="sprint-{}".format(iteration['number']), + owner=self._user, + project=project, + estimated_start=iteration['start'][:10], + estimated_finish=iteration['finish'][:10], + ) + Milestone.objects.filter(id=milestone.id).update( + created_date=iteration['start'], + modified_date=iteration['start'], + ) + return (project, project_data) + + def _import_user_stories_data(self, project_data, project, options): + users_bindings = options.get('users_bindings', {}) + epics = {e['label']['id']: e for e in project_data['epics']} + due_date_field = project.userstorycustomattributes.get(name="Due date") + story_type_field = project.userstorycustomattributes.get(name="Type") + story_milestone_binding = {} + for iteration in project_data['iterations']: + for story in iteration['stories']: + story_milestone_binding[story['id']] = Milestone.objects.get( + project=project, + slug="sprint-{}".format(iteration['number']) + ) + + counter = 0 + offset = 0 + while True: + stories = self._client.get("/projects/{}/stories".format(project_data['id']), { + "envelope": "true", + "limit": 300, + "offset": offset, + "fields": ",".join([ + "name", + "description", + "estimate", + "story_type", + "current_state", + "deadline", + "requested_by_id", + "owner_ids", + "labels(id,name)", + "comments(text,file_attachments,google_attachments,person,created_at)", + "tasks(id,description,position,complete,created_at,updated_at)", + "follower_ids", + "created_at", + "updated_at", + "url", + ])}) + offset += 300 + for story in stories['data']: + tags = [] + for label in story['labels']: + tags.append(label['name']) + + assigned_to = None + if len(story['owner_ids']) > 0: + assigned_to = users_bindings.get(story['owner_ids'][0], None) + + owner = users_bindings.get(story['requested_by_id'], self._user) + + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["pivotal", story['url']] + + us = UserStory.objects.create( + project=project, + owner=owner, + assigned_to=assigned_to, + status=project.us_statuses.get(slug=story['current_state']), + kanban_order=counter, + sprint_order=counter, + backlog_order=counter, + subject=story['name'], + description=story.get('description', ''), + tags=tags, + external_reference=external_reference, + milestone=story_milestone_binding.get(story['id'], None) + ) + + points = Points.objects.get(project=project, value=story.get('estimate', None)) + RolePoints.objects.filter(user_story=us, role__slug="main").update(points_id=points.id) + + if len(story['owner_ids']) > 1: + watchers = list(set(story['owner_ids'][1:] + story['follower_ids'])) + else: + watchers = story['follower_ids'] + + for watcher in watchers: + watcher_user = users_bindings.get(watcher, None) + if watcher_user: + us.add_watcher(watcher_user) + + if story.get('deadline', None): + us.custom_attributes_values.attributes_values = {due_date_field.id: story['deadline']} + us.custom_attributes_values.save() + if story.get('story_type', None): + us.custom_attributes_values.attributes_values = {story_type_field.id: story['story_type']} + us.custom_attributes_values.save() + + UserStory.objects.filter(id=us.id).update( + ref=story['id'], + modified_date=story['updated_at'], + created_date=story['created_at'] + ) + take_snapshot(us, comment="", user=None, delete=False) + + for label in story['labels']: + if epics.get(label['id'], None): + RelatedUserStory.objects.create( + epic=Epic.objects.get(project=project, ref=epics.get(label['id'])['id']), + user_story=us, + order=us.backlog_order + ) + self._import_tasks(project_data, us, story) + self._import_user_story_activity(project_data, us, story, options) + self._import_comments(project_data, us, story, options) + counter += 1 + + if len(stories['data']) < 300: + break + + def _import_epics_data(self, project_data, project, options): + users_bindings = options.get('users_bindings', {}) + counter = 0 + + for epic in project_data['epics']: + external_reference = None + if options.get('keep_external_reference', False): + external_reference = ["pivotal", epic['url']] + + taiga_epic = Epic.objects.create( + project=project, + owner=self._user, + status=project.epic_statuses.get(slug="new"), + epics_order=counter, + subject=epic['name'], + description=epic.get('description', ''), + tags=[], + external_reference=external_reference + ) + + Epic.objects.filter(id=taiga_epic.id).update( + ref=epic['id'], + modified_date=epic['updated_at'], + created_date=epic['created_at'] + ) + + for watcher in epic['follower_ids']: + watcher_user = users_bindings.get(watcher, None) + if watcher_user: + taiga_epic.add_watcher(watcher_user) + + take_snapshot(taiga_epic, comment="", user=None, delete=False) + self._import_comments(project_data, taiga_epic, epic, options) + self._import_epic_activity(project_data, taiga_epic, epic, options) + counter += 1 + + def _import_tasks(self, project_data, us, story): + for task in story['tasks']: + taiga_task = Task.objects.create( + subject=task['description'], + status=us.project.task_statuses.get(slug="complete" if task['complete'] else "incomplete"), + project=us.project, + us_order=task['position'], + taskboard_order=task['position'], + user_story=us + ) + + Task.objects.filter(id=taiga_task.id).update( + ref=task['id'], + modified_date=task['updated_at'], + created_date=task['created_at'] + ) + take_snapshot(taiga_task, comment="", user=None, delete=False) + + def _import_attachment(self, obj, attachment_id, attachment_name, created_at, person_id, options): + users_bindings = options.get('users_bindings', {}) + + data = self._client.get_attachment(attachment_id) + att = Attachment( + owner=users_bindings.get(person_id, self._user), + project=obj.project, + content_type=ContentType.objects.get_for_model(obj), + object_id=obj.id, + name=attachment_name, + size=len(data), + created_date=created_at, + is_deprecated=False, + ) + att.attached_file.save(attachment_name, ContentFile(data), save=True) + + def _import_comments(self, project_data, obj, story, options): + users_bindings = options.get('users_bindings', {}) + + for comment in story['comments']: + if 'text' in comment: + snapshot = take_snapshot( + obj, + comment=comment['text'], + user=users_bindings.get(comment['person']['id'], User(full_name=comment['person']['name'])), + delete=False + ) + HistoryEntry.objects.filter(id=snapshot.id).update(created_at=comment['created_at']) + for attachment in comment['file_attachments']: + self._import_attachment( + obj, + attachment['id'], + attachment['filename'], + comment['created_at'], + comment['person']['id'], + options + ) + + def _import_user_story_activity(self, project_data, us, story, options): + offset = 0 + while True: + activities = self._client.get( + "/projects/{}/stories/{}/activity".format( + project_data['id'], + story['id'], + ), + {"envelope": "true", "limit": 300, "offset": offset} + ) + offset += 300 + for activity in activities['data']: + self._import_activity(us, activity, options) + + if len(activities['data']) < 300: + break + + def _import_epic_activity(self, project_data, taiga_epic, epic, options): + offset = 0 + while True: + activities = self._client.get( + "/projects/{}/epics/{}/activity".format( + project_data['id'], + epic['id'], + ), + {"envelope": "true", "limit": 300, "offset": offset} + ) + offset += 300 + for activity in activities['data']: + self._import_activity(taiga_epic, activity, options) + + if len(activities['data']) < 300: + break + + def _import_activity(self, obj, activity, options): + activity_data = self._transform_activity_data(obj, activity, options) + if activity_data is None: + return + + change_old = activity_data['change_old'] + change_new = activity_data['change_new'] + hist_type = activity_data['hist_type'] + comment = activity_data['comment'] + user = activity_data['user'] + + key = make_key_from_model_object(activity_data['obj']) + typename = get_typename_for_model_class(type(activity_data['obj'])) + + diff = make_diff_from_dicts(change_old, change_new) + fdiff = FrozenDiff(key, diff, {}) + + entry = HistoryEntry.objects.create( + user=user, + project_id=obj.project.id, + key=key, + type=hist_type, + snapshot=None, + diff=fdiff.diff, + values=make_diff_values(typename, fdiff), + comment=comment, + comment_html=mdrender(obj.project, comment), + is_hidden=False, + is_snapshot=False, + ) + HistoryEntry.objects.filter(id=entry.id).update(created_at=activity['occurred_at']) + return HistoryEntry.objects.get(id=entry.id) + + def _transform_activity_data(self, obj, activity, options): + users_bindings = options.get('users_bindings', {}) + due_date_field = obj.project.userstorycustomattributes.get(name="Due date") + story_type_field = obj.project.userstorycustomattributes.get(name="Type") + + user = {"pk": None, "name": activity.get('performed_by', {}).get('name', None)} + taiga_user = users_bindings.get(activity.get('performed_by', {}).get('id', None), None) + if taiga_user: + user = {"pk": taiga_user.id, "name": taiga_user.get_full_name()} + + result = { + "change_old": {}, + "change_new": {}, + "hist_type": HistoryType.change, + "comment": "", + "user": user, + "obj": obj + } + + if activity['kind'] == "story_create_activity": + UserStory.objects.filter(id=obj.id, created_date__gt=activity['occurred_at']).update( + created_date=activity['occurred_at'], + owner=users_bindings.get(activity["performed_by"]["id"], self._user) + ) + return None + elif activity['kind'] == "epic_create_activity": + Epic.objects.filter(id=obj.id, created_date__gt=activity['occurred_at']).update( + created_date=activity['occurred_at'], + owner=users_bindings.get(activity["performed_by"]["id"], self._user) + ) + return None + elif activity['kind'] in ["story_update_activity", "epic_update_activity"]: + for change in activity['changes']: + if change['change_type'] != "update" or change['kind'] not in ["story", "epic"]: + continue + + if 'description' in change['new_values']: + result['change_old']["description"] = str(change['original_values']['description']) + result['change_new']["description"] = str(change['new_values']['description']) + result['change_old']["description_html"] = mdrender(obj.project, str(change['original_values']['description'])) + result['change_new']["description_html"] = mdrender(obj.project, str(change['new_values']['description'])) + + if 'estimate' in change['new_values']: + old_points = None + if change['original_values']['estimate']: + estimation = change['original_values']['estimate'] + (old_points, _) = Points.objects.get_or_create( + project=obj.project, + value=estimation, + defaults={ + "name": str(estimation), + "order": estimation, + } + ) + old_points = old_points.id + new_points = None + if change['new_values']['estimate']: + estimation = change['new_values']['estimate'] + (new_points, _) = Points.objects.get_or_create( + project=obj.project, + value=estimation, + defaults={ + "name": str(estimation), + "order": estimation, + } + ) + new_points = new_points.id + result['change_old']["points"] = {obj.project.roles.get(slug="main").id: old_points} + result['change_new']["points"] = {obj.project.roles.get(slug="main").id: new_points} + + if 'name' in change['new_values']: + result['change_old']["subject"] = change['original_values']['name'] + result['change_new']["subject"] = change['new_values']['name'] + + if 'labels' in change['new_values']: + result['change_old']["tags"] = [l.lower() for l in change['original_values']['labels']] + result['change_new']["tags"] = [l.lower() for l in change['new_values']['labels']] + + if 'current_state' in change['new_values']: + result['change_old']["status"] = obj.project.us_statuses.get(slug=change['original_values']['current_state']).id + result['change_new']["status"] = obj.project.us_statuses.get(slug=change['new_values']['current_state']).id + + if 'story_type' in change['new_values']: + if "custom_attributes" not in result['change_old']: + result['change_old']["custom_attributes"] = [] + if "custom_attributes" not in result['change_new']: + result['change_new']["custom_attributes"] = [] + + result['change_old']["custom_attributes"].append({ + "name": "Type", + "value": change['original_values']['story_type'], + "id": story_type_field.id + }) + result['change_new']["custom_attributes"].append({ + "name": "Type", + "value": change['new_values']['story_type'], + "id": story_type_field.id + }) + + if 'deadline' in change['new_values']: + if "custom_attributes" not in result['change_old']: + result['change_old']["custom_attributes"] = [] + if "custom_attributes" not in result['change_new']: + result['change_new']["custom_attributes"] = [] + + result['change_old']["custom_attributes"].append({ + "name": "Due date", + "value": change['original_values']['deadline'], + "id": due_date_field.id + }) + result['change_new']["custom_attributes"].append({ + "name": "Due date", + "value": change['new_values']['deadline'], + "id": due_date_field.id + }) + + # TODO: Process owners_ids + + elif activity['kind'] == "task_create_activity": + return None + elif activity['kind'] == "task_update_activity": + for change in activity['changes']: + if change['change_type'] != "update" or change['kind'] != "task": + continue + + try: + task = Task.objects.get(project=obj.project, ref=change['id']) + if 'description' in change['new_values']: + result['change_old']["subject"] = change['original_values']['description'] + result['change_new']["subject"] = change['new_values']['description'] + result['obj'] = task + if 'complete' in change['new_values']: + result['change_old']["status"] = obj.project.task_statuses.get(slug="complete" if change['original_values']['complete'] else "incomplete").id + result['change_new']["status"] = obj.project.task_statuses.get(slug="complete" if change['new_values']['complete'] else "incomplete").id + result['obj'] = task + except Task.DoesNotExist: + return None + + elif activity['kind'] == "comment_create_activity": + return None + elif activity['kind'] == "comment_update_activity": + return None + elif activity['kind'] == "story_move_activity": + return None + return result diff --git a/taiga/importers/pivotal/tasks.py b/taiga/importers/pivotal/tasks.py new file mode 100644 index 00000000..2e8f54ea --- /dev/null +++ b/taiga/importers/pivotal/tasks.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import logging +import sys + +from django.utils.translation import ugettext as _ + +from taiga.base.mails import mail_builder +from taiga.users.models import User +from taiga.celery import app +from .importer import PivotalImporter + +logger = logging.getLogger('taiga.importers.pivotal') + + +@app.task(bind=True) +def import_project(self, user_id, token, project_id, options): + user = User.object.get(id=user_id) + importer = PivotalImporter(user, token) + try: + project = importer.import_project(project_id, options) + except Exception as e: + # Error + ctx = { + "user": user, + "error_subject": _("Error importing pivotal project"), + "error_message": _("Error importing pivotal project"), + "project": project_id, + "exception": e + } + email = mail_builder.pivotal_import_error(admin, ctx) + email.send() + logger.error('Error importing pivotal project %s (by %s)', project_id, user, exc_info=sys.exc_info()) + else: + ctx = { + "project": project, + "user": user, + } + email = mail_builder.pivotal_import_success(user, ctx) + email.send() From 475092f4c2677e0445fef39eb77ee4f643b622f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 18 Jan 2017 10:12:48 +0100 Subject: [PATCH 107/144] Add importers changelog entries --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbc26535..d38f260e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,12 @@ - Add japanese (ja) translation. - Add korean (ko) translation. - Add chinese simplified (zh-Hans) translation. +- Third party services project importers: + - Trello + - Jira 7 + - Github + - Asana + - Pivotal Tracker ### Misc - API: From c2b0ac84e6065a12fd05dd09384bf35cfe5ed556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 25 Jan 2017 17:40:47 +0100 Subject: [PATCH 108/144] [i18n] Fix some messages and update locales --- taiga/importers/asana/api.py | 12 +- taiga/importers/asana/tasks.py | 6 +- taiga/importers/github/tasks.py | 6 +- taiga/importers/jira/tasks.py | 6 +- taiga/importers/pivotal/tasks.py | 6 +- taiga/importers/trello/tasks.py | 6 +- taiga/locale/en/LC_MESSAGES/django.po | 137 ++++++++++++++---- tests/integration/test_importers_asana_api.py | 2 +- 8 files changed, 130 insertions(+), 51 deletions(-) diff --git a/taiga/importers/asana/api.py b/taiga/importers/asana/api.py index 3982a958..611eda8b 100644 --- a/taiga/importers/asana/api.py +++ b/taiga/importers/asana/api.py @@ -48,9 +48,9 @@ class AsanaImporterViewSet(viewsets.ViewSet): try: users = importer.list_users(project_id) except exceptions.InvalidRequest: - raise exc.BadRequest(_('Invalid asana api request')) + raise exc.BadRequest(_('Invalid Asana API request')) except exceptions.FailedRequest: - raise exc.BadRequest(_('Failed to make the request to asana api')) + raise exc.BadRequest(_('Failed to make the request to Asana API')) for user in users: if user['detected_user']: @@ -71,9 +71,9 @@ class AsanaImporterViewSet(viewsets.ViewSet): try: projects = importer.list_projects() except exceptions.InvalidRequest: - raise exc.BadRequest(_('Invalid asana api request')) + raise exc.BadRequest(_('Invalid Asana API request')) except exceptions.FailedRequest: - raise exc.BadRequest(_('Failed to make the request to asana api')) + raise exc.BadRequest(_('Failed to make the request to Asana API')) return response.Ok(projects) @list_route(methods=["POST"]) @@ -128,8 +128,8 @@ class AsanaImporterViewSet(viewsets.ViewSet): try: asana_token = AsanaImporter.get_access_token(code, settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) except exceptions.InvalidRequest: - raise exc.BadRequest(_('Invalid asana api request')) + raise exc.BadRequest(_('Invalid Asana API request')) except exceptions.FailedRequest: - raise exc.BadRequest(_('Failed to make the request to asana api')) + raise exc.BadRequest(_('Failed to make the request to Asana API')) return response.Ok({"token": asana_token}) diff --git a/taiga/importers/asana/tasks.py b/taiga/importers/asana/tasks.py index 5d36bed9..4dcef793 100644 --- a/taiga/importers/asana/tasks.py +++ b/taiga/importers/asana/tasks.py @@ -39,14 +39,14 @@ def import_project(self, user_id, token, project_id, options): # Error ctx = { "user": user, - "error_subject": _("Error importing asana project"), - "error_message": _("Error importing asana project"), + "error_subject": _("Error importing Asana project"), + "error_message": _("Error importing Asana project"), "project": project_id, "exception": e } email = mail_builder.asana_import_error(admin, ctx) email.send() - logger.error('Error importing asana project %s (by %s)', project_id, user, exc_info=sys.exc_info()) + logger.error('Error importing Asana project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: ctx = { "project": project, diff --git a/taiga/importers/github/tasks.py b/taiga/importers/github/tasks.py index f1069e9e..c3cf16f8 100644 --- a/taiga/importers/github/tasks.py +++ b/taiga/importers/github/tasks.py @@ -39,14 +39,14 @@ def import_project(self, user_id, token, project_id, options): # Error ctx = { "user": user, - "error_subject": _("Error importing github project"), - "error_message": _("Error importing github project"), + "error_subject": _("Error importing GitHub project"), + "error_message": _("Error importing GitHub project"), "project": project_id, "exception": e } email = mail_builder.github_import_error(admin, ctx) email.send() - logger.error('Error importing github project %s (by %s)', project_id, user, exc_info=sys.exc_info()) + logger.error('Error importing GitHub project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: ctx = { "project": project, diff --git a/taiga/importers/jira/tasks.py b/taiga/importers/jira/tasks.py index a1551f1b..874aca49 100644 --- a/taiga/importers/jira/tasks.py +++ b/taiga/importers/jira/tasks.py @@ -44,14 +44,14 @@ def import_project(self, user_id, url, token, project_id, options, importer_type # Error ctx = { "user": user, - "error_subject": _("Error importing jira project"), - "error_message": _("Error importing jira project"), + "error_subject": _("Error importing Jira project"), + "error_message": _("Error importing Jira project"), "project": project_id, "exception": e } email = mail_builder.jira_import_error(admin, ctx) email.send() - logger.error('Error importing jira project %s (by %s)', project_id, user, exc_info=sys.exc_info()) + logger.error('Error importing Jira project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: ctx = { "project": project, diff --git a/taiga/importers/pivotal/tasks.py b/taiga/importers/pivotal/tasks.py index 2e8f54ea..b9954201 100644 --- a/taiga/importers/pivotal/tasks.py +++ b/taiga/importers/pivotal/tasks.py @@ -39,14 +39,14 @@ def import_project(self, user_id, token, project_id, options): # Error ctx = { "user": user, - "error_subject": _("Error importing pivotal project"), - "error_message": _("Error importing pivotal project"), + "error_subject": _("Error importing PivotalTracker project"), + "error_message": _("Error importing PivotalTracker project"), "project": project_id, "exception": e } email = mail_builder.pivotal_import_error(admin, ctx) email.send() - logger.error('Error importing pivotal project %s (by %s)', project_id, user, exc_info=sys.exc_info()) + logger.error('Error importing PivotalTracker project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: ctx = { "project": project, diff --git a/taiga/importers/trello/tasks.py b/taiga/importers/trello/tasks.py index 76f7f197..1cb2fe32 100644 --- a/taiga/importers/trello/tasks.py +++ b/taiga/importers/trello/tasks.py @@ -39,14 +39,14 @@ def import_project(self, user_id, token, project_id, options): # Error ctx = { "user": user, - "error_subject": _("Error importing trello project"), - "error_message": _("Error importing trello project"), + "error_subject": _("Error importing Trello project"), + "error_message": _("Error importing Trello project"), "project": project_id, "exception": e } email = mail_builder.trello_import_error(admin, ctx) email.send() - logger.error('Error importing trello project %s (by %s)', project_id, user, exc_info=sys.exc_info()) + logger.error('Error importing Trello project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: ctx = { "project": project, diff --git a/taiga/locale/en/LC_MESSAGES/django.po b/taiga/locale/en/LC_MESSAGES/django.po index 757246c6..53faaa9f 100644 --- a/taiga/locale/en/LC_MESSAGES/django.po +++ b/taiga/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" +"POT-Creation-Date: 2017-02-15 12:07+0100\n" "PO-Revision-Date: 2015-03-25 20:09+0100\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Taiga Dev Team \n" @@ -184,8 +184,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" @@ -764,7 +764,7 @@ msgstr "" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -801,7 +801,7 @@ msgstr "" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -861,7 +861,7 @@ msgstr "" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "" @@ -949,6 +949,85 @@ msgstr "" msgid "The status doesn't exist" msgstr "" +#: taiga/importers/asana/api.py:44 taiga/importers/asana/api.py:86 +#: taiga/importers/github/api.py:45 taiga/importers/github/api.py:75 +#: taiga/importers/jira/api.py:56 taiga/importers/jira/api.py:102 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:51 taiga/importers/asana/api.py:74 +#: taiga/importers/asana/api.py:131 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:53 taiga/importers/asana/api.py:76 +#: taiga/importers/asana/api.py:133 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:126 taiga/importers/github/api.py:121 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:129 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:131 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:58 taiga/importers/jira/api.py:85 +#: taiga/importers/jira/api.py:105 taiga/importers/jira/api.py:178 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:154 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:224 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:143 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "" @@ -1134,7 +1213,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1217,7 +1296,7 @@ msgstr "" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1240,7 +1319,7 @@ msgstr "" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1266,7 +1345,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1409,26 +1488,26 @@ msgstr "" msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1436,23 +1515,28 @@ msgstr "" msgid "color" msgstr "" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1635,11 +1719,6 @@ msgstr "" msgid "finished date" msgstr "" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "" @@ -3307,25 +3386,25 @@ msgstr "" msgid "Stakeholder" msgstr "" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "" diff --git a/tests/integration/test_importers_asana_api.py b/tests/integration/test_importers_asana_api.py index bc158694..aab4d143 100644 --- a/tests/integration/test_importers_asana_api.py +++ b/tests/integration/test_importers_asana_api.py @@ -95,7 +95,7 @@ def test_authorize_with_bad_verify(client, settings): assert response.status_code == 400 assert 'token' not in response.data assert '_error_message' in response.data - assert response.data['_error_message'] == "Invalid asana api request" + assert response.data['_error_message'] == "Invalid Asana API request" def test_import_asana_list_users(client): From ea7187b30d2f05d2196ba6c042c3d045df3bb460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 14 Feb 2017 15:57:37 +0100 Subject: [PATCH 109/144] Capture any error processing authorization on github and convert it to a Http400 --- taiga/importers/github/importer.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/taiga/importers/github/importer.py b/taiga/importers/github/importer.py index b042feef..daee40c8 100644 --- a/taiga/importers/github/importer.py +++ b/taiga/importers/github/importer.py @@ -19,6 +19,8 @@ from taiga.timeline.rebuilder import rebuild_timeline from taiga.timeline.models import Timeline from taiga.users.models import User, AuthData +from taiga.importers.exceptions import InvalidAuthResult + class GithubClient: def __init__(self, token): @@ -530,7 +532,10 @@ class GithubImporter: if result.status_code > 299: raise InvalidAuthResult() else: - return dict(parse_qsl(result.content))[b'access_token'].decode('utf-8') + try: + return dict(parse_qsl(result.content))[b'access_token'].decode('utf-8') + except: + raise InvalidAuthResult() class AssignedEventHandler: From a952d200fc3711900abc7fa4ad56820405c61837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 14 Feb 2017 17:31:45 +0100 Subject: [PATCH 110/144] Improved users_bindings --- taiga/importers/asana/api.py | 3 ++- taiga/importers/github/api.py | 3 ++- taiga/importers/jira/api.py | 3 ++- taiga/importers/services.py | 16 ++++++++++++++++ taiga/importers/trello/api.py | 3 ++- 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 taiga/importers/services.py diff --git a/taiga/importers/asana/api.py b/taiga/importers/asana/api.py index 611eda8b..d92dda55 100644 --- a/taiga/importers/asana/api.py +++ b/taiga/importers/asana/api.py @@ -26,6 +26,7 @@ from taiga.users.gravatar import get_user_gravatar_id from taiga.projects.serializers import ProjectSerializer from taiga.importers import permissions, exceptions +from taiga.importers.services import resolve_users_bindings from .importer import AsanaImporter from . import tasks @@ -89,7 +90,7 @@ class AsanaImporterViewSet(viewsets.ViewSet): "name": request.DATA.get('name', None), "description": request.DATA.get('description', None), "template": request.DATA.get('template', "scrum"), - "users_bindings": request.DATA.get("users_bindings", {}), + "users_bindings": resolve_users_bindings(request.DATA.get("users_bindings", {})), "keep_external_reference": request.DATA.get("keep_external_reference", False), "is_private": request.DATA.get("is_private", False), } diff --git a/taiga/importers/github/api.py b/taiga/importers/github/api.py index e8991c0d..675d7a90 100644 --- a/taiga/importers/github/api.py +++ b/taiga/importers/github/api.py @@ -27,6 +27,7 @@ from taiga.projects.serializers import ProjectSerializer from taiga.importers import permissions from taiga.importers import exceptions +from taiga.importers.services import resolve_users_bindings from .importer import GithubImporter from . import tasks @@ -85,7 +86,7 @@ class GithubImporterViewSet(viewsets.ViewSet): "description": request.DATA.get('description', None), "template": template, "type": items_type, - "users_bindings": request.DATA.get("users_bindings", {}), + "users_bindings": resolve_users_bindings(request.DATA.get("users_bindings", {})), "keep_external_reference": request.DATA.get("keep_external_reference", False), "is_private": request.DATA.get("is_private", False), } diff --git a/taiga/importers/jira/api.py b/taiga/importers/jira/api.py index 47bb6cda..5e0d1de8 100644 --- a/taiga/importers/jira/api.py +++ b/taiga/importers/jira/api.py @@ -25,6 +25,7 @@ from taiga.users.services import get_user_photo_url from taiga.users.gravatar import get_user_gravatar_id from taiga.importers import permissions +from taiga.importers.services import resolve_users_bindings from .normal import JiraNormalImporter from .agile import JiraAgileImporter from . import tasks @@ -107,7 +108,7 @@ class JiraImporterViewSet(viewsets.ViewSet): options = { "name": request.DATA.get('name', None), "description": request.DATA.get('description', None), - "users_bindings": request.DATA.get("user_bindings", {}), + "users_bindings": resolve_users_bindings(request.DATA.get("users_bindings", {})), "keep_external_reference": request.DATA.get("keep_external_reference", False), "is_private": request.DATA.get("is_private", False), } diff --git a/taiga/importers/services.py b/taiga/importers/services.py new file mode 100644 index 00000000..4817c049 --- /dev/null +++ b/taiga/importers/services.py @@ -0,0 +1,16 @@ +from taiga.users.models import User + + +def resolve_users_bindings(users_bindings): + new_users_bindings = {} + for key,value in users_bindings.items(): + if isinstance(value, str): + try: + new_users_bindings[int(key)] = User.objects.get(email_iexact=value) + except User.MultipleObjectsReturned: + new_users_bindings[int(key)] = User.objects.get(email=value) + except User.DoesNotExists: + new_users_bindings[int(key)] = None + else: + new_users_bindings[int(key)] = User.objects.get(id=value) + return new_users_bindings diff --git a/taiga/importers/trello/api.py b/taiga/importers/trello/api.py index 33b9fe40..f616d9b8 100644 --- a/taiga/importers/trello/api.py +++ b/taiga/importers/trello/api.py @@ -29,6 +29,7 @@ from taiga.projects.serializers import ProjectSerializer from .importer import TrelloImporter from taiga.importers import permissions +from taiga.importers.services import resolve_users_bindings from . import tasks @@ -86,7 +87,7 @@ class TrelloImporterViewSet(viewsets.ViewSet): "name": request.DATA.get('name', None), "description": request.DATA.get('description', None), "template": request.DATA.get('template', "kanban"), - "users_bindings": request.DATA.get("users_bindings", {}), + "users_bindings": resolve_users_bindings(request.DATA.get("users_bindings", {})), "keep_external_reference": request.DATA.get("keep_external_reference", False), "is_private": request.DATA.get("is_private", False), } From aaedfab43927a67fa108ed812810226999fe0045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 14 Feb 2017 22:48:57 +0100 Subject: [PATCH 111/144] Change settings format for importers --- settings/common.py | 37 ++++++++++++------- settings/testing.py | 6 +++ taiga/importers/asana/api.py | 13 ++++++- taiga/importers/github/api.py | 11 +++++- taiga/importers/jira/api.py | 12 +++--- .../management/commands/import_from_asana.py | 13 ++++++- .../management/commands/import_from_github.py | 10 ++++- .../management/commands/import_from_jira.py | 16 +++++++- taiga/importers/trello/importer.py | 12 +++--- taiga/routers.py | 23 ++++++++---- tests/integration/test_importers_asana_api.py | 24 +++++++++--- .../integration/test_importers_github_api.py | 12 +++++- 12 files changed, 138 insertions(+), 51 deletions(-) diff --git a/settings/common.py b/settings/common.py index a0156181..5bc1605c 100644 --- a/settings/common.py +++ b/settings/common.py @@ -561,19 +561,30 @@ MAX_PENDING_MEMBERSHIPS = 30 # Max number of unconfirmed memberships in a projec from .sr import * -GITHUB_API_CLIENT_ID = "" -GITHUB_API_CLIENT_SECRET = "" - -TRELLO_API_KEY = "" -TRELLO_SECRET_KEY = "" - -ASANA_APP_CALLBACK_URL = "" -ASANA_APP_ID = "" -ASANA_APP_SECRET = "" - -JIRA_CONSUMER_KEY = "" -JIRA_CERT = "" -JIRA_PUB_CERT = "" +IMPORTERS = { + "github": { + "active": False, + "client_id": "", + "client_secret": "", + }, + "trello": { + "active": False, + "api_key": "", + "secret_key": "", + }, + "jira": { + "active": False, + "consumer_key": "", + "cert": "", + "pub_cert": "", + }, + "asana": { + "active": False, + "callback_url": "", + "app_id": "", + "app_secret": "", + } +} # NOTE: DON'T INSERT MORE SETTINGS AFTER THIS LINE TEST_RUNNER="django.test.runner.DiscoverRunner" diff --git a/settings/testing.py b/settings/testing.py index 12532b9b..ffabbe12 100644 --- a/settings/testing.py +++ b/settings/testing.py @@ -38,3 +38,9 @@ REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"] = { "register-success": None, "user-detail": None, } + + +IMPORTERS['github']['active'] = True +IMPORTERS['jira']['active'] = True +IMPORTERS['asana']['active'] = True +IMPORTERS['trello']['active'] = True diff --git a/taiga/importers/asana/api.py b/taiga/importers/asana/api.py index d92dda55..b13914bf 100644 --- a/taiga/importers/asana/api.py +++ b/taiga/importers/asana/api.py @@ -114,7 +114,11 @@ class AsanaImporterViewSet(viewsets.ViewSet): def auth_url(self, request, *args, **kwargs): self.check_permissions(request, "auth_url", None) - url = AsanaImporter.get_auth_url(settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) + url = AsanaImporter.get_auth_url( + settings.IMPORTERS.get('asana', {}).get('app_id', None), + settings.IMPORTERS.get('asana', {}).get('app_secret', None), + settings.IMPORTERS.get('asana', {}).get('callback_url', None) + ) return response.Ok({"url": url}) @@ -127,7 +131,12 @@ class AsanaImporterViewSet(viewsets.ViewSet): raise exc.BadRequest(_("Code param needed")) try: - asana_token = AsanaImporter.get_access_token(code, settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) + asana_token = AsanaImporter.get_access_token( + code, + settings.IMPORTERS.get('asana', {}).get('app_id', None), + settings.IMPORTERS.get('asana', {}).get('app_secret', None), + settings.IMPORTERS.get('asana', {}).get('callback_url', None) + ) except exceptions.InvalidRequest: raise exc.BadRequest(_('Invalid Asana API request')) except exceptions.FailedRequest: diff --git a/taiga/importers/github/api.py b/taiga/importers/github/api.py index 675d7a90..0c7af495 100644 --- a/taiga/importers/github/api.py +++ b/taiga/importers/github/api.py @@ -110,7 +110,10 @@ class GithubImporterViewSet(viewsets.ViewSet): def auth_url(self, request, *args, **kwargs): self.check_permissions(request, "auth_url", None) callback_uri = request.QUERY_PARAMS.get('uri') - url = GithubImporter.get_auth_url(settings.GITHUB_API_CLIENT_ID, callback_uri) + url = GithubImporter.get_auth_url( + settings.IMPORTERS.get('github', {}).get('client_id', None), + callback_uri + ) return response.Ok({"url": url}) @list_route(methods=["POST"]) @@ -122,7 +125,11 @@ class GithubImporterViewSet(viewsets.ViewSet): raise exc.BadRequest(_("Code param needed")) try: - token = GithubImporter.get_access_token(settings.GITHUB_API_CLIENT_ID, settings.GITHUB_API_CLIENT_SECRET, code) + token = GithubImporter.get_access_token( + settings.IMPORTERS.get('github', {}).get('client_id', None), + settings.IMPORTERS.get('github', {}).get('client_secret', None), + code + ) return response.Ok({ "token": token }) diff --git a/taiga/importers/jira/api.py b/taiga/importers/jira/api.py index 5e0d1de8..c704a2fd 100644 --- a/taiga/importers/jira/api.py +++ b/taiga/importers/jira/api.py @@ -40,8 +40,8 @@ class JiraImporterViewSet(viewsets.ViewSet): token = { "access_token": token_data[0], "access_token_secret": token_data[1], - "key_cert": settings.JIRA_CERT, - "consumer_key": settings.JIRA_CONSUMER_KEY + "key_cert": settings.IMPORTERS.get('jira', {}).get('cert', None), + "consumer_key": settings.IMPORTERS.get('jira', {}).get('consumer_key', None) } return token @@ -180,8 +180,8 @@ class JiraImporterViewSet(viewsets.ViewSet): (oauth_token, oauth_secret, url) = JiraNormalImporter.get_auth_url( jira_url, - settings.JIRA_CONSUMER_KEY, - settings.JIRA_CERT, + settings.IMPORTERS.get('jira', {}).get('consumer_key', None), + settings.IMPORTERS.get('jira', {}).get('cert', None), True ) @@ -215,8 +215,8 @@ class JiraImporterViewSet(viewsets.ViewSet): jira_token = JiraNormalImporter.get_access_token( server_url, - settings.JIRA_CONSUMER_KEY, - settings.JIRA_CERT, + settings.IMPORTERS.get('jira', {}).get('consumer_key', None), + settings.IMPORTERS.get('jira', {}).get('cert', None), oauth_token, oauth_secret, True diff --git a/taiga/importers/management/commands/import_from_asana.py b/taiga/importers/management/commands/import_from_asana.py index d7d7dd21..9d954422 100644 --- a/taiga/importers/management/commands/import_from_asana.py +++ b/taiga/importers/management/commands/import_from_asana.py @@ -52,10 +52,19 @@ class Command(BaseCommand): if options.get('token', None): token = json.loads(options.get('token')) else: - url = AsanaImporter.get_auth_url(settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) + url = AsanaImporter.get_auth_url( + settings.IMPORTERS.get('asana', {}).get('app_id', None), + settings.IMPORTERS.get('asana', {}).get('app_secret', None), + settings.IMPORTERS.get('asana', {}).get('callback_url', None) + ) print("Go to here and come with your code (in the redirected url): {}".format(url)) code = input("Code: ") - access_data = AsanaImporter.get_access_token(code, settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) + access_data = AsanaImporter.get_access_token( + code, + settings.IMPORTERS.get('asana', {}).get('app_id', None), + settings.IMPORTERS.get('asana', {}).get('app_secret', None), + settings.IMPORTERS.get('asana', {}).get('callback_url', None) + ) token = access_data importer = AsanaImporter(admin, token) diff --git a/taiga/importers/management/commands/import_from_github.py b/taiga/importers/management/commands/import_from_github.py index 9c93a527..e2ad7b96 100644 --- a/taiga/importers/management/commands/import_from_github.py +++ b/taiga/importers/management/commands/import_from_github.py @@ -51,10 +51,16 @@ class Command(BaseCommand): if options.get('token', None): token = options.get('token') else: - url = GithubImporter.get_auth_url(settings.GITHUB_API_CLIENT_ID) + url = GithubImporter.get_auth_url( + settings.IMPORTERS.get('github', {}).get('client_id', None) + ) print("Go to here and come with your code (in the redirected url): {}".format(url)) code = input("Code: ") - access_data = GithubImporter.get_access_token(settings.GITHUB_API_CLIENT_ID, settings.GITHUB_API_CLIENT_SECRET, code) + access_data = GithubImporter.get_access_token( + settings.IMPORTERS.get('github', {}).get('client_id', None) + settings.IMPORTERS.get('github', {}).get('client_secret', None) + code + ) token = access_data importer = GithubImporter(admin, token) diff --git a/taiga/importers/management/commands/import_from_jira.py b/taiga/importers/management/commands/import_from_jira.py index 972e6ba6..30c723d6 100644 --- a/taiga/importers/management/commands/import_from_jira.py +++ b/taiga/importers/management/commands/import_from_jira.py @@ -62,10 +62,22 @@ class Command(BaseCommand): elif options.get('token', None): token = json.loads(options.get('token')) else: - (rtoken, rtoken_secret, url) = JiraNormalImporter.get_auth_url(server, settings.JIRA_CONSUMER_KEY, settings.JIRA_CERT, True) + (rtoken, rtoken_secret, url) = JiraNormalImporter.get_auth_url( + server, + settings.IMPORTERS.get('jira', {}).get('consumer_key', None), + settings.IMPORTERS.get('jira', {}).get('cert', None), + True + ) print(url) code = input("Go to the url and get back the code") - token = JiraNormalImporter.get_access_token(server, settings.JIRA_CONSUMER_KEY, settings.JIRA_CERT, rtoken, rtoken_secret, True) + token = JiraNormalImporter.get_access_token( + server, + settings.IMPORTERS.get('jira', {}).get('consumer_key', None), + settings.IMPORTERS.get('jira', {}).get('cert', None), + rtoken, + rtoken_secret, + True + ) print("Auth token: {}".format(json.dumps(token))) diff --git a/taiga/importers/trello/importer.py b/taiga/importers/trello/importer.py index e41063b8..c36e3086 100644 --- a/taiga/importers/trello/importer.py +++ b/taiga/importers/trello/importer.py @@ -92,8 +92,8 @@ class TrelloImporter: self._user = user self._cached_orgs = {} self._client = TrelloClient( - api_key=settings.TRELLO_API_KEY, - api_secret=settings.TRELLO_SECRET_KEY, + api_key=settings.IMPORTERS.get('trello', {}).get('api_key', None), + api_secret=settings.IMPORTERS.get('trello', {}).get('secret_key', None), token=token, ) @@ -492,8 +492,8 @@ class TrelloImporter: return_url = resolve_front_url("new-project-import", "trello") expiration = "1day" scope = "read,write,account" - trello_key = settings.TRELLO_API_KEY - trello_secret = settings.TRELLO_SECRET_KEY + trello_key = settings.IMPORTERS.get('trello', {}).get('api_key', None) + trello_secret = settings.IMPORTERS.get('trello', {}).get('secret_key', None) name = "Taiga" session = OAuth1Session(client_key=trello_key, client_secret=trello_secret) @@ -515,8 +515,8 @@ class TrelloImporter: @classmethod def get_access_token(cls, oauth_token, oauth_token_secret, oauth_verifier): - api_key = settings.TRELLO_API_KEY - api_secret = settings.TRELLO_SECRET_KEY + api_key = settings.IMPORTERS.get('trello', {}).get('api_key', None) + api_secret = settings.IMPORTERS.get('trello', {}).get('secret_key', None) access_token_url = 'https://trello.com/1/OAuthGetAccessToken' session = OAuth1Session(client_key=api_key, client_secret=api_secret, resource_owner_key=oauth_token, resource_owner_secret=oauth_token_secret, diff --git a/taiga/routers.py b/taiga/routers.py index 382ede82..013e7453 100644 --- a/taiga/routers.py +++ b/taiga/routers.py @@ -17,6 +17,7 @@ # along with this program. If not, see . from taiga.base import routers +from django.conf import settings router = routers.DefaultRouter(trailing_slash=False) @@ -284,15 +285,21 @@ router.register(r"applications", Application, base_name="applications") router.register(r"application-tokens", ApplicationToken, base_name="application-tokens") # Third party importers -from taiga.importers.trello.api import TrelloImporterViewSet -from taiga.importers.jira.api import JiraImporterViewSet -from taiga.importers.github.api import GithubImporterViewSet -from taiga.importers.asana.api import AsanaImporterViewSet +if settings.IMPORTERS.get('trello', {}).get('active', False): + from taiga.importers.trello.api import TrelloImporterViewSet + router.register(r"importers/trello", TrelloImporterViewSet, base_name="importers-trello") -router.register(r"importers/trello", TrelloImporterViewSet, base_name="importers-trello") -router.register(r"importers/jira", JiraImporterViewSet, base_name="importers-jira") -router.register(r"importers/github", GithubImporterViewSet, base_name="importers-github") -router.register(r"importers/asana", AsanaImporterViewSet, base_name="importers-asana") +if settings.IMPORTERS.get('jira', {}).get('active', False): + from taiga.importers.jira.api import JiraImporterViewSet + router.register(r"importers/jira", JiraImporterViewSet, base_name="importers-jira") + +if settings.IMPORTERS.get('github', {}).get('active', False): + from taiga.importers.github.api import GithubImporterViewSet + router.register(r"importers/github", GithubImporterViewSet, base_name="importers-github") + +if settings.IMPORTERS.get('asana', {}).get('active', False): + from taiga.importers.asana.api import AsanaImporterViewSet + router.register(r"importers/asana", AsanaImporterViewSet, base_name="importers-asana") # Stats diff --git a/tests/integration/test_importers_asana_api.py b/tests/integration/test_importers_asana_api.py index aab4d143..d44a7232 100644 --- a/tests/integration/test_importers_asana_api.py +++ b/tests/integration/test_importers_asana_api.py @@ -35,16 +35,20 @@ pytestmark = pytest.mark.django_db def test_auth_url(client, settings): user = f.UserFactory.create() client.login(user) - settings.ASANA_APP_CALLBACK_URL = "http://testserver/url" - settings.ASANA_APP_ID = "test-id" - settings.ASANA_APP_SECRET = "test-secret" + settings.IMPORTERS['asana']['callback_url'] = "http://testserver/url" + settings.IMPORTERS['asana']['app_id'] = "test-id" + settings.IMPORTERS['asana']['app_secret'] = "test-secret" url = reverse("importers-asana-auth-url") with mock.patch('taiga.importers.asana.api.AsanaImporter') as AsanaImporterMock: AsanaImporterMock.get_auth_url.return_value = "https://auth_url" response = client.get(url, content_type="application/json") - assert AsanaImporterMock.get_auth_url.calledWith(settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, settings.ASANA_APP_CALLBACK_URL) + assert AsanaImporterMock.get_auth_url.calledWith( + settings.IMPORTERS['asana']['app_id'], + settings.IMPORTERS['asana']['app_secret'], + settings.IMPORTERS['asana']['callback_url'] + ) assert response.status_code == 200 assert 'url' in response.data @@ -60,7 +64,11 @@ def test_authorize(client, settings): with mock.patch('taiga.importers.asana.api.AsanaImporter') as AsanaImporterMock: AsanaImporterMock.get_access_token.return_value = "token" response = client.post(authorize_url, content_type="application/json", data=json.dumps({"code": "code"})) - assert AsanaImporterMock.get_access_token.calledWith(settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, "code") + assert AsanaImporterMock.get_access_token.calledWith( + settings.IMPORTERS['asana']['app_id'], + settings.IMPORTERS['asana']['app_secret'], + "code" + ) assert response.status_code == 200 assert 'token' in response.data @@ -90,7 +98,11 @@ def test_authorize_with_bad_verify(client, settings): with mock.patch('taiga.importers.asana.api.AsanaImporter') as AsanaImporterMock: AsanaImporterMock.get_access_token.side_effect = exceptions.InvalidRequest() response = client.post(authorize_url, content_type="application/json", data=json.dumps({"code": "bad"})) - assert AsanaImporterMock.get_access_token.calledWith(settings.ASANA_APP_ID, settings.ASANA_APP_SECRET, "bad") + assert AsanaImporterMock.get_access_token.calledWith( + settings.IMPORTERS['asana']['app_id'], + settings.IMPORTERS['asana']['app_secret'], + "bad" + ) assert response.status_code == 400 assert 'token' not in response.data diff --git a/tests/integration/test_importers_github_api.py b/tests/integration/test_importers_github_api.py index bda1c928..4d30b8ff 100644 --- a/tests/integration/test_importers_github_api.py +++ b/tests/integration/test_importers_github_api.py @@ -53,7 +53,11 @@ def test_authorize(client, settings): with mock.patch('taiga.importers.github.api.GithubImporter') as GithubImporterMock: GithubImporterMock.get_access_token.return_value = "token" response = client.post(authorize_url, content_type="application/json", data=json.dumps({"code": "code"})) - assert GithubImporterMock.get_access_token.calledWith(settings.GITHUB_API_CLIENT_ID, settings.GITHUB_API_CLIENT_SECRET, "code") + assert GithubImporterMock.get_access_token.calledWith( + settings.IMPORTERS['github']['client_id'], + settings.IMPORTERS['github']['client_secret'], + "code" + ) assert response.status_code == 200 assert 'token' in response.data @@ -82,7 +86,11 @@ def test_authorize_with_bad_verify(client, settings): with mock.patch('taiga.importers.github.api.GithubImporter') as GithubImporterMock: GithubImporterMock.get_access_token.side_effect = exceptions.InvalidAuthResult() response = client.post(authorize_url, content_type="application/json", data=json.dumps({"code": "bad"})) - assert GithubImporterMock.get_access_token.calledWith(settings.GITHUB_API_CLIENT_ID, settings.GITHUB_API_CLIENT_SECRET, "bad") + assert GithubImporterMock.get_access_token.calledWith( + settings.IMPORTERS['github']['client_id'], + settings.IMPORTERS['github']['client_secret'], + "bad" + ) assert response.status_code == 400 assert 'token' not in response.data From 176e2fc2c547a0f7b06003ae997d7fa4552fd821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 15 Feb 2017 09:16:57 +0100 Subject: [PATCH 112/144] Adding avatar to list_user function in importers --- taiga/importers/asana/importer.py | 5 +++-- taiga/importers/github/importer.py | 1 + taiga/importers/jira/common.py | 1 + taiga/importers/trello/importer.py | 9 ++++++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/taiga/importers/asana/importer.py b/taiga/importers/asana/importer.py index 6c3c675a..2899ace9 100644 --- a/taiga/importers/asana/importer.py +++ b/taiga/importers/asana/importer.py @@ -49,11 +49,12 @@ class AsanaImporter: def list_users(self, project_id): users = [] for ws in self._client.workspaces.find_all(): - for user in self._client.users.find_by_workspace(ws['id'], fields=["id", "name", "email"]): + for user in self._client.users.find_by_workspace(ws['id'], fields=["id", "name", "email", "photo"]): users.append({ "id": user["id"], "full_name": user['name'], - "detected_user": self._get_user(user) + "detected_user": self._get_user(user), + "avatar": user.get('photo', None) and user['photo'].get('image_60x60', None) }) return users diff --git a/taiga/importers/github/importer.py b/taiga/importers/github/importer.py index daee40c8..18c5cbce 100644 --- a/taiga/importers/github/importer.py +++ b/taiga/importers/github/importer.py @@ -88,6 +88,7 @@ class GithubImporter: return [{"id": u['id'], "username": u['login'], "full_name": u.get('name', u['login']), + "avatar": u.get('avatar_url', None), "detected_user": self._get_user(u) } for u in collaborators] def _get_user(self, user, default=None): diff --git a/taiga/importers/jira/common.py b/taiga/importers/jira/common.py index c38d1993..1448deeb 100644 --- a/taiga/importers/jira/common.py +++ b/taiga/importers/jira/common.py @@ -176,6 +176,7 @@ class JiraImporterCommon: "id": user_data['key'], "full_name": user_data['displayName'], "email": user_data['emailAddress'], + "avatar": user_data.get('avatarUrls', None) and user_data['avatarUrls'].get('48x48', None), }) return result diff --git a/taiga/importers/trello/importer.py b/taiga/importers/trello/importer.py index c36e3086..227339e4 100644 --- a/taiga/importers/trello/importer.py +++ b/taiga/importers/trello/importer.py @@ -126,11 +126,18 @@ class TrelloImporter: def list_users(self, project_id): members = [] for member in self._client.get("/board/{}/members/all".format(project_id), {"fields": "id"}): - user = self._client.get("/member/{}".format(member['id']), {"fields": "id,fullName,email"}) + user = self._client.get("/member/{}".format(member['id']), {"fields": "id,fullName,email,avatarSource,avatarHash,gravatarHash"}) + print(user) + if user['avatarSource'] == "gravatar": + avatar = 'https://www.gravatar.com/avatar/' + user['gravatarHash'] + '.jpg?s=50' + else: + avatar = 'https://trello-avatars.s3.amazonaws.com/' + user['avatarHash'] + '/50.png' + members.append({ "id": user['id'], "full_name": user['fullName'], "email": user['email'], + "avatar": avatar }) return members From 0438a389b08598b1dd3ae3378411f93dd20d4fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 15 Feb 2017 09:51:01 +0100 Subject: [PATCH 113/144] Add sample settings in local.py.example --- settings/local.py.example | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/settings/local.py.example b/settings/local.py.example index 7defff37..c5f6491e 100644 --- a/settings/local.py.example +++ b/settings/local.py.example @@ -153,3 +153,43 @@ DATABASES = { # To use celery in memory #CELERY_ENABLED = True #CELERY_ALWAYS_EAGER = True + + +######################################### +## IMPORTERS +######################################### + +# Configuration for the GitHub importer +# Remember to enable it in the front client too. +#IMPORTERS["github"] = { +# "active": True, # Enable or disable the importer +# "client_id": "XXXXXX_get_a_valid_client_id_from_github_XXXXXX", +# "client_secret": "XXXXXX_get_a_valid_client_secret_from_github_XXXXXX" +#} + +# Configuration for the Trello importer +# Remember to enable it in the front client too. +#IMPORTERS["trello"] = { +# "active": True, # Enable or disable the importer +# "api_key": "XXXXXX_get_a_valid_api_key_from_trello_XXXXXX", +# "secret_key": "XXXXXX_get_a_valid_secret_key_from_trello_XXXXXX" +#} + +# Configuration for the Jira importer +# Remember to enable it in the front client too. +#IMPORTERS["jira"] = { +# "active": True, # Enable or disable the importer +# "consumer_key": "XXXXXX_get_a_valid_consumer_key_from_jira_XXXXXX", +# "cert": "XXXXXX_get_a_valid_cert_from_jira_XXXXXX", +# "pub_cert": "XXXXXX_get_a_valid_pub_cert_from_jira_XXXXXX" +#} + +# Configuration for the Asane importer +# Remember to enable it in the front client too. +#IMPORTERS["asana"] = { +# "active": True, # Enable or disable the importer +# "callback_url": "{}://{}/project/new/import/asana".format(SITES["front"]["scheme"], +# SITES["front"]["domain"]), +# "app_id": "XXXXXX_get_a_valid_app_id_from_asana_XXXXXX", +# "app_secret": "XXXXXX_get_a_valid_app_secret_from_asana_XXXXXX" +#} From 78f5b9e961c8f11e5df5fdec7292645fd8c1a64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 20 Feb 2017 12:31:21 +0100 Subject: [PATCH 114/144] [i18n] Update locales --- taiga/locale/ca/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/de/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/en/LC_MESSAGES/django.po | 34 ++--- taiga/locale/es/LC_MESSAGES/django.po | 141 +++++++++++++++----- taiga/locale/fi/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/fr/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/it/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/ja/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/ko/LC_MESSAGES/django.po | 141 +++++++++++++++----- taiga/locale/nb/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/nl/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/pl/LC_MESSAGES/django.po | 144 ++++++++++++++++----- taiga/locale/pt_BR/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/ru/LC_MESSAGES/django.po | 141 +++++++++++++++----- taiga/locale/sv/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/tr/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/zh-Hans/LC_MESSAGES/django.po | 139 +++++++++++++++----- taiga/locale/zh-Hant/LC_MESSAGES/django.po | 139 +++++++++++++++----- 18 files changed, 1876 insertions(+), 532 deletions(-) diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index 1921ef71..5031baec 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ca/)\n" @@ -192,8 +192,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" @@ -775,7 +775,7 @@ msgstr "" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -812,7 +812,7 @@ msgstr "Comentari" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -888,7 +888,7 @@ msgstr "El payload no és un arxiu json vàlid" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "El projecte no existeix" @@ -976,6 +976,85 @@ msgstr "L'element referenciat no existeix" msgid "The status doesn't exist" msgstr "L'estatus no existeix." +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Veure projecte" @@ -1161,7 +1240,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1244,7 +1323,7 @@ msgstr "" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1267,7 +1346,7 @@ msgstr "Id d'objecte" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1293,7 +1372,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1436,26 +1515,26 @@ msgstr "Ja existix altre amb el matex nom." msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "ref" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "estatus" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "tema" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1463,23 +1542,28 @@ msgstr "tema" msgid "color" msgstr "color" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "assignada a" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "requeriment de client" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "requeriment d'equip" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "referència externa" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1662,11 +1746,6 @@ msgstr "fita" msgid "finished date" msgstr "Data de finalització" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "referència externa" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "M'agrada" @@ -3358,25 +3437,25 @@ msgstr "" msgid "Stakeholder" msgstr "" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "" diff --git a/taiga/locale/de/LC_MESSAGES/django.po b/taiga/locale/de/LC_MESSAGES/django.po index f03e5edc..ea178737 100644 --- a/taiga/locale/de/LC_MESSAGES/django.po +++ b/taiga/locale/de/LC_MESSAGES/django.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/de/)\n" @@ -226,8 +226,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Blockiertes Element" @@ -926,7 +926,7 @@ msgstr "Web" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -963,7 +963,7 @@ msgstr "Kommentar" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -1039,7 +1039,7 @@ msgstr "Die Nutzlast ist kein gültiges json" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "Das Projekt existiert nicht" @@ -1127,6 +1127,85 @@ msgstr "Das referenzierte Element existiert nicht" msgid "The status doesn't exist" msgstr "Der Status existiert nicht" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Projekt ansehen" @@ -1312,7 +1391,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1397,7 +1476,7 @@ msgstr "Nr. unterschreidet sich zwischen dem Objekt und dem Projekt" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1420,7 +1499,7 @@ msgstr "Objekt Nr." #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1446,7 +1525,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1589,26 +1668,26 @@ msgstr "Dieser Name wird schon verwendet." msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "ref" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "Status" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "Betreff" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1616,23 +1695,28 @@ msgstr "Betreff" msgid "color" msgstr "Farbe" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "zugewiesen an" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "ist Kundenanforderung" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "ist Teamanforderung" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "User-Stories" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "externe Referenz" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1819,11 +1903,6 @@ msgstr "Meilenstein" msgid "finished date" msgstr "Datum der Fertigstellung" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "externe Referenz" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "Like" @@ -3850,29 +3929,29 @@ msgstr "Projekteigentümer " msgid "Stakeholder" msgstr "Stakeholder" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "Sie haben nicht die Berechtigung, diesen Sprint auf diese User-Story zu " "setzen." -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" "Sie haben nicht die Berechtigung, diesen Status auf diese User-Story zu " "setzen." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "Erstelle die User-Story #{ref} - {subject}" diff --git a/taiga/locale/en/LC_MESSAGES/django.po b/taiga/locale/en/LC_MESSAGES/django.po index 53faaa9f..235d52e8 100644 --- a/taiga/locale/en/LC_MESSAGES/django.po +++ b/taiga/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 12:07+0100\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" "PO-Revision-Date: 2015-03-25 20:09+0100\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Taiga Dev Team \n" @@ -949,25 +949,25 @@ msgstr "" msgid "The status doesn't exist" msgstr "" -#: taiga/importers/asana/api.py:44 taiga/importers/asana/api.py:86 -#: taiga/importers/github/api.py:45 taiga/importers/github/api.py:75 -#: taiga/importers/jira/api.py:56 taiga/importers/jira/api.py:102 +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 #: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 msgid "The project param is needed" msgstr "" -#: taiga/importers/asana/api.py:51 taiga/importers/asana/api.py:74 -#: taiga/importers/asana/api.py:131 +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 msgid "Invalid Asana API request" msgstr "" -#: taiga/importers/asana/api.py:53 taiga/importers/asana/api.py:76 -#: taiga/importers/asana/api.py:133 +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:126 taiga/importers/github/api.py:121 +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 msgid "Code param needed" msgstr "" @@ -975,11 +975,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:129 +#: taiga/importers/github/api.py:137 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:131 +#: taiga/importers/github/api.py:139 msgid "Third party service failing" msgstr "" @@ -987,17 +987,17 @@ msgstr "" msgid "Error importing GitHub project" msgstr "" -#: taiga/importers/jira/api.py:58 taiga/importers/jira/api.py:85 -#: taiga/importers/jira/api.py:105 taiga/importers/jira/api.py:178 +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 msgid "The url param is needed" msgstr "" -#: taiga/importers/jira/api.py:154 +#: taiga/importers/jira/api.py:155 msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:224 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:143 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 msgid "Invalid or expired auth token" msgstr "" diff --git a/taiga/locale/es/LC_MESSAGES/django.po b/taiga/locale/es/LC_MESSAGES/django.po index 07bb75c9..7e46da9f 100644 --- a/taiga/locale/es/LC_MESSAGES/django.po +++ b/taiga/locale/es/LC_MESSAGES/django.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 09:06+0000\n" -"Last-Translator: David Barragán \n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"Last-Translator: Taiga Dev Team \n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/es/)\n" "MIME-Version: 1.0\n" @@ -212,8 +212,8 @@ msgstr "Adjunta una imagen válida. El fichero no es una imagen o está dañada. #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Elemento bloqueado" @@ -928,7 +928,7 @@ msgstr "web" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -965,7 +965,7 @@ msgstr "comentario" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -1040,7 +1040,7 @@ msgstr "El payload no es un json válido" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "El proyecto no existe" @@ -1151,6 +1151,85 @@ msgstr "El elemento referenciado no existe" msgid "The status doesn't exist" msgstr "El estado no existe" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Ver proyecto" @@ -1336,7 +1415,7 @@ msgid "Fans" msgstr "Seguidores" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1421,7 +1500,7 @@ msgstr "El ID de proyecto no coincide entre el adjunto y un proyecto" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1444,7 +1523,7 @@ msgstr "id de objeto" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1470,7 +1549,7 @@ msgstr "desde comentario" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1637,26 +1716,26 @@ msgstr "Ya existe uno con el mismo nombre." msgid "You don't have permissions to set this status to this epic." msgstr "No tiene permisos para establecer el estado de este epic" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "ref" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "estado" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "Orden de epics" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "asunto" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1664,23 +1743,28 @@ msgstr "asunto" msgid "color" msgstr "color" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "asignado a" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "requerido por el cliente" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "requerido por el equipo" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "historias de usuario" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "referencia externa" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "No existe ninguna épica con ese id" @@ -1863,11 +1947,6 @@ msgstr "sprint" msgid "finished date" msgstr "fecha de finalización" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "referencia externa" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "Like" @@ -3966,27 +4045,27 @@ msgstr "Product Owner" msgid "Stakeholder" msgstr "Stakeholder" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "No tienes permisos para asignar este sprint a esta historia de usuario." -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" "No tienes permisos para asignar este estado a esta historia de usuario." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "Inválido id de rol '{role_id}'" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "Inválido id de punto de historia '{points_id}'" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "Generada la historia de usuario #{ref} - {subject}" diff --git a/taiga/locale/fi/LC_MESSAGES/django.po b/taiga/locale/fi/LC_MESSAGES/django.po index 9cdfec8f..bedd821d 100644 --- a/taiga/locale/fi/LC_MESSAGES/django.po +++ b/taiga/locale/fi/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fi/)\n" @@ -195,8 +195,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Estetty elementti" @@ -869,7 +869,7 @@ msgstr "" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -906,7 +906,7 @@ msgstr "kommentti" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -983,7 +983,7 @@ msgstr "The payload is not a valid json" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "Projektia ei löydy" @@ -1071,6 +1071,85 @@ msgstr "Viitattu elementtiä ei löydy" msgid "The status doesn't exist" msgstr "Tilaa ei löydy" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Katso projektia" @@ -1256,7 +1335,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1339,7 +1418,7 @@ msgstr "Projekti ID ei vastaa kohdetta ja projektia" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1362,7 +1441,7 @@ msgstr "objekti ID" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1388,7 +1467,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1531,26 +1610,26 @@ msgstr "Nimi on jo olemassa" msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "viittaus" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "tila" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "aihe" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1558,23 +1637,28 @@ msgstr "aihe" msgid "color" msgstr "väri" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "tekijä" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "on asiakkaan vaatimus" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "on tiimin vaatimus" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "ulkoinen viittaus" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1757,11 +1841,6 @@ msgstr "virstapylväs" msgid "finished date" msgstr "loppupvm" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "ulkoinen viittaus" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "" @@ -3724,25 +3803,25 @@ msgstr "Tuoteomistaja" msgid "Stakeholder" msgstr "Sidosryhmä" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "" diff --git a/taiga/locale/fr/LC_MESSAGES/django.po b/taiga/locale/fr/LC_MESSAGES/django.po index c70d9109..262b2d5c 100644 --- a/taiga/locale/fr/LC_MESSAGES/django.po +++ b/taiga/locale/fr/LC_MESSAGES/django.po @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fr/)\n" @@ -221,8 +221,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Élément bloqué" @@ -903,7 +903,7 @@ msgstr "web" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -940,7 +940,7 @@ msgstr "Commentaire" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -1015,7 +1015,7 @@ msgstr "Le payload n'est pas un json valide" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "Le projet n'existe pas" @@ -1103,6 +1103,85 @@ msgstr "L'élément référencé n'existe pas" msgid "The status doesn't exist" msgstr "L'état n'existe pas" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Consulter le projet" @@ -1288,7 +1367,7 @@ msgid "Fans" msgstr "Fans" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1373,7 +1452,7 @@ msgstr "L'identifiant du projet de correspond pas entre l'objet et le projet" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1396,7 +1475,7 @@ msgstr "identifiant de l'objet" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1422,7 +1501,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1565,26 +1644,26 @@ msgstr "Un élément de même nom existe déjà" msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "réf" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "état" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "sujet" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1592,23 +1671,28 @@ msgstr "sujet" msgid "color" msgstr "couleur" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "assigné à" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "est un requis client" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "est un requis de l'équipe" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "référence externe" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1791,11 +1875,6 @@ msgstr "jalon" msgid "finished date" msgstr "date de fin" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "référence externe" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "Aimer" @@ -3554,27 +3633,27 @@ msgstr "Product Owner" msgid "Stakeholder" msgstr "Participant" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "Vous n'avez pas la permission d'affecter ce sprint à ce récit utilisateur." -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" "Vous n'avez pas la permission d'affecter ce statut à ce récit utilisateur." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "" diff --git a/taiga/locale/it/LC_MESSAGES/django.po b/taiga/locale/it/LC_MESSAGES/django.po index 65c55de1..98d7e7f0 100644 --- a/taiga/locale/it/LC_MESSAGES/django.po +++ b/taiga/locale/it/LC_MESSAGES/django.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/it/)\n" @@ -205,8 +205,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Elemento bloccato" @@ -980,7 +980,7 @@ msgstr "web" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -1017,7 +1017,7 @@ msgstr "Commento" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -1098,7 +1098,7 @@ msgstr "Il carico non è un json valido" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "Il progetto non esiste" @@ -1207,6 +1207,85 @@ msgstr "L'elemento di riferimento non esiste" msgid "The status doesn't exist" msgstr "Lo stato non esiste" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Vedi progetto" @@ -1392,7 +1471,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1477,7 +1556,7 @@ msgstr "L'ID di progetto non corrisponde tra oggetto e progetto" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1500,7 +1579,7 @@ msgstr "ID dell'oggetto" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1526,7 +1605,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1669,26 +1748,26 @@ msgstr "Ne esiste già un altro con lo stesso nome" msgid "You don't have permissions to set this status to this epic." msgstr "Non hai i permessi per impostare lo stato a questo epico." -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "referenza" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "stato" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "ordine epici" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "soggeto" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1696,23 +1775,28 @@ msgstr "soggeto" msgid "color" msgstr "colore" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "assegnato a" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "é un requisito del cliente " -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "é una richiesta del team" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "storie utente" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "referenza esterna" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "Non ci sono epici con questo id" @@ -1895,11 +1979,6 @@ msgstr "tappa" msgid "finished date" msgstr "data di conclusione" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "referenza esterna" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "Like" @@ -4153,26 +4232,26 @@ msgstr "Product Owner" msgid "Stakeholder" msgstr "Stakeholder" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "Non hai i permessi per aggiungere questo sprint a questa storia utente." -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "Non hai i permessi per aggiungere questo stato a questa storia utente." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "id ruolo '{role_id}' non valido" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "id punti '{points_id}' non valido" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "Stiamo generando la storia utente #{ref} - {subject}" diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po index 902c2a73..e9fb7663 100644 --- a/taiga/locale/ja/LC_MESSAGES/django.po +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Japanese (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ja/)\n" @@ -203,8 +203,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "ブロックされた要素" @@ -916,7 +916,7 @@ msgstr "ウェブ" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -953,7 +953,7 @@ msgstr "コメント" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -1030,7 +1030,7 @@ msgstr "ペイロードは有効なjsonではありません。" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "プロジェクトは存在していません。" @@ -1141,6 +1141,85 @@ msgstr "参照された要素は存在しません。" msgid "The status doesn't exist" msgstr "ステータスは存在しません。" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "プロジェクトを見る" @@ -1326,7 +1405,7 @@ msgid "Fans" msgstr "ファン" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1411,7 +1490,7 @@ msgstr "" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1434,7 +1513,7 @@ msgstr "オブジェクトID" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1460,7 +1539,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1603,26 +1682,26 @@ msgstr "同じ名前のものがすでに存在します。" msgid "You don't have permissions to set this status to this epic." msgstr "このエピックにこのステータスを付与する権限がありません。" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "ステータス" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "件名" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1630,23 +1709,28 @@ msgstr "件名" msgid "color" msgstr "色" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "担当者" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "クライアントの要件" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "チームの要件" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "ユーザストーリ" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "外部参照" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "このIDのエピックは存在しません。" @@ -1829,11 +1913,6 @@ msgstr "マイルストーン" msgid "finished date" msgstr "完了日時" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "外部参照" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "いいね" @@ -3501,25 +3580,25 @@ msgstr "プロダクトオーナー" msgid "Stakeholder" msgstr "" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "" diff --git a/taiga/locale/ko/LC_MESSAGES/django.po b/taiga/locale/ko/LC_MESSAGES/django.po index eeb2f9f2..aed2fe9b 100644 --- a/taiga/locale/ko/LC_MESSAGES/django.po +++ b/taiga/locale/ko/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Korean (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ko/)\n" @@ -200,8 +200,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "차단된 엘리먼트" @@ -916,7 +916,7 @@ msgstr "웹" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -953,7 +953,7 @@ msgstr "댓글" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -1029,7 +1029,7 @@ msgstr "페이로드의 json이 유효하지 않습니다." #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "프로젝트가 존재하지 않습니다." @@ -1136,6 +1136,85 @@ msgstr "참조된 엘리먼트가 존재하지 않습니다." msgid "The status doesn't exist" msgstr "상태가 존재하지 않습니다." +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "프로젝트 보기" @@ -1321,7 +1400,7 @@ msgid "Fans" msgstr "좋아요" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1406,7 +1485,7 @@ msgstr "프로젝트 아이디가 객체와 프로젝트간에 알맞지 않습 #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1429,7 +1508,7 @@ msgstr "객체 아이디" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1455,7 +1534,7 @@ msgstr "댓글로부터" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1618,26 +1697,26 @@ msgstr "이미 동일한 이름이 존재합니다." msgid "You don't have permissions to set this status to this epic." msgstr "이 에픽의 상태를 설정할 권한이 없습니다." -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "참조" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "상태" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "에픽 순서" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "제목" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1645,23 +1724,28 @@ msgstr "제목" msgid "color" msgstr "색" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "할당됨" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "고객 요구 사항" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "팀 요구 사항" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "유저 스토리" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "외부 참조" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "아이디를 가진 에픽이 없습니다." @@ -1844,11 +1928,6 @@ msgstr "마일스톤" msgid "finished date" msgstr "종료된 날짜" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "외부 참조" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "좋아요" @@ -1914,7 +1993,7 @@ msgstr "'project' 매개변수는 필수입니다." #: taiga/projects/mixins/validators.py:19 msgid "The user must be a project member." -msgstr "" +msgstr "반드시 프로젝트 회원이어야 합니다." #: taiga/projects/models.py:79 msgid "email" @@ -3959,25 +4038,25 @@ msgstr "제품 소유자" msgid "Stakeholder" msgstr "이해관계자" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "이 유저 스토리를 스프린트에 설정할 권한이 없습니다." -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "이 유저 스토리의 상태를 설정할 권한이 없습니다." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "'{role_id}' 역할 아이디는 유효하지 않습니다." -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "'{points_id}' 포인트 아이디는 유효하지 않습니다." -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "유저 스토리 생성 #{ref} - {subject}" diff --git a/taiga/locale/nb/LC_MESSAGES/django.po b/taiga/locale/nb/LC_MESSAGES/django.po index 6eb57831..58bd5a35 100644 --- a/taiga/locale/nb/LC_MESSAGES/django.po +++ b/taiga/locale/nb/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/nb/)\n" @@ -194,8 +194,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Blokkert element" @@ -785,7 +785,7 @@ msgstr "web" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -822,7 +822,7 @@ msgstr "kommentar" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -898,7 +898,7 @@ msgstr "Payloaden er ikke gyldig json" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "Prosjektet eksisterer ikke" @@ -986,6 +986,85 @@ msgstr "Det refererte elementet finnes ikke" msgid "The status doesn't exist" msgstr "Statusen eksisterer ikke" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Vis prosjekt" @@ -1171,7 +1250,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1256,7 +1335,7 @@ msgstr "Prosjekt ID matcher ikke mellom objekt og prosjekt" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1279,7 +1358,7 @@ msgstr "objektid" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1305,7 +1384,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1448,26 +1527,26 @@ msgstr "Det finnes allerede en med samme navn." msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "ref" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "status" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "subjekt" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1475,23 +1554,28 @@ msgstr "subjekt" msgid "color" msgstr "farge" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "tildelt til" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "Er klientkrav" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "Er team behov" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "ekstern referanse" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1677,11 +1761,6 @@ msgstr "milepæl" msgid "finished date" msgstr "Sluttdato" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "ekstern referanse" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "Liker" @@ -3357,27 +3436,27 @@ msgstr "Produkteier" msgid "Stakeholder" msgstr "Interessent" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "Du har ikke tillatelse til å sette denne sprinten til denne brukerhistorien." -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" "Du har ikke tillatelse til å sette denne statusen til denne brukerhistorien." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "Genererer brukerhistorien #{ref} - {subject}" diff --git a/taiga/locale/nl/LC_MESSAGES/django.po b/taiga/locale/nl/LC_MESSAGES/django.po index a7cdaf3e..51ac720a 100644 --- a/taiga/locale/nl/LC_MESSAGES/django.po +++ b/taiga/locale/nl/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/nl/)\n" @@ -203,8 +203,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" @@ -815,7 +815,7 @@ msgstr "" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -852,7 +852,7 @@ msgstr "commentaar" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -928,7 +928,7 @@ msgstr "De payload is geen geldige json" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "Het project bestaat niet" @@ -1016,6 +1016,85 @@ msgstr "Het element waarnaar verwezen wordt bestaat niet" msgid "The status doesn't exist" msgstr "De status bestaat niet" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Bekijk project" @@ -1201,7 +1280,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1284,7 +1363,7 @@ msgstr "Project ID van object is niet gelijk aan die van het project" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1307,7 +1386,7 @@ msgstr "object id" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1333,7 +1412,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1476,26 +1555,26 @@ msgstr "Er bestaat er al één met dezelfde naam." msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "ref" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "status" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "onderwerp" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1503,23 +1582,28 @@ msgstr "onderwerp" msgid "color" msgstr "kleur" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "toegewezen aan" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "is requirement van de klant" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "is requirement van het team" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "externe referentie" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1704,11 +1788,6 @@ msgstr "milestone" msgid "finished date" msgstr "datum van afwerking" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "externe referentie" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "Vind ik leuk" @@ -3430,25 +3509,25 @@ msgstr "Product Owner" msgid "Stakeholder" msgstr "Stakeholder" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "" diff --git a/taiga/locale/pl/LC_MESSAGES/django.po b/taiga/locale/pl/LC_MESSAGES/django.po index cdc8538b..37dd69ba 100644 --- a/taiga/locale/pl/LC_MESSAGES/django.po +++ b/taiga/locale/pl/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/pl/)\n" @@ -19,8 +19,9 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n" +"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #: taiga/auth/api.py:74 msgid "Public register is disabled." @@ -197,8 +198,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" @@ -883,7 +884,7 @@ msgstr "web" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -920,7 +921,7 @@ msgstr "komentarz" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -996,7 +997,7 @@ msgstr "Źródło nie jest prawidłowym plikiem json" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "Projekt nie istnieje" @@ -1084,6 +1085,85 @@ msgstr "Element referencyjny nie istnieje" msgid "The status doesn't exist" msgstr "Status nie istnieje" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Zobacz projekt" @@ -1269,7 +1349,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1352,7 +1432,7 @@ msgstr "ID nie pasuje pomiędzy obiektem a projektem" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1375,7 +1455,7 @@ msgstr "id obiektu" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1401,7 +1481,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1544,26 +1624,26 @@ msgstr "Już istnieje jeden z taką nazwą." msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "ref" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "status" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "temat" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1571,23 +1651,28 @@ msgstr "temat" msgid "color" msgstr "kolor" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "przypisane do" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "wymaganie klienta" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "wymaganie zespołu" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "źródło zgłoszenia" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1770,11 +1855,6 @@ msgstr "kamień milowy" msgid "finished date" msgstr "data zakończenia" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "źródło zgłoszenia" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "" @@ -3755,27 +3835,27 @@ msgstr "Właściciel produktu" msgid "Stakeholder" msgstr "Interesariusz" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "Nie masz uprawnień do ustawiania sprintu dla tej historyjki użytkownika." -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" "Nie masz uprawnień do ustawiania statusu do tej historyjki użytkownika." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "" diff --git a/taiga/locale/pt_BR/LC_MESSAGES/django.po b/taiga/locale/pt_BR/LC_MESSAGES/django.po index 957e60ad..84abac6a 100644 --- a/taiga/locale/pt_BR/LC_MESSAGES/django.po +++ b/taiga/locale/pt_BR/LC_MESSAGES/django.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/pt_BR/)\n" @@ -208,8 +208,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Elemento bloqeado" @@ -915,7 +915,7 @@ msgstr "web" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -952,7 +952,7 @@ msgstr "comentário" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -1028,7 +1028,7 @@ msgstr "A carga não é um json válido" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "O projeto não existe" @@ -1116,6 +1116,85 @@ msgstr "O elemento referenciado não existe" msgid "The status doesn't exist" msgstr "O estatus não existe" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Ver projeto" @@ -1301,7 +1380,7 @@ msgid "Fans" msgstr "Fãs" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1386,7 +1465,7 @@ msgstr "ID do projeto não combina entre objeto e projeto" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1409,7 +1488,7 @@ msgstr "identidade de objeto" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1435,7 +1514,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1578,26 +1657,26 @@ msgstr "Já existe um com o mesmo nome." msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "ref" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "status" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "assunto" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1605,23 +1684,28 @@ msgstr "assunto" msgid "color" msgstr "cor" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "assinado a" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "É requerimento do cliente" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "É requerimento do time" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "referência externa" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1805,11 +1889,6 @@ msgstr "marco de progresso" msgid "finished date" msgstr "data de término" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "referência externa" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "Curtir" @@ -3786,29 +3865,29 @@ msgstr "Product Owner" msgid "Stakeholder" msgstr "Stakeholder" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "Você não tem permissão para colocar esse sprint para essa história de " "usuário." -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" "Você não tem permissão para colocar esse status para essa história de " "usuário." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "Gerando a história de usuário #{ref} - {subject}" diff --git a/taiga/locale/ru/LC_MESSAGES/django.po b/taiga/locale/ru/LC_MESSAGES/django.po index 5dd0e49f..07838035 100644 --- a/taiga/locale/ru/LC_MESSAGES/django.po +++ b/taiga/locale/ru/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ # Egor Poderyagin , 2016 # Igor Bezukladnikov , 2016 # ilyar, 2016 -# ivan tkachenko , 2016 +# ratijas , 2016 # Sergey Kustov , 2016 # Марат , 2015 # Никита Евстропов , 2016 @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ru/)\n" @@ -210,8 +210,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Заблокированный элемент" @@ -907,7 +907,7 @@ msgstr "веб" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -944,7 +944,7 @@ msgstr "комментарий" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -1020,7 +1020,7 @@ msgstr "Нагрузочный файл не является правильны #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "Проект не существует" @@ -1111,6 +1111,85 @@ msgstr "Указанный элемент не существует" msgid "The status doesn't exist" msgstr "Статус не существует" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Просмотреть проект" @@ -1296,7 +1375,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1381,7 +1460,7 @@ msgstr "Идентификатор проекта не подходит к эт #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1404,7 +1483,7 @@ msgstr "идентификатор объекта" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1430,7 +1509,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1573,26 +1652,26 @@ msgstr "Это имя уже используется." msgid "You don't have permissions to set this status to this epic." msgstr "У вас нет разрешения для установки статуса этому эпосу" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "Ссылка" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "cтатус" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "порядок эпосов" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "тема" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1600,23 +1679,28 @@ msgstr "тема" msgid "color" msgstr "цвет" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "назначено" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "является требованием клиента" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "является требованием команды" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "пользовательские истории" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "внешняя ссылка" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "Не существует эпоса с таким идентификатором" @@ -1803,11 +1887,6 @@ msgstr "веха" msgid "finished date" msgstr "дата завершения" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "внешняя ссылка" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "Лайк" @@ -3870,27 +3949,27 @@ msgstr "Владелец продукта" msgid "Stakeholder" msgstr "Заинтересованная сторона" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "У вас нет прав чтобы установить спринт для этой пользовательской истории." -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" "У вас нет прав чтобы установить статус для этой пользовательской истории." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "Неверный id роли '{role_id}'" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "Генерируется пользовательская история #{ref} - {subject}" diff --git a/taiga/locale/sv/LC_MESSAGES/django.po b/taiga/locale/sv/LC_MESSAGES/django.po index 5ec1f73a..e9eecfb6 100644 --- a/taiga/locale/sv/LC_MESSAGES/django.po +++ b/taiga/locale/sv/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Swedish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/sv/)\n" @@ -196,8 +196,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" @@ -782,7 +782,7 @@ msgstr "Internet" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -819,7 +819,7 @@ msgstr "kommentera" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -879,7 +879,7 @@ msgstr "Datasträngen är inte korrekt json" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "Projektet existerar inte" @@ -967,6 +967,85 @@ msgstr "Referenselementet existerar inte" msgid "The status doesn't exist" msgstr "Statusen existerar inte" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Visa projekt" @@ -1152,7 +1231,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1235,7 +1314,7 @@ msgstr "Projekt-ID stämmer inte mellan objekt och projekt" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1258,7 +1337,7 @@ msgstr "objekt-ID" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1284,7 +1363,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1427,26 +1506,26 @@ msgstr "Existerar redan med samma namn. " msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "ref" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "status" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "titel" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1454,23 +1533,28 @@ msgstr "titel" msgid "color" msgstr "färg" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "Tilldelad till" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "är ett beställarkrav" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "är ett krav från arbetsgruppen" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "extern referens" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1653,11 +1737,6 @@ msgstr "milstolpe" msgid "finished date" msgstr "färdig datum" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "extern referens" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "Gillar" @@ -3335,28 +3414,28 @@ msgstr "Produktägare" msgid "Stakeholder" msgstr "Intressent" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "Du har inte behörighet för att lägga sprinten till den här användarhistorien" -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "" "Du har inte behörighet till att sätta den här statusen till " "användarhistorien." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "Skapar användarhistorie #{ref} - {subject}" diff --git a/taiga/locale/tr/LC_MESSAGES/django.po b/taiga/locale/tr/LC_MESSAGES/django.po index 7a6ca7d7..87cd1276 100644 --- a/taiga/locale/tr/LC_MESSAGES/django.po +++ b/taiga/locale/tr/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Turkish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/tr/)\n" @@ -204,8 +204,8 @@ msgstr "" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Engellenmiş nesne" @@ -877,7 +877,7 @@ msgstr "web" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -914,7 +914,7 @@ msgstr "yorum" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -988,7 +988,7 @@ msgstr "" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "Proje mevcut değil." @@ -1076,6 +1076,85 @@ msgstr "Referans gösterilmiş varlık mevcut değil" msgid "The status doesn't exist" msgstr "Durum mevcut değil" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "Projeyi gör" @@ -1261,7 +1340,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1344,7 +1423,7 @@ msgstr "Proje ve nesne arasında Proje ID uyuşmazlığı mevcut" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1367,7 +1446,7 @@ msgstr "nesne id" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1393,7 +1472,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1536,26 +1615,26 @@ msgstr "Aynı isimler bir tane daha mevcut." msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "ref" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "durum" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "konu" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1563,23 +1642,28 @@ msgstr "konu" msgid "color" msgstr "renk" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "atanmış" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "istemci gereksinimi" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "takım gereksinimi" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "dış referans" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1762,11 +1846,6 @@ msgstr "aşama" msgid "finished date" msgstr "bitirme tarihi" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "dış referans" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "Beğen" @@ -3512,25 +3591,25 @@ msgstr "Ürün Sahibi" msgid "Stakeholder" msgstr "Paydaş" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "Bu kullanıcı hikayesine bu sprinti ayarlama izniniz yok." -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "Bu kullanıcı hikayesine bu durumu ayarlama yetkiniz yok." -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "" diff --git a/taiga/locale/zh-Hans/LC_MESSAGES/django.po b/taiga/locale/zh-Hans/LC_MESSAGES/django.po index 73e12c44..d032baac 100644 --- a/taiga/locale/zh-Hans/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hans/LC_MESSAGES/django.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Simplified (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hans/)\n" @@ -197,8 +197,8 @@ msgstr "请上传一张有效的图片。所上传的不是图片或已损坏" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "冻结的元素" @@ -908,7 +908,7 @@ msgstr "网页" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -945,7 +945,7 @@ msgstr "评论" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -1021,7 +1021,7 @@ msgstr "内容不是一个合法的JSON" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "项目不存在" @@ -1127,6 +1127,85 @@ msgstr "引用的元素不存在" msgid "The status doesn't exist" msgstr "状态不存在" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "查看项目" @@ -1312,7 +1391,7 @@ msgid "Fans" msgstr "粉丝" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1395,7 +1474,7 @@ msgstr "对象和项目间的项目ID不匹配" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1418,7 +1497,7 @@ msgstr "对象id" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1444,7 +1523,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1587,26 +1666,26 @@ msgstr "已经存在" msgid "You don't have permissions to set this status to this epic." msgstr "你无权设置这个史诗的状态" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "参照" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "状态" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "史诗次序" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "主题" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1614,23 +1693,28 @@ msgstr "主题" msgid "color" msgstr "颜色" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "指派给" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "客户需求" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "团队需求" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "用户故事" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "外部引用" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "指定ID无史诗" @@ -1813,11 +1897,6 @@ msgstr "里程碑" msgid "finished date" msgstr "完成日期" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "外部引用" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "点赞" @@ -3865,25 +3944,25 @@ msgstr "产品所有者" msgid "Stakeholder" msgstr "相关人员" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "你无权对这个用户故事设置此冲刺任务。" -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "你无权对这个用户故事设置此状态。" -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "无效的角色ID '{role_id}'" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "无效的点数ID '{points_id}'" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "生成用户故事#{ref} - {subject}" diff --git a/taiga/locale/zh-Hant/LC_MESSAGES/django.po b/taiga/locale/zh-Hant/LC_MESSAGES/django.po index e6d12aa7..ed4fab5c 100644 --- a/taiga/locale/zh-Hant/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hant/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-09 09:12+0100\n" -"PO-Revision-Date: 2017-02-09 08:12+0000\n" +"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"PO-Revision-Date: 2017-02-15 11:08+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hant/)\n" @@ -190,8 +190,8 @@ msgstr "上傳有效圖片，你所上傳的檔案非圖檔或已損壞" #: taiga/projects/api.py:754 taiga/projects/epics/api.py:200 #: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 #: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 -#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 -#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:323 +#: taiga/projects/userstories/api.py:375 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" @@ -863,7 +863,7 @@ msgstr "網頁" #: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:37 -#: taiga/projects/epics/models.py:55 +#: taiga/projects/epics/models.py:56 #: taiga/projects/history/templatetags/functions.py:25 #: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 #: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 @@ -900,7 +900,7 @@ msgstr "評論" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 #: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 -#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/epics/models.py:49 taiga/projects/issues/models.py:52 #: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 #: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 @@ -973,7 +973,7 @@ msgstr "載荷為無效json" #: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 #: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 -#: taiga/projects/userstories/api.py:276 +#: taiga/projects/userstories/api.py:277 msgid "The project doesn't exist" msgstr "專案不存在" @@ -1061,6 +1061,85 @@ msgstr "參考元素不存在" msgid "The status doesn't exist" msgstr "狀態不存在" +#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 +#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 +#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 +#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +msgid "The project param is needed" +msgstr "" + +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 +msgid "Invalid Asana API request" +msgstr "" + +#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 +#: taiga/importers/asana/api.py:143 +msgid "Failed to make the request to Asana API" +msgstr "" + +#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +msgid "Code param needed" +msgstr "" + +#: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 +msgid "Error importing Asana project" +msgstr "" + +#: taiga/importers/github/api.py:137 +msgid "Invalid auth data" +msgstr "" + +#: taiga/importers/github/api.py:139 +msgid "Third party service failing" +msgstr "" + +#: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 +msgid "Error importing GitHub project" +msgstr "" + +#: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 +#: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 +msgid "The url param is needed" +msgstr "" + +#: taiga/importers/jira/api.py:155 +msgid "Invalid project_type {}" +msgstr "" + +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 +#: taiga/importers/trello/api.py:144 +msgid "Invalid or expired auth token" +msgstr "" + +#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +msgid "Error importing Jira project" +msgstr "" + +#: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 +msgid "Error importing PivotalTracker project" +msgstr "" + +#: taiga/importers/trello/importer.py:77 +#, python-format +msgid "Invalid Request: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#, python-format +msgid "Unauthorized: %s at %s" +msgstr "" + +#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#, python-format +msgid "Resource Unavailable: %s at %s" +msgstr "" + +#: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 +msgid "Error importing Trello project" +msgstr "" + #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" msgstr "檢視專案" @@ -1246,7 +1325,7 @@ msgid "Fans" msgstr "" #: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 -#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/epics/models.py:40 taiga/projects/issues/models.py:37 #: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 @@ -1329,7 +1408,7 @@ msgstr "專案ID不符合物件與專案" #: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 -#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/epics/models.py:38 taiga/projects/issues/models.py:50 #: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 #: taiga/projects/models.py:528 taiga/projects/models.py:565 #: taiga/projects/models.py:593 taiga/projects/models.py:619 @@ -1352,7 +1431,7 @@ msgstr "物件ID" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 -#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/epics/models.py:52 taiga/projects/issues/models.py:55 #: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 #: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 @@ -1378,7 +1457,7 @@ msgstr "" #: taiga/projects/attachments/models.py:63 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/epics/models.py:104 taiga/projects/milestones/models.py:57 #: taiga/projects/models.py:522 taiga/projects/models.py:555 #: taiga/projects/models.py:589 taiga/projects/models.py:613 #: taiga/projects/models.py:645 taiga/projects/models.py:665 @@ -1521,26 +1600,26 @@ msgstr "已存在相同姓名" msgid "You don't have permissions to set this status to this epic." msgstr "" -#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/epics/models.py:36 taiga/projects/issues/models.py:35 #: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 msgid "ref" msgstr "ref" -#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/epics/models.py:43 taiga/projects/issues/models.py:39 #: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 msgid "status" msgstr "狀態" -#: taiga/projects/epics/models.py:45 +#: taiga/projects/epics/models.py:46 msgid "epics order" msgstr "" -#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/epics/models.py:55 taiga/projects/issues/models.py:59 #: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 msgid "subject" msgstr "主旨" -#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/epics/models.py:59 taiga/projects/models.py:526 #: taiga/projects/models.py:561 taiga/projects/models.py:617 #: taiga/projects/models.py:647 taiga/projects/models.py:667 #: taiga/projects/models.py:691 taiga/projects/models.py:719 @@ -1548,23 +1627,28 @@ msgstr "主旨" msgid "color" msgstr "顏色" -#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/epics/models.py:62 taiga/projects/issues/models.py:63 #: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 msgid "assigned to" msgstr "指派給" -#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +#: taiga/projects/epics/models.py:64 taiga/projects/userstories/models.py:100 msgid "is client requirement" msgstr "客戶要求" -#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +#: taiga/projects/epics/models.py:66 taiga/projects/userstories/models.py:102 msgid "is team requirement" msgstr "團隊要求" -#: taiga/projects/epics/models.py:69 +#: taiga/projects/epics/models.py:70 msgid "user stories" msgstr "" +#: taiga/projects/epics/models.py:72 taiga/projects/issues/models.py:66 +#: taiga/projects/tasks/models.py:70 taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "外部參考" + #: taiga/projects/epics/validators.py:37 msgid "There's no epic with that id" msgstr "" @@ -1747,11 +1831,6 @@ msgstr "里程碑" msgid "finished date" msgstr "完成日期" -#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 -#: taiga/projects/userstories/models.py:109 -msgid "external reference" -msgstr "外部參考" - #: taiga/projects/likes/models.py:36 msgid "Like" msgstr "喜歡" @@ -3711,25 +3790,25 @@ msgstr "產品所有人" msgid "Stakeholder" msgstr "利害關係人" -#: taiga/projects/userstories/api.py:127 +#: taiga/projects/userstories/api.py:128 msgid "You don't have permissions to set this sprint to this user story." msgstr "無權限更動使用者故事的衝刺任務" -#: taiga/projects/userstories/api.py:131 +#: taiga/projects/userstories/api.py:132 msgid "You don't have permissions to set this status to this user story." msgstr "無權限更動此使用者故事的狀態" -#: taiga/projects/userstories/api.py:221 +#: taiga/projects/userstories/api.py:222 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "" -#: taiga/projects/userstories/api.py:228 +#: taiga/projects/userstories/api.py:229 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:243 +#: taiga/projects/userstories/api.py:244 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "産生使用者故事 #{ref} - {subject}" From 8dbd3df40ef6cb346a4b1989e2a55154c9792567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 20 Feb 2017 17:58:01 +0100 Subject: [PATCH 115/144] Update copyright --- manage.py | 8 ++++---- settings/__init__.py | 8 ++++---- settings/celery.py | 8 ++++---- settings/common.py | 8 ++++---- settings/development.py | 8 ++++---- settings/local.py.example | 8 ++++---- settings/sr.py | 8 ++++---- settings/testing.py | 8 ++++---- settings/travis.py | 8 ++++---- taiga/__init__.py | 8 ++++---- taiga/auth/api.py | 8 ++++---- taiga/auth/backends.py | 8 ++++---- taiga/auth/permissions.py | 6 +++--- taiga/auth/services.py | 8 ++++---- taiga/auth/signals.py | 8 ++++---- taiga/auth/throttling.py | 8 ++++---- taiga/auth/tokens.py | 8 ++++---- taiga/auth/validators.py | 8 ++++---- taiga/base/__init__.py | 8 ++++---- taiga/base/api/__init__.py | 8 ++++---- taiga/base/api/authentication.py | 8 ++++---- taiga/base/api/fields.py | 8 ++++---- taiga/base/api/generics.py | 8 ++++---- taiga/base/api/mixins.py | 8 ++++---- taiga/base/api/negotiation.py | 8 ++++---- taiga/base/api/pagination.py | 8 ++++---- taiga/base/api/parsers.py | 8 ++++---- taiga/base/api/permissions.py | 8 ++++---- taiga/base/api/relations.py | 8 ++++---- taiga/base/api/renderers.py | 8 ++++---- taiga/base/api/request.py | 8 ++++---- taiga/base/api/reverse.py | 8 ++++---- taiga/base/api/serializers.py | 8 ++++---- taiga/base/api/settings.py | 8 ++++---- taiga/base/api/throttling.py | 8 ++++---- taiga/base/api/urlpatterns.py | 8 ++++---- taiga/base/api/utils.py | 8 ++++---- taiga/base/api/utils/__init__.py | 8 ++++---- taiga/base/api/utils/encoders.py | 8 ++++---- taiga/base/api/utils/formatting.py | 8 ++++---- taiga/base/api/utils/mediatypes.py | 8 ++++---- taiga/base/api/validators.py | 8 ++++---- taiga/base/api/views.py | 8 ++++---- taiga/base/api/viewsets.py | 8 ++++---- taiga/base/apps.py | 8 ++++---- taiga/base/connectors/exceptions.py | 8 ++++---- taiga/base/db/models/fields/__init__.py | 8 ++++---- taiga/base/db/models/fields/json.py | 8 ++++---- taiga/base/decorators.py | 8 ++++---- taiga/base/exceptions.py | 8 ++++---- taiga/base/fields.py | 8 ++++---- taiga/base/filters.py | 8 ++++---- taiga/base/formats/en/formats.py | 8 ++++---- taiga/base/formats/es/formats.py | 8 ++++---- taiga/base/mails.py | 8 ++++---- taiga/base/management/commands/test_emails.py | 8 ++++---- taiga/base/middleware/cors.py | 8 ++++---- taiga/base/neighbors.py | 10 +++++----- taiga/base/response.py | 10 +++++----- taiga/base/routers.py | 8 ++++---- taiga/base/signals/cleanup_files.py | 8 ++++---- taiga/base/signals/thumbnails.py | 8 ++++---- taiga/base/status.py | 8 ++++---- taiga/base/storage.py | 8 ++++---- taiga/base/throttling.py | 8 ++++---- taiga/base/utils/collections.py | 8 ++++---- taiga/base/utils/colors.py | 8 ++++---- taiga/base/utils/contenttypes.py | 8 ++++---- taiga/base/utils/db.py | 8 ++++---- taiga/base/utils/dicts.py | 8 ++++---- taiga/base/utils/diff.py | 8 ++++---- taiga/base/utils/files.py | 8 ++++---- taiga/base/utils/functions.py | 10 +++++----- taiga/base/utils/iterators.py | 10 +++++----- taiga/base/utils/json.py | 8 ++++---- taiga/base/utils/signals.py | 10 +++++----- taiga/base/utils/slug.py | 8 ++++---- taiga/base/utils/text.py | 8 ++++---- taiga/base/utils/thumbnails.py | 8 ++++---- taiga/base/utils/time.py | 8 ++++---- taiga/base/utils/urls.py | 10 +++++----- taiga/celery.py | 8 ++++---- taiga/deferred.py | 8 ++++---- taiga/events/__init__.py | 8 ++++---- taiga/events/apps.py | 8 ++++---- taiga/events/backends/__init__.py | 8 ++++---- taiga/events/backends/base.py | 2 +- taiga/events/backends/postgresql.py | 2 +- taiga/events/backends/rabbitmq.py | 2 +- taiga/events/events.py | 8 ++++---- .../management/commands/emit_notification_message.py | 8 ++++---- taiga/events/middleware.py | 8 ++++---- taiga/events/signal_handlers.py | 8 ++++---- taiga/export_import/api.py | 8 ++++---- taiga/export_import/exceptions.py | 8 ++++---- .../management/commands/dump_project.py | 8 ++++---- .../management/commands/dump_project_async.py | 8 ++++---- taiga/export_import/management/commands/load_dump.py | 8 ++++---- taiga/export_import/mixins.py | 8 ++++---- taiga/export_import/permissions.py | 8 ++++---- taiga/export_import/renderers.py | 8 ++++---- taiga/export_import/serializers/__init__.py | 8 ++++---- taiga/export_import/serializers/cache.py | 8 ++++---- taiga/export_import/serializers/fields.py | 8 ++++---- taiga/export_import/serializers/mixins.py | 8 ++++---- taiga/export_import/serializers/serializers.py | 8 ++++---- taiga/export_import/services/__init__.py | 8 ++++---- taiga/export_import/services/render.py | 8 ++++---- taiga/export_import/services/store.py | 8 ++++---- taiga/export_import/tasks.py | 8 ++++---- taiga/export_import/throttling.py | 8 ++++---- taiga/export_import/validators/cache.py | 8 ++++---- taiga/export_import/validators/fields.py | 8 ++++---- taiga/export_import/validators/mixins.py | 8 ++++---- taiga/export_import/validators/validators.py | 8 ++++---- taiga/external_apps/admin.py | 8 ++++---- taiga/external_apps/api.py | 8 ++++---- taiga/external_apps/auth_backends.py | 8 ++++---- taiga/external_apps/models.py | 8 ++++---- taiga/external_apps/permissions.py | 8 ++++---- taiga/external_apps/serializers.py | 8 ++++---- taiga/external_apps/services.py | 8 ++++---- taiga/external_apps/validators.py | 8 ++++---- taiga/feedback/__init__.py | 8 ++++---- taiga/feedback/admin.py | 8 ++++---- taiga/feedback/api.py | 8 ++++---- taiga/feedback/apps.py | 8 ++++---- taiga/feedback/models.py | 8 ++++---- taiga/feedback/permissions.py | 8 ++++---- taiga/feedback/routers.py | 8 ++++---- taiga/feedback/services.py | 8 ++++---- taiga/feedback/validators.py | 8 ++++---- taiga/front/sitemaps/__init__.py | 8 ++++---- taiga/front/sitemaps/base.py | 8 ++++---- taiga/front/sitemaps/epics.py | 8 ++++---- taiga/front/sitemaps/generics.py | 8 ++++---- taiga/front/sitemaps/issues.py | 8 ++++---- taiga/front/sitemaps/milestones.py | 8 ++++---- taiga/front/sitemaps/projects.py | 8 ++++---- taiga/front/sitemaps/tasks.py | 8 ++++---- taiga/front/sitemaps/users.py | 8 ++++---- taiga/front/sitemaps/userstories.py | 8 ++++---- taiga/front/sitemaps/wiki.py | 8 ++++---- taiga/front/templatetags/functions.py | 8 ++++---- taiga/front/urls.py | 8 ++++---- taiga/hooks/api.py | 8 ++++---- taiga/hooks/bitbucket/api.py | 8 ++++---- taiga/hooks/bitbucket/event_hooks.py | 8 ++++---- taiga/hooks/bitbucket/services.py | 8 ++++---- taiga/hooks/event_hooks.py | 8 ++++---- taiga/hooks/exceptions.py | 8 ++++---- taiga/hooks/github/api.py | 8 ++++---- taiga/hooks/github/event_hooks.py | 8 ++++---- taiga/hooks/github/services.py | 8 ++++---- taiga/hooks/gitlab/api.py | 8 ++++---- taiga/hooks/gitlab/event_hooks.py | 8 ++++---- taiga/hooks/gitlab/services.py | 8 ++++---- taiga/hooks/gogs/api.py | 8 ++++---- taiga/hooks/gogs/event_hooks.py | 8 ++++---- taiga/hooks/gogs/services.py | 8 ++++---- taiga/importers/api.py | 2 +- taiga/importers/asana/api.py | 2 +- taiga/importers/asana/tasks.py | 8 ++++---- taiga/importers/github/api.py | 2 +- taiga/importers/github/tasks.py | 8 ++++---- taiga/importers/jira/api.py | 2 +- taiga/importers/jira/tasks.py | 8 ++++---- .../management/commands/import_from_asana.py | 8 ++++---- .../management/commands/import_from_github.py | 8 ++++---- .../management/commands/import_from_jira.py | 8 ++++---- .../management/commands/import_from_pivotal.py | 8 ++++---- .../management/commands/import_from_trello.py | 8 ++++---- taiga/importers/permissions.py | 8 ++++---- taiga/importers/pivotal/api.py | 2 +- taiga/importers/pivotal/tasks.py | 8 ++++---- taiga/importers/trello/api.py | 2 +- taiga/importers/trello/importer.py | 8 ++++---- taiga/importers/trello/tasks.py | 8 ++++---- taiga/locale/api.py | 8 ++++---- taiga/locale/ca/LC_MESSAGES/django.po | 2 +- taiga/locale/de/LC_MESSAGES/django.po | 2 +- taiga/locale/en/LC_MESSAGES/django.po | 2 +- taiga/locale/es/LC_MESSAGES/django.po | 2 +- taiga/locale/fi/LC_MESSAGES/django.po | 2 +- taiga/locale/fr/LC_MESSAGES/django.po | 2 +- taiga/locale/it/LC_MESSAGES/django.po | 2 +- taiga/locale/ja/LC_MESSAGES/django.po | 2 +- taiga/locale/ko/LC_MESSAGES/django.po | 2 +- taiga/locale/nb/LC_MESSAGES/django.po | 2 +- taiga/locale/nl/LC_MESSAGES/django.po | 2 +- taiga/locale/permissions.py | 8 ++++---- taiga/locale/pl/LC_MESSAGES/django.po | 2 +- taiga/locale/pt_BR/LC_MESSAGES/django.po | 2 +- taiga/locale/ru/LC_MESSAGES/django.po | 2 +- taiga/locale/sv/LC_MESSAGES/django.po | 2 +- taiga/locale/tr/LC_MESSAGES/django.po | 2 +- taiga/locale/zh-Hans/LC_MESSAGES/django.po | 2 +- taiga/locale/zh-Hant/LC_MESSAGES/django.po | 2 +- taiga/mdrender/extensions/target_link.py | 10 +++++----- taiga/mdrender/extensions/wikilinks.py | 10 +++++----- taiga/mdrender/service.py | 8 ++++---- taiga/mdrender/templatetags/functions.py | 8 ++++---- taiga/permissions/choices.py | 10 +++++----- taiga/permissions/permissions.py | 10 +++++----- taiga/permissions/services.py | 10 +++++----- taiga/projects/__init__.py | 8 ++++---- taiga/projects/admin.py | 8 ++++---- taiga/projects/api.py | 8 ++++---- taiga/projects/apps.py | 8 ++++---- taiga/projects/attachments/__init__.py | 8 ++++---- taiga/projects/attachments/admin.py | 8 ++++---- taiga/projects/attachments/api.py | 8 ++++---- taiga/projects/attachments/apps.py | 8 ++++---- .../attachments/management/commands/generate_sha1.py | 8 ++++---- taiga/projects/attachments/models.py | 8 ++++---- taiga/projects/attachments/permissions.py | 8 ++++---- taiga/projects/attachments/serializers.py | 8 ++++---- taiga/projects/attachments/services.py | 2 +- taiga/projects/attachments/utils.py | 10 +++++----- taiga/projects/attachments/validators.py | 8 ++++---- taiga/projects/choices.py | 8 ++++---- taiga/projects/contact/admin.py | 8 ++++---- taiga/projects/contact/api.py | 8 ++++---- taiga/projects/contact/models.py | 8 ++++---- taiga/projects/contact/permissions.py | 8 ++++---- taiga/projects/contact/services.py | 8 ++++---- taiga/projects/contact/validators.py | 8 ++++---- taiga/projects/custom_attributes/admin.py | 8 ++++---- taiga/projects/custom_attributes/api.py | 8 ++++---- taiga/projects/custom_attributes/choices.py | 8 ++++---- taiga/projects/custom_attributes/models.py | 8 ++++---- taiga/projects/custom_attributes/permissions.py | 8 ++++---- taiga/projects/custom_attributes/serializers.py | 8 ++++---- taiga/projects/custom_attributes/services.py | 8 ++++---- taiga/projects/custom_attributes/signals.py | 8 ++++---- taiga/projects/custom_attributes/validators.py | 8 ++++---- taiga/projects/epics/__init__.py | 8 ++++---- taiga/projects/epics/admin.py | 8 ++++---- taiga/projects/epics/api.py | 8 ++++---- taiga/projects/epics/apps.py | 8 ++++---- taiga/projects/epics/models.py | 8 ++++---- taiga/projects/epics/permissions.py | 8 ++++---- taiga/projects/epics/serializers.py | 8 ++++---- taiga/projects/epics/services.py | 8 ++++---- taiga/projects/epics/utils.py | 10 +++++----- taiga/projects/epics/validators.py | 8 ++++---- taiga/projects/filters.py | 8 ++++---- taiga/projects/history/api.py | 8 ++++---- taiga/projects/history/choices.py | 8 ++++---- taiga/projects/history/freeze_impl.py | 8 ++++---- taiga/projects/history/mixins.py | 8 ++++---- taiga/projects/history/models.py | 8 ++++---- taiga/projects/history/permissions.py | 8 ++++---- taiga/projects/history/serializers.py | 8 ++++---- taiga/projects/history/services.py | 8 ++++---- taiga/projects/history/templatetags/functions.py | 8 ++++---- taiga/projects/history/utils.py | 10 +++++----- taiga/projects/issues/__init__.py | 8 ++++---- taiga/projects/issues/admin.py | 8 ++++---- taiga/projects/issues/api.py | 8 ++++---- taiga/projects/issues/apps.py | 8 ++++---- taiga/projects/issues/models.py | 8 ++++---- taiga/projects/issues/permissions.py | 8 ++++---- taiga/projects/issues/serializers.py | 8 ++++---- taiga/projects/issues/services.py | 8 ++++---- taiga/projects/issues/signals.py | 8 ++++---- taiga/projects/issues/utils.py | 10 +++++----- taiga/projects/issues/validators.py | 8 ++++---- taiga/projects/likes/admin.py | 8 ++++---- taiga/projects/likes/mixins/viewsets.py | 8 ++++---- taiga/projects/likes/models.py | 10 +++++----- taiga/projects/likes/serializers.py | 10 +++++----- taiga/projects/likes/services.py | 10 +++++----- .../management/commands/block_user_projects.py | 8 ++++---- .../management/commands/change_project_slug.py | 8 ++++---- taiga/projects/management/commands/sample_data.py | 8 ++++---- taiga/projects/milestones/admin.py | 8 ++++---- taiga/projects/milestones/api.py | 8 ++++---- taiga/projects/milestones/models.py | 8 ++++---- taiga/projects/milestones/permissions.py | 8 ++++---- taiga/projects/milestones/serializers.py | 8 ++++---- taiga/projects/milestones/services.py | 8 ++++---- taiga/projects/milestones/utils.py | 10 +++++----- taiga/projects/milestones/validators.py | 8 ++++---- taiga/projects/mixins/blocked.py | 8 ++++---- taiga/projects/mixins/by_ref.py | 8 ++++---- taiga/projects/mixins/on_destroy.py | 8 ++++---- taiga/projects/mixins/ordering.py | 8 ++++---- taiga/projects/mixins/serializers.py | 8 ++++---- taiga/projects/models.py | 8 ++++---- taiga/projects/notifications/admin.py | 8 ++++---- taiga/projects/notifications/api.py | 8 ++++---- taiga/projects/notifications/choices.py | 8 ++++---- .../management/commands/send_notifications.py | 8 ++++---- taiga/projects/notifications/mixins.py | 8 ++++---- taiga/projects/notifications/models.py | 8 ++++---- taiga/projects/notifications/permissions.py | 8 ++++---- taiga/projects/notifications/serializers.py | 8 ++++---- taiga/projects/notifications/services.py | 8 ++++---- taiga/projects/notifications/utils.py | 10 +++++----- taiga/projects/notifications/validators.py | 8 ++++---- taiga/projects/occ/__init__.py | 8 ++++---- taiga/projects/occ/mixins.py | 8 ++++---- taiga/projects/permissions.py | 8 ++++---- taiga/projects/references/api.py | 8 ++++---- taiga/projects/references/models.py | 8 ++++---- taiga/projects/references/permissions.py | 8 ++++---- taiga/projects/references/sequences.py | 8 ++++---- taiga/projects/references/services.py | 8 ++++---- taiga/projects/references/validators.py | 8 ++++---- taiga/projects/serializers.py | 8 ++++---- taiga/projects/services/__init__.py | 8 ++++---- taiga/projects/services/bulk_update_order.py | 8 ++++---- taiga/projects/services/filters.py | 8 ++++---- taiga/projects/services/invitations.py | 8 ++++---- taiga/projects/services/logo.py | 10 +++++----- taiga/projects/services/members.py | 8 ++++---- taiga/projects/services/modules_config.py | 8 ++++---- taiga/projects/services/projects.py | 8 ++++---- taiga/projects/services/stats.py | 8 ++++---- taiga/projects/services/transfer.py | 8 ++++---- taiga/projects/signals.py | 8 ++++---- taiga/projects/tagging/api.py | 8 ++++---- taiga/projects/tagging/fields.py | 8 ++++---- taiga/projects/tagging/models.py | 10 +++++----- taiga/projects/tagging/serializers.py | 8 ++++---- taiga/projects/tagging/services.py | 8 ++++---- taiga/projects/tagging/signals.py | 8 ++++---- taiga/projects/tagging/validators.py | 8 ++++---- taiga/projects/tasks/__init__.py | 8 ++++---- taiga/projects/tasks/admin.py | 8 ++++---- taiga/projects/tasks/api.py | 8 ++++---- taiga/projects/tasks/apps.py | 8 ++++---- taiga/projects/tasks/models.py | 8 ++++---- taiga/projects/tasks/permissions.py | 8 ++++---- taiga/projects/tasks/serializers.py | 8 ++++---- taiga/projects/tasks/services.py | 8 ++++---- taiga/projects/tasks/signals.py | 8 ++++---- taiga/projects/tasks/utils.py | 10 +++++----- taiga/projects/tasks/validators.py | 8 ++++---- taiga/projects/throttling.py | 8 ++++---- taiga/projects/translations.py | 8 ++++---- taiga/projects/userstories/__init__.py | 8 ++++---- taiga/projects/userstories/admin.py | 8 ++++---- taiga/projects/userstories/api.py | 8 ++++---- taiga/projects/userstories/apps.py | 8 ++++---- taiga/projects/userstories/filters.py | 8 ++++---- taiga/projects/userstories/models.py | 8 ++++---- taiga/projects/userstories/permissions.py | 8 ++++---- taiga/projects/userstories/serializers.py | 8 ++++---- taiga/projects/userstories/services.py | 8 ++++---- taiga/projects/userstories/signals.py | 8 ++++---- taiga/projects/userstories/utils.py | 10 +++++----- taiga/projects/userstories/validators.py | 8 ++++---- taiga/projects/utils.py | 10 +++++----- taiga/projects/validators.py | 8 ++++---- taiga/projects/votes/admin.py | 8 ++++---- taiga/projects/votes/mixins/serializers.py | 8 ++++---- taiga/projects/votes/mixins/viewsets.py | 8 ++++---- taiga/projects/votes/models.py | 10 +++++----- taiga/projects/votes/serializers.py | 10 +++++----- taiga/projects/votes/services.py | 10 +++++----- taiga/projects/votes/utils.py | 10 +++++----- taiga/projects/wiki/admin.py | 8 ++++---- taiga/projects/wiki/api.py | 8 ++++---- taiga/projects/wiki/models.py | 8 ++++---- taiga/projects/wiki/permissions.py | 8 ++++---- taiga/projects/wiki/serializers.py | 8 ++++---- taiga/projects/wiki/utils.py | 10 +++++----- taiga/projects/wiki/validators.py | 8 ++++---- taiga/routers.py | 8 ++++---- taiga/searches/api.py | 8 ++++---- taiga/searches/serializers.py | 8 ++++---- taiga/searches/services.py | 8 ++++---- taiga/stats/__init__.py | 2 +- taiga/stats/api.py | 2 +- taiga/stats/apps.py | 2 +- taiga/stats/permissions.py | 2 +- taiga/stats/routers.py | 2 +- taiga/stats/services.py | 2 +- taiga/timeline/__init__.py | 8 ++++---- taiga/timeline/api.py | 8 ++++---- taiga/timeline/apps.py | 8 ++++---- .../_clear_unnecessary_new_membership_entries.py | 8 ++++---- .../commands/_update_timeline_for_updated_tasks.py | 8 ++++---- .../timeline/management/commands/rebuild_timeline.py | 8 ++++---- .../rebuild_timeline_iterating_per_projects.py | 8 ++++---- taiga/timeline/models.py | 8 ++++---- taiga/timeline/permissions.py | 8 ++++---- taiga/timeline/rebuilder.py | 8 ++++---- taiga/timeline/serializers.py | 8 ++++---- taiga/timeline/service.py | 8 ++++---- taiga/timeline/signals.py | 8 ++++---- taiga/timeline/timeline_implementations.py | 8 ++++---- taiga/urls.py | 8 ++++---- taiga/users/admin.py | 8 ++++---- taiga/users/api.py | 8 ++++---- taiga/users/filters.py | 8 ++++---- taiga/users/forms.py | 8 ++++---- taiga/users/gravatar.py | 10 +++++----- taiga/users/models.py | 8 ++++---- taiga/users/permissions.py | 8 ++++---- taiga/users/serializers.py | 8 ++++---- taiga/users/services.py | 8 ++++---- taiga/users/signals.py | 8 ++++---- taiga/users/throttling.py | 8 ++++---- taiga/users/utils.py | 10 +++++----- taiga/users/validators.py | 8 ++++---- taiga/userstorage/api.py | 8 ++++---- taiga/userstorage/filters.py | 8 ++++---- taiga/userstorage/models.py | 8 ++++---- taiga/userstorage/permissions.py | 8 ++++---- taiga/userstorage/serializers.py | 8 ++++---- taiga/userstorage/validators.py | 8 ++++---- taiga/webhooks/__init__.py | 8 ++++---- taiga/webhooks/api.py | 8 ++++---- taiga/webhooks/apps.py | 8 ++++---- taiga/webhooks/models.py | 8 ++++---- taiga/webhooks/permissions.py | 8 ++++---- taiga/webhooks/serializers.py | 8 ++++---- taiga/webhooks/signal_handlers.py | 8 ++++---- taiga/webhooks/tasks.py | 6 +++--- taiga/webhooks/validators.py | 8 ++++---- taiga/wsgi.py | 8 ++++---- tests/conftest.py | 10 +++++----- tests/factories.py | 10 +++++----- tests/fixtures.py | 10 +++++----- .../test_application_tokens_resources.py | 10 +++++----- .../test_attachment_resources.py | 10 +++++----- .../resources_permissions/test_auth_resources.py | 10 +++++----- .../resources_permissions/test_contact.py | 10 +++++----- .../test_epics_custom_attributes_resource.py | 8 ++++---- .../test_epics_related_userstories_resources.py | 10 +++++----- .../resources_permissions/test_epics_resources.py | 10 +++++----- .../resources_permissions/test_feedback.py | 10 +++++----- .../resources_permissions/test_history_resources.py | 10 +++++----- .../test_issues_custom_attributes_resource.py | 8 ++++---- .../resources_permissions/test_issues_resources.py | 10 +++++----- .../test_milestones_resources.py | 10 +++++----- .../resources_permissions/test_modules_resources.py | 10 +++++----- .../test_projects_choices_resources.py | 10 +++++----- .../resources_permissions/test_projects_resource.py | 10 +++++----- .../resources_permissions/test_resolver_resources.py | 10 +++++----- .../resources_permissions/test_search_resources.py | 10 +++++----- .../resources_permissions/test_storage_resources.py | 10 +++++----- .../test_tasks_custom_attributes_resource.py | 8 ++++---- .../resources_permissions/test_tasks_resources.py | 10 +++++----- .../test_timelines_resources.py | 10 +++++----- .../resources_permissions/test_users_resources.py | 10 +++++----- .../test_userstories_custom_attributes_resource.py | 8 ++++---- .../test_userstories_resources.py | 10 +++++----- .../resources_permissions/test_webhooks_resources.py | 10 +++++----- .../resources_permissions/test_wiki_resources.py | 10 +++++----- tests/integration/test_application_tokens.py | 10 +++++----- tests/integration/test_attachments.py | 10 +++++----- tests/integration/test_auth_api.py | 10 +++++----- tests/integration/test_contact.py | 10 +++++----- tests/integration/test_custom_attributes_epics.py | 8 ++++---- tests/integration/test_custom_attributes_issues.py | 8 ++++---- tests/integration/test_custom_attributes_tasks.py | 8 ++++---- .../test_custom_attributes_user_stories.py | 8 ++++---- tests/integration/test_epics.py | 10 +++++----- tests/integration/test_epics_tags.py | 10 +++++----- tests/integration/test_exporter_api.py | 8 ++++---- tests/integration/test_fan_projects.py | 10 +++++----- tests/integration/test_feedback.py | 10 +++++----- tests/integration/test_history.py | 10 +++++----- tests/integration/test_hooks_bitbucket.py | 10 +++++----- tests/integration/test_hooks_github.py | 10 +++++----- tests/integration/test_hooks_gitlab.py | 10 +++++----- tests/integration/test_hooks_gogs.py | 10 +++++----- tests/integration/test_importer_api.py | 8 ++++---- tests/integration/test_importers_asana_api.py | 8 ++++---- tests/integration/test_importers_github_api.py | 8 ++++---- tests/integration/test_importers_jira_api.py | 8 ++++---- tests/integration/test_importers_trello_api.py | 8 ++++---- tests/integration/test_issues.py | 10 +++++----- tests/integration/test_issues_tags.py | 10 +++++----- tests/integration/test_mdrender.py | 10 +++++----- tests/integration/test_memberships.py | 10 +++++----- tests/integration/test_milestones.py | 10 +++++----- tests/integration/test_models.py | 10 +++++----- tests/integration/test_neighbors.py | 10 +++++----- tests/integration/test_notifications.py | 10 +++++----- tests/integration/test_occ.py | 8 ++++---- tests/integration/test_permissions.py | 10 +++++----- tests/integration/test_projects.py | 10 +++++----- tests/integration/test_references_sequences.py | 10 +++++----- tests/integration/test_roles.py | 10 +++++----- tests/integration/test_searches.py | 10 +++++----- tests/integration/test_stats.py | 10 +++++----- tests/integration/test_tasks.py | 10 +++++----- tests/integration/test_tasks_tags.py | 10 +++++----- tests/integration/test_throwttling.py | 8 ++++---- tests/integration/test_timeline.py | 10 +++++----- tests/integration/test_totals_projects.py | 12 ++++++------ tests/integration/test_us_autoclosing.py | 10 +++++----- tests/integration/test_users.py | 10 +++++----- tests/integration/test_userstorage_api.py | 10 +++++----- tests/integration/test_userstories.py | 10 +++++----- tests/integration/test_userstories_tags.py | 10 +++++----- tests/integration/test_vote_issues.py | 10 +++++----- tests/integration/test_vote_tasks.py | 10 +++++----- tests/integration/test_vote_userstories.py | 10 +++++----- tests/integration/test_votes.py | 10 +++++----- tests/integration/test_watch_issues.py | 10 +++++----- tests/integration/test_watch_milestones.py | 10 +++++----- tests/integration/test_watch_projects.py | 10 +++++----- tests/integration/test_watch_tasks.py | 10 +++++----- tests/integration/test_watch_userstories.py | 10 +++++----- tests/integration/test_watch_wikipages.py | 10 +++++----- tests/integration/test_webhooks.py | 10 +++++----- tests/integration/test_webhooks_epics.py | 10 +++++----- tests/integration/test_webhooks_issues.py | 10 +++++----- tests/integration/test_webhooks_milestones.py | 10 +++++----- tests/integration/test_webhooks_signals.py | 10 +++++----- tests/integration/test_webhooks_tasks.py | 10 +++++----- tests/integration/test_webhooks_userstories.py | 10 +++++----- tests/integration/test_webhooks_wikipages.py | 10 +++++----- tests/integration/test_wikilinks.py | 10 +++++----- tests/unit/conftest.py | 10 +++++----- tests/unit/test_base_api_permissions.py | 8 ++++---- tests/unit/test_deferred.py | 8 ++++---- tests/unit/test_export.py | 8 ++++---- tests/unit/test_import.py | 8 ++++---- tests/unit/test_mdrender.py | 10 +++++----- tests/unit/test_order_updates.py | 8 ++++---- tests/unit/test_serializer_mixins.py | 10 +++++----- tests/unit/test_slug.py | 10 +++++----- tests/unit/test_timeline.py | 10 +++++----- tests/unit/test_tokens.py | 10 +++++----- tests/unit/test_utils.py | 8 ++++---- tests/utils.py | 10 +++++----- 533 files changed, 2148 insertions(+), 2148 deletions(-) diff --git a/manage.py b/manage.py index 63a6358b..9a451d45 100755 --- a/manage.py +++ b/manage.py @@ -1,10 +1,10 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/settings/__init__.py b/settings/__init__.py index a5fbfb3e..a434dd74 100644 --- a/settings/__init__.py +++ b/settings/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/settings/celery.py b/settings/celery.py index 82e4d92f..5d876a18 100644 --- a/settings/celery.py +++ b/settings/celery.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/settings/common.py b/settings/common.py index 5bc1605c..8aaa5b16 100644 --- a/settings/common.py +++ b/settings/common.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/settings/development.py b/settings/development.py index 8611719d..54df8eef 100644 --- a/settings/development.py +++ b/settings/development.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/settings/local.py.example b/settings/local.py.example index c5f6491e..cdbf0e77 100644 --- a/settings/local.py.example +++ b/settings/local.py.example @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/settings/sr.py b/settings/sr.py index 1477e682..8139a498 100644 --- a/settings/sr.py +++ b/settings/sr.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/settings/testing.py b/settings/testing.py index ffabbe12..13e2b434 100644 --- a/settings/testing.py +++ b/settings/testing.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/settings/travis.py b/settings/travis.py index 13c0f9c2..96ad48bf 100644 --- a/settings/travis.py +++ b/settings/travis.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/__init__.py b/taiga/__init__.py index 8be9bc25..ccc27561 100644 --- a/taiga/__init__.py +++ b/taiga/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/auth/api.py b/taiga/auth/api.py index d9a2c85c..6370f96a 100644 --- a/taiga/auth/api.py +++ b/taiga/auth/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/auth/backends.py b/taiga/auth/backends.py index 7813d457..8ed19c7f 100644 --- a/taiga/auth/backends.py +++ b/taiga/auth/backends.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/auth/permissions.py b/taiga/auth/permissions.py index 854eff26..7e5ab605 100644 --- a/taiga/auth/permissions.py +++ b/taiga/auth/permissions.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh # Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh # Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/auth/services.py b/taiga/auth/services.py index f4c02296..f090edf2 100644 --- a/taiga/auth/services.py +++ b/taiga/auth/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/auth/signals.py b/taiga/auth/signals.py index 9e375836..5e7e6ab5 100644 --- a/taiga/auth/signals.py +++ b/taiga/auth/signals.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/auth/throttling.py b/taiga/auth/throttling.py index e622407b..f1d25dd8 100644 --- a/taiga/auth/throttling.py +++ b/taiga/auth/throttling.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/auth/tokens.py b/taiga/auth/tokens.py index a939b748..3a2cf205 100644 --- a/taiga/auth/tokens.py +++ b/taiga/auth/tokens.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/auth/validators.py b/taiga/auth/validators.py index fdfb4009..1847d946 100644 --- a/taiga/auth/validators.py +++ b/taiga/auth/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/__init__.py b/taiga/base/__init__.py index 5a7db2f0..c1a4cdb8 100644 --- a/taiga/base/__init__.py +++ b/taiga/base/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/__init__.py b/taiga/base/api/__init__.py index ad481185..12441516 100644 --- a/taiga/base/api/__init__.py +++ b/taiga/base/api/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/authentication.py b/taiga/base/api/authentication.py index d44c69d5..afdbcf39 100644 --- a/taiga/base/api/authentication.py +++ b/taiga/base/api/authentication.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/fields.py b/taiga/base/api/fields.py index e528a2b6..9f6a59c6 100644 --- a/taiga/base/api/fields.py +++ b/taiga/base/api/fields.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/generics.py b/taiga/base/api/generics.py index 31823945..cb4de174 100644 --- a/taiga/base/api/generics.py +++ b/taiga/base/api/generics.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/mixins.py b/taiga/base/api/mixins.py index b01d7cf2..9df6519d 100644 --- a/taiga/base/api/mixins.py +++ b/taiga/base/api/mixins.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/negotiation.py b/taiga/base/api/negotiation.py index fd2a7028..8b8e04df 100644 --- a/taiga/base/api/negotiation.py +++ b/taiga/base/api/negotiation.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/pagination.py b/taiga/base/api/pagination.py index 636d6b80..9f2e7f21 100644 --- a/taiga/base/api/pagination.py +++ b/taiga/base/api/pagination.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/parsers.py b/taiga/base/api/parsers.py index 42d436f5..19086892 100644 --- a/taiga/base/api/parsers.py +++ b/taiga/base/api/parsers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/permissions.py b/taiga/base/api/permissions.py index ec994b0b..2dc3fedd 100644 --- a/taiga/base/api/permissions.py +++ b/taiga/base/api/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/relations.py b/taiga/base/api/relations.py index 6fbb98f5..206eb59f 100644 --- a/taiga/base/api/relations.py +++ b/taiga/base/api/relations.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/renderers.py b/taiga/base/api/renderers.py index a4ebaa3c..31c8ce5d 100644 --- a/taiga/base/api/renderers.py +++ b/taiga/base/api/renderers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/request.py b/taiga/base/api/request.py index 059ece06..516ec2f7 100644 --- a/taiga/base/api/request.py +++ b/taiga/base/api/request.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/reverse.py b/taiga/base/api/reverse.py index 4d4de867..548987a1 100644 --- a/taiga/base/api/reverse.py +++ b/taiga/base/api/reverse.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/serializers.py b/taiga/base/api/serializers.py index 5de685a6..e991714c 100644 --- a/taiga/base/api/serializers.py +++ b/taiga/base/api/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/settings.py b/taiga/base/api/settings.py index f5856146..680e0390 100644 --- a/taiga/base/api/settings.py +++ b/taiga/base/api/settings.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/throttling.py b/taiga/base/api/throttling.py index f1b49ca0..afef7725 100644 --- a/taiga/base/api/throttling.py +++ b/taiga/base/api/throttling.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/urlpatterns.py b/taiga/base/api/urlpatterns.py index c99f5b8d..26f0677e 100644 --- a/taiga/base/api/urlpatterns.py +++ b/taiga/base/api/urlpatterns.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/utils.py b/taiga/base/api/utils.py index 30318d5e..8c2bb038 100644 --- a/taiga/base/api/utils.py +++ b/taiga/base/api/utils.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/utils/__init__.py b/taiga/base/api/utils/__init__.py index b6198a45..5dd058c1 100644 --- a/taiga/base/api/utils/__init__.py +++ b/taiga/base/api/utils/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/utils/encoders.py b/taiga/base/api/utils/encoders.py index be307d25..bade2cbe 100644 --- a/taiga/base/api/utils/encoders.py +++ b/taiga/base/api/utils/encoders.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/utils/formatting.py b/taiga/base/api/utils/formatting.py index f2decc0b..bd983220 100644 --- a/taiga/base/api/utils/formatting.py +++ b/taiga/base/api/utils/formatting.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/utils/mediatypes.py b/taiga/base/api/utils/mediatypes.py index c0dc1266..55dd4f8c 100644 --- a/taiga/base/api/utils/mediatypes.py +++ b/taiga/base/api/utils/mediatypes.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/validators.py b/taiga/base/api/validators.py index 3a8d6922..f4f01497 100644 --- a/taiga/base/api/validators.py +++ b/taiga/base/api/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/views.py b/taiga/base/api/views.py index 310f424a..cc42966b 100644 --- a/taiga/base/api/views.py +++ b/taiga/base/api/views.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/api/viewsets.py b/taiga/base/api/viewsets.py index d37bfc50..aee0c19e 100644 --- a/taiga/base/api/viewsets.py +++ b/taiga/base/api/viewsets.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/apps.py b/taiga/base/apps.py index f5f1879b..e8616bff 100644 --- a/taiga/base/apps.py +++ b/taiga/base/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/connectors/exceptions.py b/taiga/base/connectors/exceptions.py index eb47c5db..cc92dae5 100644 --- a/taiga/base/connectors/exceptions.py +++ b/taiga/base/connectors/exceptions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/db/models/fields/__init__.py b/taiga/base/db/models/fields/__init__.py index ad16357e..d87b6502 100644 --- a/taiga/base/db/models/fields/__init__.py +++ b/taiga/base/db/models/fields/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/db/models/fields/json.py b/taiga/base/db/models/fields/json.py index fd1d63a7..aa4fbe05 100644 --- a/taiga/base/db/models/fields/json.py +++ b/taiga/base/db/models/fields/json.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/decorators.py b/taiga/base/decorators.py index 46b80b24..b0feb4df 100644 --- a/taiga/base/decorators.py +++ b/taiga/base/decorators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/exceptions.py b/taiga/base/exceptions.py index 73d277ff..12310baa 100644 --- a/taiga/base/exceptions.py +++ b/taiga/base/exceptions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/fields.py b/taiga/base/fields.py index 8017c10b..99baefa7 100644 --- a/taiga/base/fields.py +++ b/taiga/base/fields.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/filters.py b/taiga/base/filters.py index 346f3f54..2533f0b8 100644 --- a/taiga/base/filters.py +++ b/taiga/base/filters.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/formats/en/formats.py b/taiga/base/formats/en/formats.py index 37d64ee8..e57252da 100644 --- a/taiga/base/formats/en/formats.py +++ b/taiga/base/formats/en/formats.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/formats/es/formats.py b/taiga/base/formats/es/formats.py index f6d7dc55..d1f50260 100644 --- a/taiga/base/formats/es/formats.py +++ b/taiga/base/formats/es/formats.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/mails.py b/taiga/base/mails.py index 48e6f296..433e945e 100644 --- a/taiga/base/mails.py +++ b/taiga/base/mails.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/management/commands/test_emails.py b/taiga/base/management/commands/test_emails.py index f40dd7db..faf9414c 100644 --- a/taiga/base/management/commands/test_emails.py +++ b/taiga/base/management/commands/test_emails.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/middleware/cors.py b/taiga/base/middleware/cors.py index 3f5cbd38..2bf89b34 100644 --- a/taiga/base/middleware/cors.py +++ b/taiga/base/middleware/cors.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/neighbors.py b/taiga/base/neighbors.py index c8733ade..576f6147 100644 --- a/taiga/base/neighbors.py +++ b/taiga/base/neighbors.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/response.py b/taiga/base/response.py index 82d7794f..59d0be8a 100644 --- a/taiga/base/response.py +++ b/taiga/base/response.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/routers.py b/taiga/base/routers.py index 119375e9..a6ec7ce7 100644 --- a/taiga/base/routers.py +++ b/taiga/base/routers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/signals/cleanup_files.py b/taiga/base/signals/cleanup_files.py index 4489b599..cb56092e 100644 --- a/taiga/base/signals/cleanup_files.py +++ b/taiga/base/signals/cleanup_files.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/signals/thumbnails.py b/taiga/base/signals/thumbnails.py index e40cba07..57f86370 100644 --- a/taiga/base/signals/thumbnails.py +++ b/taiga/base/signals/thumbnails.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/status.py b/taiga/base/status.py index c271e030..6d84797b 100644 --- a/taiga/base/status.py +++ b/taiga/base/status.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/storage.py b/taiga/base/storage.py index a0b962c4..10e26b6d 100644 --- a/taiga/base/storage.py +++ b/taiga/base/storage.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/throttling.py b/taiga/base/throttling.py index 676d6027..b5a4903d 100644 --- a/taiga/base/throttling.py +++ b/taiga/base/throttling.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/collections.py b/taiga/base/utils/collections.py index c5ca3c59..675846eb 100644 --- a/taiga/base/utils/collections.py +++ b/taiga/base/utils/collections.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/colors.py b/taiga/base/utils/colors.py index 517c8add..f187dd3d 100644 --- a/taiga/base/utils/colors.py +++ b/taiga/base/utils/colors.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/contenttypes.py b/taiga/base/utils/contenttypes.py index 252a3db2..bfdd5ab3 100644 --- a/taiga/base/utils/contenttypes.py +++ b/taiga/base/utils/contenttypes.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/db.py b/taiga/base/utils/db.py index ec7b1eb2..809c9d9c 100644 --- a/taiga/base/utils/db.py +++ b/taiga/base/utils/db.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/dicts.py b/taiga/base/utils/dicts.py index bf3d2c71..21a39cf7 100644 --- a/taiga/base/utils/dicts.py +++ b/taiga/base/utils/dicts.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/diff.py b/taiga/base/utils/diff.py index e08584ae..e8d07e67 100644 --- a/taiga/base/utils/diff.py +++ b/taiga/base/utils/diff.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/files.py b/taiga/base/utils/files.py index 1772e2af..4bfc8004 100644 --- a/taiga/base/utils/files.py +++ b/taiga/base/utils/files.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/functions.py b/taiga/base/utils/functions.py index d25d3572..6e458094 100644 --- a/taiga/base/utils/functions.py +++ b/taiga/base/utils/functions.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/iterators.py b/taiga/base/utils/iterators.py index 19d8c553..c5723fb5 100644 --- a/taiga/base/utils/iterators.py +++ b/taiga/base/utils/iterators.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/json.py b/taiga/base/utils/json.py index 6e2a0658..59a6eaa1 100644 --- a/taiga/base/utils/json.py +++ b/taiga/base/utils/json.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/signals.py b/taiga/base/utils/signals.py index 9dbef497..f648df40 100644 --- a/taiga/base/utils/signals.py +++ b/taiga/base/utils/signals.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/slug.py b/taiga/base/utils/slug.py index 239366d3..1daf149c 100644 --- a/taiga/base/utils/slug.py +++ b/taiga/base/utils/slug.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/text.py b/taiga/base/utils/text.py index 05447b45..81b631e3 100644 --- a/taiga/base/utils/text.py +++ b/taiga/base/utils/text.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/thumbnails.py b/taiga/base/utils/thumbnails.py index a7e87e54..7d704b8e 100644 --- a/taiga/base/utils/thumbnails.py +++ b/taiga/base/utils/thumbnails.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/time.py b/taiga/base/utils/time.py index cd7b00c4..7012825c 100644 --- a/taiga/base/utils/time.py +++ b/taiga/base/utils/time.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/base/utils/urls.py b/taiga/base/utils/urls.py index 36239113..a145cd21 100644 --- a/taiga/base/utils/urls.py +++ b/taiga/base/utils/urls.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/celery.py b/taiga/celery.py index 2cafa1b8..f080262f 100644 --- a/taiga/celery.py +++ b/taiga/celery.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/deferred.py b/taiga/deferred.py index 30a17d6b..0ac75e89 100644 --- a/taiga/deferred.py +++ b/taiga/deferred.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/events/__init__.py b/taiga/events/__init__.py index b6017f3b..9d91be72 100644 --- a/taiga/events/__init__.py +++ b/taiga/events/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/events/apps.py b/taiga/events/apps.py index 7c9a7680..2792555b 100644 --- a/taiga/events/apps.py +++ b/taiga/events/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/events/backends/__init__.py b/taiga/events/backends/__init__.py index f3f0d6c3..1fbcee96 100644 --- a/taiga/events/backends/__init__.py +++ b/taiga/events/backends/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/events/backends/base.py b/taiga/events/backends/base.py index a9f0e8f2..9d67d121 100644 --- a/taiga/events/backends/base.py +++ b/taiga/events/backends/base.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2017 Andrey Antukh # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/events/backends/postgresql.py b/taiga/events/backends/postgresql.py index e239d421..9504b55a 100644 --- a/taiga/events/backends/postgresql.py +++ b/taiga/events/backends/postgresql.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2017 Andrey Antukh # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/events/backends/rabbitmq.py b/taiga/events/backends/rabbitmq.py index c09113c6..99b34629 100644 --- a/taiga/events/backends/rabbitmq.py +++ b/taiga/events/backends/rabbitmq.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2017 Andrey Antukh # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/events/events.py b/taiga/events/events.py index bbd8735c..c8201c55 100644 --- a/taiga/events/events.py +++ b/taiga/events/events.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/events/management/commands/emit_notification_message.py b/taiga/events/management/commands/emit_notification_message.py index ed5365d2..a9e8c2bb 100644 --- a/taiga/events/management/commands/emit_notification_message.py +++ b/taiga/events/management/commands/emit_notification_message.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/events/middleware.py b/taiga/events/middleware.py index 1fa5c182..8cbde3c3 100644 --- a/taiga/events/middleware.py +++ b/taiga/events/middleware.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/events/signal_handlers.py b/taiga/events/signal_handlers.py index e310fcf1..7f8d657d 100644 --- a/taiga/events/signal_handlers.py +++ b/taiga/events/signal_handlers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/api.py b/taiga/export_import/api.py index 9d90b638..ac8ae462 100644 --- a/taiga/export_import/api.py +++ b/taiga/export_import/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/exceptions.py b/taiga/export_import/exceptions.py index 9b57306f..ba94b8f7 100644 --- a/taiga/export_import/exceptions.py +++ b/taiga/export_import/exceptions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/management/commands/dump_project.py b/taiga/export_import/management/commands/dump_project.py index 3c6996f3..ea7640a7 100644 --- a/taiga/export_import/management/commands/dump_project.py +++ b/taiga/export_import/management/commands/dump_project.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/management/commands/dump_project_async.py b/taiga/export_import/management/commands/dump_project_async.py index d48a0c19..9890f3a0 100644 --- a/taiga/export_import/management/commands/dump_project_async.py +++ b/taiga/export_import/management/commands/dump_project_async.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/management/commands/load_dump.py b/taiga/export_import/management/commands/load_dump.py index c01f577f..cdbc2958 100644 --- a/taiga/export_import/management/commands/load_dump.py +++ b/taiga/export_import/management/commands/load_dump.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/mixins.py b/taiga/export_import/mixins.py index e70e674f..30e1fad3 100644 --- a/taiga/export_import/mixins.py +++ b/taiga/export_import/mixins.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/permissions.py b/taiga/export_import/permissions.py index 6d69964a..faf5e2d2 100644 --- a/taiga/export_import/permissions.py +++ b/taiga/export_import/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/renderers.py b/taiga/export_import/renderers.py index 04e28bbd..249c9ef7 100644 --- a/taiga/export_import/renderers.py +++ b/taiga/export_import/renderers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/serializers/__init__.py b/taiga/export_import/serializers/__init__.py index 5d793a87..055b5676 100644 --- a/taiga/export_import/serializers/__init__.py +++ b/taiga/export_import/serializers/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/serializers/cache.py b/taiga/export_import/serializers/cache.py index f22978f8..4dfb76ad 100644 --- a/taiga/export_import/serializers/cache.py +++ b/taiga/export_import/serializers/cache.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/serializers/fields.py b/taiga/export_import/serializers/fields.py index 29ec85aa..7c7055c0 100644 --- a/taiga/export_import/serializers/fields.py +++ b/taiga/export_import/serializers/fields.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/serializers/mixins.py b/taiga/export_import/serializers/mixins.py index 3006500f..0df95a5f 100644 --- a/taiga/export_import/serializers/mixins.py +++ b/taiga/export_import/serializers/mixins.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/serializers/serializers.py b/taiga/export_import/serializers/serializers.py index f4f46e52..1f00fbf7 100644 --- a/taiga/export_import/serializers/serializers.py +++ b/taiga/export_import/serializers/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/services/__init__.py b/taiga/export_import/services/__init__.py index 573d7a70..61980109 100644 --- a/taiga/export_import/services/__init__.py +++ b/taiga/export_import/services/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/services/render.py b/taiga/export_import/services/render.py index cb757dd0..fc79d222 100644 --- a/taiga/export_import/services/render.py +++ b/taiga/export_import/services/render.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/services/store.py b/taiga/export_import/services/store.py index 80a784eb..1944912d 100644 --- a/taiga/export_import/services/store.py +++ b/taiga/export_import/services/store.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/tasks.py b/taiga/export_import/tasks.py index 5acb08a2..565bb7c6 100644 --- a/taiga/export_import/tasks.py +++ b/taiga/export_import/tasks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/throttling.py b/taiga/export_import/throttling.py index c96d6c17..972af60a 100644 --- a/taiga/export_import/throttling.py +++ b/taiga/export_import/throttling.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/validators/cache.py b/taiga/export_import/validators/cache.py index d82e943d..e6daf161 100644 --- a/taiga/export_import/validators/cache.py +++ b/taiga/export_import/validators/cache.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/validators/fields.py b/taiga/export_import/validators/fields.py index e3644351..d93a3677 100644 --- a/taiga/export_import/validators/fields.py +++ b/taiga/export_import/validators/fields.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/validators/mixins.py b/taiga/export_import/validators/mixins.py index f43ea5b6..44027c90 100644 --- a/taiga/export_import/validators/mixins.py +++ b/taiga/export_import/validators/mixins.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/export_import/validators/validators.py b/taiga/export_import/validators/validators.py index 4aeb0e1a..484f2c89 100644 --- a/taiga/export_import/validators/validators.py +++ b/taiga/export_import/validators/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/external_apps/admin.py b/taiga/external_apps/admin.py index 4004c3ea..b10fea5a 100644 --- a/taiga/external_apps/admin.py +++ b/taiga/external_apps/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/external_apps/api.py b/taiga/external_apps/api.py index 8ded55d5..a337e2c4 100644 --- a/taiga/external_apps/api.py +++ b/taiga/external_apps/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/external_apps/auth_backends.py b/taiga/external_apps/auth_backends.py index 47eba944..b812087e 100644 --- a/taiga/external_apps/auth_backends.py +++ b/taiga/external_apps/auth_backends.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/external_apps/models.py b/taiga/external_apps/models.py index 9aeb2087..c87159d5 100644 --- a/taiga/external_apps/models.py +++ b/taiga/external_apps/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/external_apps/permissions.py b/taiga/external_apps/permissions.py index ad37274b..a415c30f 100644 --- a/taiga/external_apps/permissions.py +++ b/taiga/external_apps/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/external_apps/serializers.py b/taiga/external_apps/serializers.py index af676b5a..6bfbe921 100644 --- a/taiga/external_apps/serializers.py +++ b/taiga/external_apps/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/external_apps/services.py b/taiga/external_apps/services.py index c48703a5..c512e805 100644 --- a/taiga/external_apps/services.py +++ b/taiga/external_apps/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/external_apps/validators.py b/taiga/external_apps/validators.py index 6c7de5aa..66467ec6 100644 --- a/taiga/external_apps/validators.py +++ b/taiga/external_apps/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/feedback/__init__.py b/taiga/feedback/__init__.py index ba163f3d..c8fc17fd 100644 --- a/taiga/feedback/__init__.py +++ b/taiga/feedback/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/feedback/admin.py b/taiga/feedback/admin.py index aac487ae..9a2a2548 100644 --- a/taiga/feedback/admin.py +++ b/taiga/feedback/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/feedback/api.py b/taiga/feedback/api.py index 0f573b87..39bb4469 100644 --- a/taiga/feedback/api.py +++ b/taiga/feedback/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/feedback/apps.py b/taiga/feedback/apps.py index 6485ac13..20740dee 100644 --- a/taiga/feedback/apps.py +++ b/taiga/feedback/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/feedback/models.py b/taiga/feedback/models.py index a75c27a1..b4d4413d 100644 --- a/taiga/feedback/models.py +++ b/taiga/feedback/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/feedback/permissions.py b/taiga/feedback/permissions.py index b813c567..a5c4502a 100644 --- a/taiga/feedback/permissions.py +++ b/taiga/feedback/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/feedback/routers.py b/taiga/feedback/routers.py index 9f907520..f23822c3 100644 --- a/taiga/feedback/routers.py +++ b/taiga/feedback/routers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/feedback/services.py b/taiga/feedback/services.py index 8aec0cfc..34efdd12 100644 --- a/taiga/feedback/services.py +++ b/taiga/feedback/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/feedback/validators.py b/taiga/feedback/validators.py index 7b31ec88..e03fd888 100644 --- a/taiga/feedback/validators.py +++ b/taiga/feedback/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/__init__.py b/taiga/front/sitemaps/__init__.py index 8c7adfa8..00f9f1d6 100644 --- a/taiga/front/sitemaps/__init__.py +++ b/taiga/front/sitemaps/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/base.py b/taiga/front/sitemaps/base.py index 952d754d..c75fb653 100644 --- a/taiga/front/sitemaps/base.py +++ b/taiga/front/sitemaps/base.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/epics.py b/taiga/front/sitemaps/epics.py index 81f391f6..ed7f055f 100644 --- a/taiga/front/sitemaps/epics.py +++ b/taiga/front/sitemaps/epics.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/generics.py b/taiga/front/sitemaps/generics.py index 9ddc51bc..d3db49de 100644 --- a/taiga/front/sitemaps/generics.py +++ b/taiga/front/sitemaps/generics.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/issues.py b/taiga/front/sitemaps/issues.py index 4aeeb100..6b784d3b 100644 --- a/taiga/front/sitemaps/issues.py +++ b/taiga/front/sitemaps/issues.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/milestones.py b/taiga/front/sitemaps/milestones.py index f0b7345a..ecaf7c75 100644 --- a/taiga/front/sitemaps/milestones.py +++ b/taiga/front/sitemaps/milestones.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/projects.py b/taiga/front/sitemaps/projects.py index 77785928..aa91bd3b 100644 --- a/taiga/front/sitemaps/projects.py +++ b/taiga/front/sitemaps/projects.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/tasks.py b/taiga/front/sitemaps/tasks.py index 56f3ee7e..b9314ba5 100644 --- a/taiga/front/sitemaps/tasks.py +++ b/taiga/front/sitemaps/tasks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/users.py b/taiga/front/sitemaps/users.py index cabe9417..d515276f 100644 --- a/taiga/front/sitemaps/users.py +++ b/taiga/front/sitemaps/users.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/userstories.py b/taiga/front/sitemaps/userstories.py index 7c89b0a0..1a5e36ee 100644 --- a/taiga/front/sitemaps/userstories.py +++ b/taiga/front/sitemaps/userstories.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/sitemaps/wiki.py b/taiga/front/sitemaps/wiki.py index e0ec43af..e6ccd4a1 100644 --- a/taiga/front/sitemaps/wiki.py +++ b/taiga/front/sitemaps/wiki.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/templatetags/functions.py b/taiga/front/templatetags/functions.py index 86a7f813..db8a6616 100644 --- a/taiga/front/templatetags/functions.py +++ b/taiga/front/templatetags/functions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/front/urls.py b/taiga/front/urls.py index 5190d2f8..393913e3 100644 --- a/taiga/front/urls.py +++ b/taiga/front/urls.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/api.py b/taiga/hooks/api.py index baf94e9d..1ec40416 100644 --- a/taiga/hooks/api.py +++ b/taiga/hooks/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/bitbucket/api.py b/taiga/hooks/bitbucket/api.py index 07e2829b..cb296fbd 100644 --- a/taiga/hooks/bitbucket/api.py +++ b/taiga/hooks/bitbucket/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/bitbucket/event_hooks.py b/taiga/hooks/bitbucket/event_hooks.py index 67ffc3fd..f31b5381 100644 --- a/taiga/hooks/bitbucket/event_hooks.py +++ b/taiga/hooks/bitbucket/event_hooks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/bitbucket/services.py b/taiga/hooks/bitbucket/services.py index b2cb29c7..5c89588a 100644 --- a/taiga/hooks/bitbucket/services.py +++ b/taiga/hooks/bitbucket/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/event_hooks.py b/taiga/hooks/event_hooks.py index 93deb518..8ab6e44d 100644 --- a/taiga/hooks/event_hooks.py +++ b/taiga/hooks/event_hooks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/exceptions.py b/taiga/hooks/exceptions.py index bbe68cc1..d6ced691 100644 --- a/taiga/hooks/exceptions.py +++ b/taiga/hooks/exceptions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/github/api.py b/taiga/hooks/github/api.py index f3c125ee..cd53c065 100644 --- a/taiga/hooks/github/api.py +++ b/taiga/hooks/github/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/github/event_hooks.py b/taiga/hooks/github/event_hooks.py index c4ecc300..32724a71 100644 --- a/taiga/hooks/github/event_hooks.py +++ b/taiga/hooks/github/event_hooks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/github/services.py b/taiga/hooks/github/services.py index e7286d86..1878551d 100644 --- a/taiga/hooks/github/services.py +++ b/taiga/hooks/github/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/gitlab/api.py b/taiga/hooks/gitlab/api.py index 127d7536..c24eb0cb 100644 --- a/taiga/hooks/gitlab/api.py +++ b/taiga/hooks/gitlab/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/gitlab/event_hooks.py b/taiga/hooks/gitlab/event_hooks.py index e7ada033..13f0f1e1 100644 --- a/taiga/hooks/gitlab/event_hooks.py +++ b/taiga/hooks/gitlab/event_hooks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/gitlab/services.py b/taiga/hooks/gitlab/services.py index a31352ed..3040fad6 100644 --- a/taiga/hooks/gitlab/services.py +++ b/taiga/hooks/gitlab/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/gogs/api.py b/taiga/hooks/gogs/api.py index ced551de..794145c7 100644 --- a/taiga/hooks/gogs/api.py +++ b/taiga/hooks/gogs/api.py @@ -1,7 +1,7 @@ -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/gogs/event_hooks.py b/taiga/hooks/gogs/event_hooks.py index 399fa960..885a668a 100644 --- a/taiga/hooks/gogs/event_hooks.py +++ b/taiga/hooks/gogs/event_hooks.py @@ -1,7 +1,7 @@ -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/hooks/gogs/services.py b/taiga/hooks/gogs/services.py index 40d06fab..dd3fa03b 100644 --- a/taiga/hooks/gogs/services.py +++ b/taiga/hooks/gogs/services.py @@ -1,7 +1,7 @@ -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/api.py b/taiga/importers/api.py index c1e774cc..6afaedfb 100644 --- a/taiga/importers/api.py +++ b/taiga/importers/api.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/asana/api.py b/taiga/importers/asana/api.py index b13914bf..e8b130e2 100644 --- a/taiga/importers/asana/api.py +++ b/taiga/importers/asana/api.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/asana/tasks.py b/taiga/importers/asana/tasks.py index 4dcef793..0f81f4de 100644 --- a/taiga/importers/asana/tasks.py +++ b/taiga/importers/asana/tasks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/github/api.py b/taiga/importers/github/api.py index 0c7af495..6def5d03 100644 --- a/taiga/importers/github/api.py +++ b/taiga/importers/github/api.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/github/tasks.py b/taiga/importers/github/tasks.py index c3cf16f8..11796d84 100644 --- a/taiga/importers/github/tasks.py +++ b/taiga/importers/github/tasks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/jira/api.py b/taiga/importers/jira/api.py index c704a2fd..9c5d0b4d 100644 --- a/taiga/importers/jira/api.py +++ b/taiga/importers/jira/api.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/jira/tasks.py b/taiga/importers/jira/tasks.py index 874aca49..6e9e50db 100644 --- a/taiga/importers/jira/tasks.py +++ b/taiga/importers/jira/tasks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/management/commands/import_from_asana.py b/taiga/importers/management/commands/import_from_asana.py index 9d954422..677dc870 100644 --- a/taiga/importers/management/commands/import_from_asana.py +++ b/taiga/importers/management/commands/import_from_asana.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/management/commands/import_from_github.py b/taiga/importers/management/commands/import_from_github.py index e2ad7b96..3c1f3884 100644 --- a/taiga/importers/management/commands/import_from_github.py +++ b/taiga/importers/management/commands/import_from_github.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/management/commands/import_from_jira.py b/taiga/importers/management/commands/import_from_jira.py index 30c723d6..50997593 100644 --- a/taiga/importers/management/commands/import_from_jira.py +++ b/taiga/importers/management/commands/import_from_jira.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/management/commands/import_from_pivotal.py b/taiga/importers/management/commands/import_from_pivotal.py index f3430c69..5a51e95b 100644 --- a/taiga/importers/management/commands/import_from_pivotal.py +++ b/taiga/importers/management/commands/import_from_pivotal.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/management/commands/import_from_trello.py b/taiga/importers/management/commands/import_from_trello.py index c04537fe..903a601f 100644 --- a/taiga/importers/management/commands/import_from_trello.py +++ b/taiga/importers/management/commands/import_from_trello.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/permissions.py b/taiga/importers/permissions.py index 1532989e..beca1b69 100644 --- a/taiga/importers/permissions.py +++ b/taiga/importers/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/pivotal/api.py b/taiga/importers/pivotal/api.py index 1176f9aa..0838edbb 100644 --- a/taiga/importers/pivotal/api.py +++ b/taiga/importers/pivotal/api.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/pivotal/tasks.py b/taiga/importers/pivotal/tasks.py index b9954201..fe6a3919 100644 --- a/taiga/importers/pivotal/tasks.py +++ b/taiga/importers/pivotal/tasks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/trello/api.py b/taiga/importers/trello/api.py index f616d9b8..21da8a1b 100644 --- a/taiga/importers/trello/api.py +++ b/taiga/importers/trello/api.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/trello/importer.py b/taiga/importers/trello/importer.py index 227339e4..bb1ea92f 100644 --- a/taiga/importers/trello/importer.py +++ b/taiga/importers/trello/importer.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/importers/trello/tasks.py b/taiga/importers/trello/tasks.py index 1cb2fe32..0d710f46 100644 --- a/taiga/importers/trello/tasks.py +++ b/taiga/importers/trello/tasks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/locale/api.py b/taiga/locale/api.py index d9add761..48b4d31a 100644 --- a/taiga/locale/api.py +++ b/taiga/locale/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index 5031baec..53ee265a 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/de/LC_MESSAGES/django.po b/taiga/locale/de/LC_MESSAGES/django.po index ea178737..e4b681c3 100644 --- a/taiga/locale/de/LC_MESSAGES/django.po +++ b/taiga/locale/de/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/en/LC_MESSAGES/django.po b/taiga/locale/en/LC_MESSAGES/django.po index 235d52e8..cdb9a649 100644 --- a/taiga/locale/en/LC_MESSAGES/django.po +++ b/taiga/locale/en/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # FIRST AUTHOR , YEAR. # diff --git a/taiga/locale/es/LC_MESSAGES/django.po b/taiga/locale/es/LC_MESSAGES/django.po index 7e46da9f..d9a9dea8 100644 --- a/taiga/locale/es/LC_MESSAGES/django.po +++ b/taiga/locale/es/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/fi/LC_MESSAGES/django.po b/taiga/locale/fi/LC_MESSAGES/django.po index bedd821d..44f80774 100644 --- a/taiga/locale/fi/LC_MESSAGES/django.po +++ b/taiga/locale/fi/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/fr/LC_MESSAGES/django.po b/taiga/locale/fr/LC_MESSAGES/django.po index 262b2d5c..a73f1311 100644 --- a/taiga/locale/fr/LC_MESSAGES/django.po +++ b/taiga/locale/fr/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/it/LC_MESSAGES/django.po b/taiga/locale/it/LC_MESSAGES/django.po index 98d7e7f0..1bb3a8ee 100644 --- a/taiga/locale/it/LC_MESSAGES/django.po +++ b/taiga/locale/it/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po index e9fb7663..5dee6802 100644 --- a/taiga/locale/ja/LC_MESSAGES/django.po +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/ko/LC_MESSAGES/django.po b/taiga/locale/ko/LC_MESSAGES/django.po index aed2fe9b..c200901d 100644 --- a/taiga/locale/ko/LC_MESSAGES/django.po +++ b/taiga/locale/ko/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/nb/LC_MESSAGES/django.po b/taiga/locale/nb/LC_MESSAGES/django.po index 58bd5a35..795b3758 100644 --- a/taiga/locale/nb/LC_MESSAGES/django.po +++ b/taiga/locale/nb/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/nl/LC_MESSAGES/django.po b/taiga/locale/nl/LC_MESSAGES/django.po index 51ac720a..805c7d77 100644 --- a/taiga/locale/nl/LC_MESSAGES/django.po +++ b/taiga/locale/nl/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/permissions.py b/taiga/locale/permissions.py index 3146d58e..fc22c58c 100644 --- a/taiga/locale/permissions.py +++ b/taiga/locale/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/locale/pl/LC_MESSAGES/django.po b/taiga/locale/pl/LC_MESSAGES/django.po index 37dd69ba..189483bd 100644 --- a/taiga/locale/pl/LC_MESSAGES/django.po +++ b/taiga/locale/pl/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/pt_BR/LC_MESSAGES/django.po b/taiga/locale/pt_BR/LC_MESSAGES/django.po index 84abac6a..c051a8c8 100644 --- a/taiga/locale/pt_BR/LC_MESSAGES/django.po +++ b/taiga/locale/pt_BR/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/ru/LC_MESSAGES/django.po b/taiga/locale/ru/LC_MESSAGES/django.po index 07838035..fb92d9e5 100644 --- a/taiga/locale/ru/LC_MESSAGES/django.po +++ b/taiga/locale/ru/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/sv/LC_MESSAGES/django.po b/taiga/locale/sv/LC_MESSAGES/django.po index e9eecfb6..3b75c061 100644 --- a/taiga/locale/sv/LC_MESSAGES/django.po +++ b/taiga/locale/sv/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/tr/LC_MESSAGES/django.po b/taiga/locale/tr/LC_MESSAGES/django.po index 87cd1276..03024ade 100644 --- a/taiga/locale/tr/LC_MESSAGES/django.po +++ b/taiga/locale/tr/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/zh-Hans/LC_MESSAGES/django.po b/taiga/locale/zh-Hans/LC_MESSAGES/django.po index d032baac..2e171868 100644 --- a/taiga/locale/zh-Hans/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hans/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/zh-Hant/LC_MESSAGES/django.po b/taiga/locale/zh-Hant/LC_MESSAGES/django.po index ed4fab5c..65108422 100644 --- a/taiga/locale/zh-Hant/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hant/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/mdrender/extensions/target_link.py b/taiga/mdrender/extensions/target_link.py index b9cff1c3..1f12b66d 100644 --- a/taiga/mdrender/extensions/target_link.py +++ b/taiga/mdrender/extensions/target_link.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/mdrender/extensions/wikilinks.py b/taiga/mdrender/extensions/wikilinks.py index 52363bc1..890ce3ca 100644 --- a/taiga/mdrender/extensions/wikilinks.py +++ b/taiga/mdrender/extensions/wikilinks.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/mdrender/service.py b/taiga/mdrender/service.py index c24454e4..3a6a5908 100644 --- a/taiga/mdrender/service.py +++ b/taiga/mdrender/service.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/mdrender/templatetags/functions.py b/taiga/mdrender/templatetags/functions.py index 3bb52ebc..dab2f04d 100644 --- a/taiga/mdrender/templatetags/functions.py +++ b/taiga/mdrender/templatetags/functions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/permissions/choices.py b/taiga/permissions/choices.py index 594d48ee..0a86df50 100644 --- a/taiga/permissions/choices.py +++ b/taiga/permissions/choices.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/permissions/permissions.py b/taiga/permissions/permissions.py index 95a2620b..366c8d78 100644 --- a/taiga/permissions/permissions.py +++ b/taiga/permissions/permissions.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/permissions/services.py b/taiga/permissions/services.py index 50d8d72d..ba9b8137 100644 --- a/taiga/permissions/services.py +++ b/taiga/permissions/services.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/__init__.py b/taiga/projects/__init__.py index a4281e96..ca7b3169 100644 --- a/taiga/projects/__init__.py +++ b/taiga/projects/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/admin.py b/taiga/projects/admin.py index 5c7cd25a..c7d0bc31 100644 --- a/taiga/projects/admin.py +++ b/taiga/projects/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/api.py b/taiga/projects/api.py index d0cdb91e..83b75487 100644 --- a/taiga/projects/api.py +++ b/taiga/projects/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/apps.py b/taiga/projects/apps.py index 2ef6ac55..89977ccf 100644 --- a/taiga/projects/apps.py +++ b/taiga/projects/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/__init__.py b/taiga/projects/attachments/__init__.py index bdc2814a..3ddc3fe0 100644 --- a/taiga/projects/attachments/__init__.py +++ b/taiga/projects/attachments/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/admin.py b/taiga/projects/attachments/admin.py index 40dd7aac..9ac79288 100644 --- a/taiga/projects/attachments/admin.py +++ b/taiga/projects/attachments/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/api.py b/taiga/projects/attachments/api.py index 3bcbf6cf..d0fa92bb 100644 --- a/taiga/projects/attachments/api.py +++ b/taiga/projects/attachments/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/apps.py b/taiga/projects/attachments/apps.py index 2f9edae2..1b77c3b4 100644 --- a/taiga/projects/attachments/apps.py +++ b/taiga/projects/attachments/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/management/commands/generate_sha1.py b/taiga/projects/attachments/management/commands/generate_sha1.py index 567788d1..e89ee4cf 100644 --- a/taiga/projects/attachments/management/commands/generate_sha1.py +++ b/taiga/projects/attachments/management/commands/generate_sha1.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/models.py b/taiga/projects/attachments/models.py index d986dbd4..f988e5d9 100644 --- a/taiga/projects/attachments/models.py +++ b/taiga/projects/attachments/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/permissions.py b/taiga/projects/attachments/permissions.py index d949ade2..7653e7f3 100644 --- a/taiga/projects/attachments/permissions.py +++ b/taiga/projects/attachments/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/serializers.py b/taiga/projects/attachments/serializers.py index 398dabdd..e7fbc297 100644 --- a/taiga/projects/attachments/serializers.py +++ b/taiga/projects/attachments/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/services.py b/taiga/projects/attachments/services.py index 80f4afc3..0c5ac4a0 100644 --- a/taiga/projects/attachments/services.py +++ b/taiga/projects/attachments/services.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/utils.py b/taiga/projects/attachments/utils.py index b1f6b08e..3c1c42ee 100644 --- a/taiga/projects/attachments/utils.py +++ b/taiga/projects/attachments/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/attachments/validators.py b/taiga/projects/attachments/validators.py index 2ed32e11..1a10dab4 100644 --- a/taiga/projects/attachments/validators.py +++ b/taiga/projects/attachments/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/choices.py b/taiga/projects/choices.py index d1458c44..550807d3 100644 --- a/taiga/projects/choices.py +++ b/taiga/projects/choices.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/contact/admin.py b/taiga/projects/contact/admin.py index 89450c82..99545dfb 100644 --- a/taiga/projects/contact/admin.py +++ b/taiga/projects/contact/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/contact/api.py b/taiga/projects/contact/api.py index 9f5c532a..7d398144 100644 --- a/taiga/projects/contact/api.py +++ b/taiga/projects/contact/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/contact/models.py b/taiga/projects/contact/models.py index c9a210cf..ce2c47a1 100644 --- a/taiga/projects/contact/models.py +++ b/taiga/projects/contact/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/contact/permissions.py b/taiga/projects/contact/permissions.py index d8111b1d..678aede9 100644 --- a/taiga/projects/contact/permissions.py +++ b/taiga/projects/contact/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/contact/services.py b/taiga/projects/contact/services.py index 0fe6ed7e..d623c78b 100644 --- a/taiga/projects/contact/services.py +++ b/taiga/projects/contact/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/contact/validators.py b/taiga/projects/contact/validators.py index e7c3aa36..5ee8ac88 100644 --- a/taiga/projects/contact/validators.py +++ b/taiga/projects/contact/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/custom_attributes/admin.py b/taiga/projects/custom_attributes/admin.py index ffa676d5..664524f9 100644 --- a/taiga/projects/custom_attributes/admin.py +++ b/taiga/projects/custom_attributes/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/custom_attributes/api.py b/taiga/projects/custom_attributes/api.py index e13a989a..daf4e24c 100644 --- a/taiga/projects/custom_attributes/api.py +++ b/taiga/projects/custom_attributes/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/custom_attributes/choices.py b/taiga/projects/custom_attributes/choices.py index 355cf4d1..a4cedf34 100644 --- a/taiga/projects/custom_attributes/choices.py +++ b/taiga/projects/custom_attributes/choices.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/custom_attributes/models.py b/taiga/projects/custom_attributes/models.py index 45269051..d239e70d 100644 --- a/taiga/projects/custom_attributes/models.py +++ b/taiga/projects/custom_attributes/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/custom_attributes/permissions.py b/taiga/projects/custom_attributes/permissions.py index ffc6a04c..b93ce5b7 100644 --- a/taiga/projects/custom_attributes/permissions.py +++ b/taiga/projects/custom_attributes/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/custom_attributes/serializers.py b/taiga/projects/custom_attributes/serializers.py index bf31792a..8c6d3f06 100644 --- a/taiga/projects/custom_attributes/serializers.py +++ b/taiga/projects/custom_attributes/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/custom_attributes/services.py b/taiga/projects/custom_attributes/services.py index 4a30305e..65542ec7 100644 --- a/taiga/projects/custom_attributes/services.py +++ b/taiga/projects/custom_attributes/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/custom_attributes/signals.py b/taiga/projects/custom_attributes/signals.py index 96e74e9e..606ed1c9 100644 --- a/taiga/projects/custom_attributes/signals.py +++ b/taiga/projects/custom_attributes/signals.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/custom_attributes/validators.py b/taiga/projects/custom_attributes/validators.py index 98fd494b..5f09e1d1 100644 --- a/taiga/projects/custom_attributes/validators.py +++ b/taiga/projects/custom_attributes/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/epics/__init__.py b/taiga/projects/epics/__init__.py index cc0dd3b9..dcbc3cba 100644 --- a/taiga/projects/epics/__init__.py +++ b/taiga/projects/epics/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/epics/admin.py b/taiga/projects/epics/admin.py index a5dff623..3a17258a 100644 --- a/taiga/projects/epics/admin.py +++ b/taiga/projects/epics/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/epics/api.py b/taiga/projects/epics/api.py index b2e53052..eb5e1f5b 100644 --- a/taiga/projects/epics/api.py +++ b/taiga/projects/epics/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/epics/apps.py b/taiga/projects/epics/apps.py index bf489ea0..235ba32b 100644 --- a/taiga/projects/epics/apps.py +++ b/taiga/projects/epics/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/epics/models.py b/taiga/projects/epics/models.py index 906e5f8d..26957df0 100644 --- a/taiga/projects/epics/models.py +++ b/taiga/projects/epics/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/epics/permissions.py b/taiga/projects/epics/permissions.py index fd473e18..904c417a 100644 --- a/taiga/projects/epics/permissions.py +++ b/taiga/projects/epics/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/epics/serializers.py b/taiga/projects/epics/serializers.py index feccc79a..48dbc22d 100644 --- a/taiga/projects/epics/serializers.py +++ b/taiga/projects/epics/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/epics/services.py b/taiga/projects/epics/services.py index e2e712d4..b43424cf 100644 --- a/taiga/projects/epics/services.py +++ b/taiga/projects/epics/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/epics/utils.py b/taiga/projects/epics/utils.py index 49e394d8..1637aa0b 100644 --- a/taiga/projects/epics/utils.py +++ b/taiga/projects/epics/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/epics/validators.py b/taiga/projects/epics/validators.py index f5d71ab2..a82883ce 100644 --- a/taiga/projects/epics/validators.py +++ b/taiga/projects/epics/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/filters.py b/taiga/projects/filters.py index c4e4f90b..4dacd29f 100644 --- a/taiga/projects/filters.py +++ b/taiga/projects/filters.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/history/api.py b/taiga/projects/history/api.py index 17c2fa83..52dabcb0 100644 --- a/taiga/projects/history/api.py +++ b/taiga/projects/history/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/history/choices.py b/taiga/projects/history/choices.py index 411e0f55..0a85b9d4 100644 --- a/taiga/projects/history/choices.py +++ b/taiga/projects/history/choices.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/history/freeze_impl.py b/taiga/projects/history/freeze_impl.py index 159d7a3f..c3394baa 100644 --- a/taiga/projects/history/freeze_impl.py +++ b/taiga/projects/history/freeze_impl.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/history/mixins.py b/taiga/projects/history/mixins.py index 0bb90fd0..9f4cdf8c 100644 --- a/taiga/projects/history/mixins.py +++ b/taiga/projects/history/mixins.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/history/models.py b/taiga/projects/history/models.py index 1a2ded60..88fd3c57 100644 --- a/taiga/projects/history/models.py +++ b/taiga/projects/history/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/history/permissions.py b/taiga/projects/history/permissions.py index 40e4f98b..3c8ad53f 100644 --- a/taiga/projects/history/permissions.py +++ b/taiga/projects/history/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/history/serializers.py b/taiga/projects/history/serializers.py index 3bacd6dd..bf2ed595 100644 --- a/taiga/projects/history/serializers.py +++ b/taiga/projects/history/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/history/services.py b/taiga/projects/history/services.py index 1bf27dee..27be7cae 100644 --- a/taiga/projects/history/services.py +++ b/taiga/projects/history/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/history/templatetags/functions.py b/taiga/projects/history/templatetags/functions.py index 8eefa6c1..e405e40c 100644 --- a/taiga/projects/history/templatetags/functions.py +++ b/taiga/projects/history/templatetags/functions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/history/utils.py b/taiga/projects/history/utils.py index a273f748..b4bd3980 100644 --- a/taiga/projects/history/utils.py +++ b/taiga/projects/history/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/__init__.py b/taiga/projects/issues/__init__.py index a259bd6b..a6a1368b 100644 --- a/taiga/projects/issues/__init__.py +++ b/taiga/projects/issues/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/admin.py b/taiga/projects/issues/admin.py index 9618bffa..9ce0a767 100644 --- a/taiga/projects/issues/admin.py +++ b/taiga/projects/issues/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/api.py b/taiga/projects/issues/api.py index a7479d64..7a59e784 100644 --- a/taiga/projects/issues/api.py +++ b/taiga/projects/issues/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/apps.py b/taiga/projects/issues/apps.py index de4de986..81a5ddce 100644 --- a/taiga/projects/issues/apps.py +++ b/taiga/projects/issues/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/models.py b/taiga/projects/issues/models.py index 8f9c18a3..c2f3696b 100644 --- a/taiga/projects/issues/models.py +++ b/taiga/projects/issues/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/permissions.py b/taiga/projects/issues/permissions.py index d86f697c..6218e8e6 100644 --- a/taiga/projects/issues/permissions.py +++ b/taiga/projects/issues/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/serializers.py b/taiga/projects/issues/serializers.py index 8ec8e492..80057dcc 100644 --- a/taiga/projects/issues/serializers.py +++ b/taiga/projects/issues/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/services.py b/taiga/projects/issues/services.py index ad87a61e..a2646d78 100644 --- a/taiga/projects/issues/services.py +++ b/taiga/projects/issues/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/signals.py b/taiga/projects/issues/signals.py index 91bb5ebc..ce2b6cab 100644 --- a/taiga/projects/issues/signals.py +++ b/taiga/projects/issues/signals.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/utils.py b/taiga/projects/issues/utils.py index 2053d923..c2227ff6 100644 --- a/taiga/projects/issues/utils.py +++ b/taiga/projects/issues/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/issues/validators.py b/taiga/projects/issues/validators.py index 5052fb54..7523fa0b 100644 --- a/taiga/projects/issues/validators.py +++ b/taiga/projects/issues/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/likes/admin.py b/taiga/projects/likes/admin.py index bab44a69..2c167f19 100644 --- a/taiga/projects/likes/admin.py +++ b/taiga/projects/likes/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/likes/mixins/viewsets.py b/taiga/projects/likes/mixins/viewsets.py index cce443c8..30abf977 100644 --- a/taiga/projects/likes/mixins/viewsets.py +++ b/taiga/projects/likes/mixins/viewsets.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/likes/models.py b/taiga/projects/likes/models.py index c363b8c8..e384f228 100644 --- a/taiga/projects/likes/models.py +++ b/taiga/projects/likes/models.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/likes/serializers.py b/taiga/projects/likes/serializers.py index ef058e70..6cf4b87a 100644 --- a/taiga/projects/likes/serializers.py +++ b/taiga/projects/likes/serializers.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/likes/services.py b/taiga/projects/likes/services.py index 617a4da9..aca6b395 100644 --- a/taiga/projects/likes/services.py +++ b/taiga/projects/likes/services.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/management/commands/block_user_projects.py b/taiga/projects/management/commands/block_user_projects.py index 3cf86cb7..09a48f3a 100644 --- a/taiga/projects/management/commands/block_user_projects.py +++ b/taiga/projects/management/commands/block_user_projects.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/management/commands/change_project_slug.py b/taiga/projects/management/commands/change_project_slug.py index e27dc77f..e078995f 100644 --- a/taiga/projects/management/commands/change_project_slug.py +++ b/taiga/projects/management/commands/change_project_slug.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/management/commands/sample_data.py b/taiga/projects/management/commands/sample_data.py index cc502d0d..14ff7663 100644 --- a/taiga/projects/management/commands/sample_data.py +++ b/taiga/projects/management/commands/sample_data.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/milestones/admin.py b/taiga/projects/milestones/admin.py index 2636c7d2..d525df64 100644 --- a/taiga/projects/milestones/admin.py +++ b/taiga/projects/milestones/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/milestones/api.py b/taiga/projects/milestones/api.py index e53c8110..4fa233c0 100644 --- a/taiga/projects/milestones/api.py +++ b/taiga/projects/milestones/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/milestones/models.py b/taiga/projects/milestones/models.py index 86eb3251..39c125e1 100644 --- a/taiga/projects/milestones/models.py +++ b/taiga/projects/milestones/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/milestones/permissions.py b/taiga/projects/milestones/permissions.py index fedb1ee0..4029c846 100644 --- a/taiga/projects/milestones/permissions.py +++ b/taiga/projects/milestones/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/milestones/serializers.py b/taiga/projects/milestones/serializers.py index 49f7e09c..484c089b 100644 --- a/taiga/projects/milestones/serializers.py +++ b/taiga/projects/milestones/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/milestones/services.py b/taiga/projects/milestones/services.py index 289c4834..af50b81e 100644 --- a/taiga/projects/milestones/services.py +++ b/taiga/projects/milestones/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/milestones/utils.py b/taiga/projects/milestones/utils.py index bea1cf12..b67bf17e 100644 --- a/taiga/projects/milestones/utils.py +++ b/taiga/projects/milestones/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/milestones/validators.py b/taiga/projects/milestones/validators.py index b7d4d484..c37ae2b1 100644 --- a/taiga/projects/milestones/validators.py +++ b/taiga/projects/milestones/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/mixins/blocked.py b/taiga/projects/mixins/blocked.py index d7f729cc..bf63feb2 100644 --- a/taiga/projects/mixins/blocked.py +++ b/taiga/projects/mixins/blocked.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/mixins/by_ref.py b/taiga/projects/mixins/by_ref.py index 4e1dbad9..5a6793cd 100644 --- a/taiga/projects/mixins/by_ref.py +++ b/taiga/projects/mixins/by_ref.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/mixins/on_destroy.py b/taiga/projects/mixins/on_destroy.py index 61d4728d..80a160b2 100644 --- a/taiga/projects/mixins/on_destroy.py +++ b/taiga/projects/mixins/on_destroy.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/mixins/ordering.py b/taiga/projects/mixins/ordering.py index 18649c16..7c24b836 100644 --- a/taiga/projects/mixins/ordering.py +++ b/taiga/projects/mixins/ordering.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/mixins/serializers.py b/taiga/projects/mixins/serializers.py index c8a70932..3bef1aaa 100644 --- a/taiga/projects/mixins/serializers.py +++ b/taiga/projects/mixins/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/models.py b/taiga/projects/models.py index d8f80b1b..3a345088 100644 --- a/taiga/projects/models.py +++ b/taiga/projects/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/admin.py b/taiga/projects/notifications/admin.py index 5e0bd931..1da3c97c 100644 --- a/taiga/projects/notifications/admin.py +++ b/taiga/projects/notifications/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/api.py b/taiga/projects/notifications/api.py index 9936ae52..8a7a06dd 100644 --- a/taiga/projects/notifications/api.py +++ b/taiga/projects/notifications/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/choices.py b/taiga/projects/notifications/choices.py index fdf87328..9fbe0f07 100644 --- a/taiga/projects/notifications/choices.py +++ b/taiga/projects/notifications/choices.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/management/commands/send_notifications.py b/taiga/projects/notifications/management/commands/send_notifications.py index 4c87b569..988454eb 100644 --- a/taiga/projects/notifications/management/commands/send_notifications.py +++ b/taiga/projects/notifications/management/commands/send_notifications.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/mixins.py b/taiga/projects/notifications/mixins.py index e9dff950..cf23b490 100644 --- a/taiga/projects/notifications/mixins.py +++ b/taiga/projects/notifications/mixins.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/models.py b/taiga/projects/notifications/models.py index 4a2f56da..a8dc3e96 100644 --- a/taiga/projects/notifications/models.py +++ b/taiga/projects/notifications/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/permissions.py b/taiga/projects/notifications/permissions.py index 9515f393..1f6aa075 100644 --- a/taiga/projects/notifications/permissions.py +++ b/taiga/projects/notifications/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/serializers.py b/taiga/projects/notifications/serializers.py index 1578b7be..4387c19c 100644 --- a/taiga/projects/notifications/serializers.py +++ b/taiga/projects/notifications/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/services.py b/taiga/projects/notifications/services.py index b8453b16..2e1d6d55 100644 --- a/taiga/projects/notifications/services.py +++ b/taiga/projects/notifications/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/utils.py b/taiga/projects/notifications/utils.py index ae6bd34c..6246cd62 100644 --- a/taiga/projects/notifications/utils.py +++ b/taiga/projects/notifications/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/notifications/validators.py b/taiga/projects/notifications/validators.py index 40e02083..2fd4a537 100644 --- a/taiga/projects/notifications/validators.py +++ b/taiga/projects/notifications/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/occ/__init__.py b/taiga/projects/occ/__init__.py index 248c7af9..142fb2b3 100644 --- a/taiga/projects/occ/__init__.py +++ b/taiga/projects/occ/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/occ/mixins.py b/taiga/projects/occ/mixins.py index 7e837422..3807e1cf 100644 --- a/taiga/projects/occ/mixins.py +++ b/taiga/projects/occ/mixins.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/permissions.py b/taiga/projects/permissions.py index cda5c17c..6df6ae73 100644 --- a/taiga/projects/permissions.py +++ b/taiga/projects/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/references/api.py b/taiga/projects/references/api.py index a4ae20ec..10a08538 100644 --- a/taiga/projects/references/api.py +++ b/taiga/projects/references/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/references/models.py b/taiga/projects/references/models.py index d6ad400b..68f07dd3 100644 --- a/taiga/projects/references/models.py +++ b/taiga/projects/references/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/references/permissions.py b/taiga/projects/references/permissions.py index 9baa2a5c..94f23767 100644 --- a/taiga/projects/references/permissions.py +++ b/taiga/projects/references/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/references/sequences.py b/taiga/projects/references/sequences.py index 711b5555..9c025387 100644 --- a/taiga/projects/references/sequences.py +++ b/taiga/projects/references/sequences.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/references/services.py b/taiga/projects/references/services.py index 6469937d..8db331c5 100644 --- a/taiga/projects/references/services.py +++ b/taiga/projects/references/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/references/validators.py b/taiga/projects/references/validators.py index e91adb21..ad51e42c 100644 --- a/taiga/projects/references/validators.py +++ b/taiga/projects/references/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/serializers.py b/taiga/projects/serializers.py index 6bdb05e5..42e72575 100644 --- a/taiga/projects/serializers.py +++ b/taiga/projects/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/services/__init__.py b/taiga/projects/services/__init__.py index b5e231c4..1b0aa8b9 100644 --- a/taiga/projects/services/__init__.py +++ b/taiga/projects/services/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/services/bulk_update_order.py b/taiga/projects/services/bulk_update_order.py index c07b48a2..093c97e8 100644 --- a/taiga/projects/services/bulk_update_order.py +++ b/taiga/projects/services/bulk_update_order.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/services/filters.py b/taiga/projects/services/filters.py index 0236e82b..ceecd29b 100644 --- a/taiga/projects/services/filters.py +++ b/taiga/projects/services/filters.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/services/invitations.py b/taiga/projects/services/invitations.py index 5e772bd2..1f644a86 100644 --- a/taiga/projects/services/invitations.py +++ b/taiga/projects/services/invitations.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/services/logo.py b/taiga/projects/services/logo.py index 1f4f7a38..96a3e292 100644 --- a/taiga/projects/services/logo.py +++ b/taiga/projects/services/logo.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/services/members.py b/taiga/projects/services/members.py index 6164ed24..e5d2f352 100644 --- a/taiga/projects/services/members.py +++ b/taiga/projects/services/members.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/services/modules_config.py b/taiga/projects/services/modules_config.py index d48a7094..54e88c4b 100644 --- a/taiga/projects/services/modules_config.py +++ b/taiga/projects/services/modules_config.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/services/projects.py b/taiga/projects/services/projects.py index 3f97d877..02e66539 100644 --- a/taiga/projects/services/projects.py +++ b/taiga/projects/services/projects.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/services/stats.py b/taiga/projects/services/stats.py index 891be36b..7b18750e 100644 --- a/taiga/projects/services/stats.py +++ b/taiga/projects/services/stats.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/services/transfer.py b/taiga/projects/services/transfer.py index aa9ea934..6017d8ad 100644 --- a/taiga/projects/services/transfer.py +++ b/taiga/projects/services/transfer.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/signals.py b/taiga/projects/signals.py index 6a0c016c..33bf4e59 100644 --- a/taiga/projects/signals.py +++ b/taiga/projects/signals.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tagging/api.py b/taiga/projects/tagging/api.py index 01a7d07e..66d7ab7d 100644 --- a/taiga/projects/tagging/api.py +++ b/taiga/projects/tagging/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tagging/fields.py b/taiga/projects/tagging/fields.py index 3a33ca87..e1a9edf1 100644 --- a/taiga/projects/tagging/fields.py +++ b/taiga/projects/tagging/fields.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tagging/models.py b/taiga/projects/tagging/models.py index 5ad63b39..8c60e1d3 100644 --- a/taiga/projects/tagging/models.py +++ b/taiga/projects/tagging/models.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tagging/serializers.py b/taiga/projects/tagging/serializers.py index 494b508a..efafb376 100644 --- a/taiga/projects/tagging/serializers.py +++ b/taiga/projects/tagging/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tagging/services.py b/taiga/projects/tagging/services.py index 78fd00b6..e5b1072a 100644 --- a/taiga/projects/tagging/services.py +++ b/taiga/projects/tagging/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tagging/signals.py b/taiga/projects/tagging/signals.py index cc94461a..a60c3a37 100644 --- a/taiga/projects/tagging/signals.py +++ b/taiga/projects/tagging/signals.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tagging/validators.py b/taiga/projects/tagging/validators.py index 4070045d..1252eeed 100644 --- a/taiga/projects/tagging/validators.py +++ b/taiga/projects/tagging/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/__init__.py b/taiga/projects/tasks/__init__.py index 78f3e8ae..2751da00 100644 --- a/taiga/projects/tasks/__init__.py +++ b/taiga/projects/tasks/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/admin.py b/taiga/projects/tasks/admin.py index 9d094906..b090e596 100644 --- a/taiga/projects/tasks/admin.py +++ b/taiga/projects/tasks/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/api.py b/taiga/projects/tasks/api.py index 75026865..60f8b6e4 100644 --- a/taiga/projects/tasks/api.py +++ b/taiga/projects/tasks/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/apps.py b/taiga/projects/tasks/apps.py index 1ad2e96d..f7294215 100644 --- a/taiga/projects/tasks/apps.py +++ b/taiga/projects/tasks/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/models.py b/taiga/projects/tasks/models.py index a0abe570..5b7b0045 100644 --- a/taiga/projects/tasks/models.py +++ b/taiga/projects/tasks/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/permissions.py b/taiga/projects/tasks/permissions.py index a1cbdfe1..46c6356f 100644 --- a/taiga/projects/tasks/permissions.py +++ b/taiga/projects/tasks/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/serializers.py b/taiga/projects/tasks/serializers.py index 0a877b4f..04cab33e 100644 --- a/taiga/projects/tasks/serializers.py +++ b/taiga/projects/tasks/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/services.py b/taiga/projects/tasks/services.py index b785d373..52f1bb55 100644 --- a/taiga/projects/tasks/services.py +++ b/taiga/projects/tasks/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/signals.py b/taiga/projects/tasks/signals.py index dfb698e5..aa40ca96 100644 --- a/taiga/projects/tasks/signals.py +++ b/taiga/projects/tasks/signals.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/utils.py b/taiga/projects/tasks/utils.py index d06f96e3..ee61a1f3 100644 --- a/taiga/projects/tasks/utils.py +++ b/taiga/projects/tasks/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/tasks/validators.py b/taiga/projects/tasks/validators.py index d7498cc6..7f38f80b 100644 --- a/taiga/projects/tasks/validators.py +++ b/taiga/projects/tasks/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/throttling.py b/taiga/projects/throttling.py index f46844f3..ac127285 100644 --- a/taiga/projects/throttling.py +++ b/taiga/projects/throttling.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/translations.py b/taiga/projects/translations.py index 3f22f6e0..fdd8f2c0 100644 --- a/taiga/projects/translations.py +++ b/taiga/projects/translations.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/__init__.py b/taiga/projects/userstories/__init__.py index e73d4118..e18c925d 100644 --- a/taiga/projects/userstories/__init__.py +++ b/taiga/projects/userstories/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/admin.py b/taiga/projects/userstories/admin.py index 6ea5a100..f95b433a 100644 --- a/taiga/projects/userstories/admin.py +++ b/taiga/projects/userstories/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/api.py b/taiga/projects/userstories/api.py index c21ea7ae..e536b8e6 100644 --- a/taiga/projects/userstories/api.py +++ b/taiga/projects/userstories/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/apps.py b/taiga/projects/userstories/apps.py index d2fa8ce1..8401fafd 100644 --- a/taiga/projects/userstories/apps.py +++ b/taiga/projects/userstories/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/filters.py b/taiga/projects/userstories/filters.py index ec19b6a7..316c1921 100644 --- a/taiga/projects/userstories/filters.py +++ b/taiga/projects/userstories/filters.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/models.py b/taiga/projects/userstories/models.py index a82dcab5..a6f3a414 100644 --- a/taiga/projects/userstories/models.py +++ b/taiga/projects/userstories/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/permissions.py b/taiga/projects/userstories/permissions.py index 2d200446..a762c670 100644 --- a/taiga/projects/userstories/permissions.py +++ b/taiga/projects/userstories/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/serializers.py b/taiga/projects/userstories/serializers.py index 7fecf778..3dcd2196 100644 --- a/taiga/projects/userstories/serializers.py +++ b/taiga/projects/userstories/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/services.py b/taiga/projects/userstories/services.py index a7ded8e5..efd66229 100644 --- a/taiga/projects/userstories/services.py +++ b/taiga/projects/userstories/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/signals.py b/taiga/projects/userstories/signals.py index ba643b61..dc7f9151 100644 --- a/taiga/projects/userstories/signals.py +++ b/taiga/projects/userstories/signals.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/utils.py b/taiga/projects/userstories/utils.py index 5e410aba..3a903491 100644 --- a/taiga/projects/userstories/utils.py +++ b/taiga/projects/userstories/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/userstories/validators.py b/taiga/projects/userstories/validators.py index cf901d10..0ebdcc4b 100644 --- a/taiga/projects/userstories/validators.py +++ b/taiga/projects/userstories/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/utils.py b/taiga/projects/utils.py index 12930f8a..ed26647c 100644 --- a/taiga/projects/utils.py +++ b/taiga/projects/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/validators.py b/taiga/projects/validators.py index 41a1a23e..fdbba552 100644 --- a/taiga/projects/validators.py +++ b/taiga/projects/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/votes/admin.py b/taiga/projects/votes/admin.py index d7a040e5..c5550802 100644 --- a/taiga/projects/votes/admin.py +++ b/taiga/projects/votes/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/votes/mixins/serializers.py b/taiga/projects/votes/mixins/serializers.py index 9f9d1049..e2f57318 100644 --- a/taiga/projects/votes/mixins/serializers.py +++ b/taiga/projects/votes/mixins/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/votes/mixins/viewsets.py b/taiga/projects/votes/mixins/viewsets.py index 50490ba7..4eaa43e6 100644 --- a/taiga/projects/votes/mixins/viewsets.py +++ b/taiga/projects/votes/mixins/viewsets.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/votes/models.py b/taiga/projects/votes/models.py index cfc0947e..8e5dbf18 100644 --- a/taiga/projects/votes/models.py +++ b/taiga/projects/votes/models.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/votes/serializers.py b/taiga/projects/votes/serializers.py index b97bd3bf..db479b24 100644 --- a/taiga/projects/votes/serializers.py +++ b/taiga/projects/votes/serializers.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/votes/services.py b/taiga/projects/votes/services.py index 5c99efa9..f6c3c1f2 100644 --- a/taiga/projects/votes/services.py +++ b/taiga/projects/votes/services.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/votes/utils.py b/taiga/projects/votes/utils.py index 077abd46..87f6f828 100644 --- a/taiga/projects/votes/utils.py +++ b/taiga/projects/votes/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/wiki/admin.py b/taiga/projects/wiki/admin.py index 2f0d1636..a42b0c3e 100644 --- a/taiga/projects/wiki/admin.py +++ b/taiga/projects/wiki/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/wiki/api.py b/taiga/projects/wiki/api.py index d6a3d44a..bc3002ab 100644 --- a/taiga/projects/wiki/api.py +++ b/taiga/projects/wiki/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/wiki/models.py b/taiga/projects/wiki/models.py index 7b913107..e280448a 100644 --- a/taiga/projects/wiki/models.py +++ b/taiga/projects/wiki/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/wiki/permissions.py b/taiga/projects/wiki/permissions.py index 5f2311b2..1b005778 100644 --- a/taiga/projects/wiki/permissions.py +++ b/taiga/projects/wiki/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/wiki/serializers.py b/taiga/projects/wiki/serializers.py index 548fbd17..8a3a33a8 100644 --- a/taiga/projects/wiki/serializers.py +++ b/taiga/projects/wiki/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/wiki/utils.py b/taiga/projects/wiki/utils.py index ecbf7602..e623cf04 100644 --- a/taiga/projects/wiki/utils.py +++ b/taiga/projects/wiki/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/projects/wiki/validators.py b/taiga/projects/wiki/validators.py index 9c5601f5..fd7c4ba8 100644 --- a/taiga/projects/wiki/validators.py +++ b/taiga/projects/wiki/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/routers.py b/taiga/routers.py index 013e7453..231755f2 100644 --- a/taiga/routers.py +++ b/taiga/routers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/searches/api.py b/taiga/searches/api.py index 0c252b5a..562c0b7e 100644 --- a/taiga/searches/api.py +++ b/taiga/searches/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/searches/serializers.py b/taiga/searches/serializers.py index 7adc34b2..f2a8c66c 100644 --- a/taiga/searches/serializers.py +++ b/taiga/searches/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/searches/services.py b/taiga/searches/services.py index 5bc6159b..6e43efd2 100644 --- a/taiga/searches/services.py +++ b/taiga/searches/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/stats/__init__.py b/taiga/stats/__init__.py index b393a91f..11b8fc6f 100644 --- a/taiga/stats/__init__.py +++ b/taiga/stats/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/stats/api.py b/taiga/stats/api.py index 5efeed1f..1b2d1c2f 100644 --- a/taiga/stats/api.py +++ b/taiga/stats/api.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/stats/apps.py b/taiga/stats/apps.py index 7e4d9729..47a26838 100644 --- a/taiga/stats/apps.py +++ b/taiga/stats/apps.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/stats/permissions.py b/taiga/stats/permissions.py index 83d8aca7..39e65c4c 100644 --- a/taiga/stats/permissions.py +++ b/taiga/stats/permissions.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/stats/routers.py b/taiga/stats/routers.py index 4623f3ca..b39d0d79 100644 --- a/taiga/stats/routers.py +++ b/taiga/stats/routers.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/stats/services.py b/taiga/stats/services.py index da551016..62f88716 100644 --- a/taiga/stats/services.py +++ b/taiga/stats/services.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/__init__.py b/taiga/timeline/__init__.py index 2ce879cf..dfbd438a 100644 --- a/taiga/timeline/__init__.py +++ b/taiga/timeline/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/api.py b/taiga/timeline/api.py index 2ebe5fa2..b23a5cbc 100644 --- a/taiga/timeline/api.py +++ b/taiga/timeline/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/apps.py b/taiga/timeline/apps.py index fa951716..75388a53 100644 --- a/taiga/timeline/apps.py +++ b/taiga/timeline/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/management/commands/_clear_unnecessary_new_membership_entries.py b/taiga/timeline/management/commands/_clear_unnecessary_new_membership_entries.py index 2f5f581c..d8ec58a2 100644 --- a/taiga/timeline/management/commands/_clear_unnecessary_new_membership_entries.py +++ b/taiga/timeline/management/commands/_clear_unnecessary_new_membership_entries.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/management/commands/_update_timeline_for_updated_tasks.py b/taiga/timeline/management/commands/_update_timeline_for_updated_tasks.py index 6c37b17c..4da0ca42 100644 --- a/taiga/timeline/management/commands/_update_timeline_for_updated_tasks.py +++ b/taiga/timeline/management/commands/_update_timeline_for_updated_tasks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/management/commands/rebuild_timeline.py b/taiga/timeline/management/commands/rebuild_timeline.py index fdd2dbd8..cb9e0bfe 100644 --- a/taiga/timeline/management/commands/rebuild_timeline.py +++ b/taiga/timeline/management/commands/rebuild_timeline.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/management/commands/rebuild_timeline_iterating_per_projects.py b/taiga/timeline/management/commands/rebuild_timeline_iterating_per_projects.py index f4c1a0a4..83651196 100644 --- a/taiga/timeline/management/commands/rebuild_timeline_iterating_per_projects.py +++ b/taiga/timeline/management/commands/rebuild_timeline_iterating_per_projects.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/models.py b/taiga/timeline/models.py index 52fe5aca..3e75c0ea 100644 --- a/taiga/timeline/models.py +++ b/taiga/timeline/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/permissions.py b/taiga/timeline/permissions.py index 61a20130..2a7d537d 100644 --- a/taiga/timeline/permissions.py +++ b/taiga/timeline/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/rebuilder.py b/taiga/timeline/rebuilder.py index e8100fed..c7ebcfef 100644 --- a/taiga/timeline/rebuilder.py +++ b/taiga/timeline/rebuilder.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/serializers.py b/taiga/timeline/serializers.py index 0b831d04..263b38ab 100644 --- a/taiga/timeline/serializers.py +++ b/taiga/timeline/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/service.py b/taiga/timeline/service.py index 07d742bf..44985e84 100644 --- a/taiga/timeline/service.py +++ b/taiga/timeline/service.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/signals.py b/taiga/timeline/signals.py index c5590c81..ce2fee93 100644 --- a/taiga/timeline/signals.py +++ b/taiga/timeline/signals.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/timeline/timeline_implementations.py b/taiga/timeline/timeline_implementations.py index 1d480e82..e7ed9f9c 100644 --- a/taiga/timeline/timeline_implementations.py +++ b/taiga/timeline/timeline_implementations.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/urls.py b/taiga/urls.py index 46735e60..25dfc18e 100644 --- a/taiga/urls.py +++ b/taiga/urls.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/admin.py b/taiga/users/admin.py index 9c52a9bb..212231fe 100644 --- a/taiga/users/admin.py +++ b/taiga/users/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/api.py b/taiga/users/api.py index d08ebeb9..d812b475 100644 --- a/taiga/users/api.py +++ b/taiga/users/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/filters.py b/taiga/users/filters.py index 9357bfa3..2c358c0d 100644 --- a/taiga/users/filters.py +++ b/taiga/users/filters.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/forms.py b/taiga/users/forms.py index 1d466f67..f9d7f0d6 100644 --- a/taiga/users/forms.py +++ b/taiga/users/forms.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/gravatar.py b/taiga/users/gravatar.py index b8329d95..e5e219fa 100644 --- a/taiga/users/gravatar.py +++ b/taiga/users/gravatar.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/models.py b/taiga/users/models.py index e1e7e173..9bf72000 100644 --- a/taiga/users/models.py +++ b/taiga/users/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/permissions.py b/taiga/users/permissions.py index 7edca716..ed002cc5 100644 --- a/taiga/users/permissions.py +++ b/taiga/users/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/serializers.py b/taiga/users/serializers.py index 1f6e0835..36d9a5a8 100644 --- a/taiga/users/serializers.py +++ b/taiga/users/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/services.py b/taiga/users/services.py index d4d520a7..ab1afdd0 100644 --- a/taiga/users/services.py +++ b/taiga/users/services.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/signals.py b/taiga/users/signals.py index d812f5fc..8d1bd03e 100644 --- a/taiga/users/signals.py +++ b/taiga/users/signals.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/throttling.py b/taiga/users/throttling.py index 9a5f4918..c27aed9f 100644 --- a/taiga/users/throttling.py +++ b/taiga/users/throttling.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/utils.py b/taiga/users/utils.py index 9101a63c..96ca287b 100644 --- a/taiga/users/utils.py +++ b/taiga/users/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/users/validators.py b/taiga/users/validators.py index 279e6ce4..45c42be0 100644 --- a/taiga/users/validators.py +++ b/taiga/users/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/userstorage/api.py b/taiga/userstorage/api.py index 94c5ea00..465a8f8e 100644 --- a/taiga/userstorage/api.py +++ b/taiga/userstorage/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/userstorage/filters.py b/taiga/userstorage/filters.py index 479c0220..70493df1 100644 --- a/taiga/userstorage/filters.py +++ b/taiga/userstorage/filters.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/userstorage/models.py b/taiga/userstorage/models.py index c1e94960..f7559747 100644 --- a/taiga/userstorage/models.py +++ b/taiga/userstorage/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/userstorage/permissions.py b/taiga/userstorage/permissions.py index 0b7083eb..fffc9002 100644 --- a/taiga/userstorage/permissions.py +++ b/taiga/userstorage/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/userstorage/serializers.py b/taiga/userstorage/serializers.py index 38765f19..a080ccc1 100644 --- a/taiga/userstorage/serializers.py +++ b/taiga/userstorage/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/userstorage/validators.py b/taiga/userstorage/validators.py index 615b88d7..43646e88 100644 --- a/taiga/userstorage/validators.py +++ b/taiga/userstorage/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/webhooks/__init__.py b/taiga/webhooks/__init__.py index 71041013..13bc7989 100644 --- a/taiga/webhooks/__init__.py +++ b/taiga/webhooks/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/webhooks/api.py b/taiga/webhooks/api.py index 4648a73a..d6a9b0ef 100644 --- a/taiga/webhooks/api.py +++ b/taiga/webhooks/api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/webhooks/apps.py b/taiga/webhooks/apps.py index 52e39eb0..3cee531a 100644 --- a/taiga/webhooks/apps.py +++ b/taiga/webhooks/apps.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/webhooks/models.py b/taiga/webhooks/models.py index b73d26d6..f7468497 100644 --- a/taiga/webhooks/models.py +++ b/taiga/webhooks/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/webhooks/permissions.py b/taiga/webhooks/permissions.py index f16cb76c..ef942651 100644 --- a/taiga/webhooks/permissions.py +++ b/taiga/webhooks/permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/webhooks/serializers.py b/taiga/webhooks/serializers.py index a6e89589..04516c06 100644 --- a/taiga/webhooks/serializers.py +++ b/taiga/webhooks/serializers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/webhooks/signal_handlers.py b/taiga/webhooks/signal_handlers.py index 5186454a..0f589286 100644 --- a/taiga/webhooks/signal_handlers.py +++ b/taiga/webhooks/signal_handlers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/webhooks/tasks.py b/taiga/webhooks/tasks.py index a0b737d0..343a87ac 100644 --- a/taiga/webhooks/tasks.py +++ b/taiga/webhooks/tasks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- # Copyright (C) 2013 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/webhooks/validators.py b/taiga/webhooks/validators.py index b95e2e64..5bb5dcf2 100644 --- a/taiga/webhooks/validators.py +++ b/taiga/webhooks/validators.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/taiga/wsgi.py b/taiga/wsgi.py index 356c63ef..3158cb6c 100644 --- a/taiga/wsgi.py +++ b/taiga/wsgi.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/conftest.py b/tests/conftest.py index 76d2540a..5c9c7686 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/factories.py b/tests/factories.py index 5564cc55..8e98aaa9 100644 --- a/tests/factories.py +++ b/tests/factories.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/fixtures.py b/tests/fixtures.py index aaeabb42..886f0f48 100644 --- a/tests/fixtures.py +++ b/tests/fixtures.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_application_tokens_resources.py b/tests/integration/resources_permissions/test_application_tokens_resources.py index 43c46952..e52df3b1 100644 --- a/tests/integration/resources_permissions/test_application_tokens_resources.py +++ b/tests/integration/resources_permissions/test_application_tokens_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_attachment_resources.py b/tests/integration/resources_permissions/test_attachment_resources.py index 02afaa2e..3f0d34f2 100644 --- a/tests/integration/resources_permissions/test_attachment_resources.py +++ b/tests/integration/resources_permissions/test_attachment_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_auth_resources.py b/tests/integration/resources_permissions/test_auth_resources.py index 4604936f..133bc5fa 100644 --- a/tests/integration/resources_permissions/test_auth_resources.py +++ b/tests/integration/resources_permissions/test_auth_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_contact.py b/tests/integration/resources_permissions/test_contact.py index dca0081e..7b5a1bec 100644 --- a/tests/integration/resources_permissions/test_contact.py +++ b/tests/integration/resources_permissions/test_contact.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_epics_custom_attributes_resource.py b/tests/integration/resources_permissions/test_epics_custom_attributes_resource.py index c35b93bd..f1cae79d 100644 --- a/tests/integration/resources_permissions/test_epics_custom_attributes_resource.py +++ b/tests/integration/resources_permissions/test_epics_custom_attributes_resource.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_epics_related_userstories_resources.py b/tests/integration/resources_permissions/test_epics_related_userstories_resources.py index 04dd28c1..565d9425 100644 --- a/tests/integration/resources_permissions/test_epics_related_userstories_resources.py +++ b/tests/integration/resources_permissions/test_epics_related_userstories_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_epics_resources.py b/tests/integration/resources_permissions/test_epics_resources.py index 15d9d05b..bfde0530 100644 --- a/tests/integration/resources_permissions/test_epics_resources.py +++ b/tests/integration/resources_permissions/test_epics_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_feedback.py b/tests/integration/resources_permissions/test_feedback.py index 752c1e71..566e10cd 100644 --- a/tests/integration/resources_permissions/test_feedback.py +++ b/tests/integration/resources_permissions/test_feedback.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_history_resources.py b/tests/integration/resources_permissions/test_history_resources.py index 95d77928..1742c14c 100644 --- a/tests/integration/resources_permissions/test_history_resources.py +++ b/tests/integration/resources_permissions/test_history_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_issues_custom_attributes_resource.py b/tests/integration/resources_permissions/test_issues_custom_attributes_resource.py index 1ec28157..e8377289 100644 --- a/tests/integration/resources_permissions/test_issues_custom_attributes_resource.py +++ b/tests/integration/resources_permissions/test_issues_custom_attributes_resource.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_issues_resources.py b/tests/integration/resources_permissions/test_issues_resources.py index b270c126..2fb507e1 100644 --- a/tests/integration/resources_permissions/test_issues_resources.py +++ b/tests/integration/resources_permissions/test_issues_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_milestones_resources.py b/tests/integration/resources_permissions/test_milestones_resources.py index 1a3ab5cb..4e78e6e1 100644 --- a/tests/integration/resources_permissions/test_milestones_resources.py +++ b/tests/integration/resources_permissions/test_milestones_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_modules_resources.py b/tests/integration/resources_permissions/test_modules_resources.py index 68f552f4..7cdbc9bb 100644 --- a/tests/integration/resources_permissions/test_modules_resources.py +++ b/tests/integration/resources_permissions/test_modules_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_projects_choices_resources.py b/tests/integration/resources_permissions/test_projects_choices_resources.py index 5399e354..62a91d5b 100644 --- a/tests/integration/resources_permissions/test_projects_choices_resources.py +++ b/tests/integration/resources_permissions/test_projects_choices_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_projects_resource.py b/tests/integration/resources_permissions/test_projects_resource.py index de6a7a32..9f2fbed2 100644 --- a/tests/integration/resources_permissions/test_projects_resource.py +++ b/tests/integration/resources_permissions/test_projects_resource.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_resolver_resources.py b/tests/integration/resources_permissions/test_resolver_resources.py index 7e98b692..ec1b4251 100644 --- a/tests/integration/resources_permissions/test_resolver_resources.py +++ b/tests/integration/resources_permissions/test_resolver_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_search_resources.py b/tests/integration/resources_permissions/test_search_resources.py index 633b3131..dcd76cbf 100644 --- a/tests/integration/resources_permissions/test_search_resources.py +++ b/tests/integration/resources_permissions/test_search_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_storage_resources.py b/tests/integration/resources_permissions/test_storage_resources.py index 8d2ddf3b..10d6abdd 100644 --- a/tests/integration/resources_permissions/test_storage_resources.py +++ b/tests/integration/resources_permissions/test_storage_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_tasks_custom_attributes_resource.py b/tests/integration/resources_permissions/test_tasks_custom_attributes_resource.py index 1efe9a8d..d42a59d6 100644 --- a/tests/integration/resources_permissions/test_tasks_custom_attributes_resource.py +++ b/tests/integration/resources_permissions/test_tasks_custom_attributes_resource.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_tasks_resources.py b/tests/integration/resources_permissions/test_tasks_resources.py index 31e5f34c..18c3593c 100644 --- a/tests/integration/resources_permissions/test_tasks_resources.py +++ b/tests/integration/resources_permissions/test_tasks_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_timelines_resources.py b/tests/integration/resources_permissions/test_timelines_resources.py index a6930a29..f32e7092 100644 --- a/tests/integration/resources_permissions/test_timelines_resources.py +++ b/tests/integration/resources_permissions/test_timelines_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_users_resources.py b/tests/integration/resources_permissions/test_users_resources.py index b15d9cde..b02c163c 100644 --- a/tests/integration/resources_permissions/test_users_resources.py +++ b/tests/integration/resources_permissions/test_users_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_userstories_custom_attributes_resource.py b/tests/integration/resources_permissions/test_userstories_custom_attributes_resource.py index 077219ce..925f2f2e 100644 --- a/tests/integration/resources_permissions/test_userstories_custom_attributes_resource.py +++ b/tests/integration/resources_permissions/test_userstories_custom_attributes_resource.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_userstories_resources.py b/tests/integration/resources_permissions/test_userstories_resources.py index aba70f81..578beff9 100644 --- a/tests/integration/resources_permissions/test_userstories_resources.py +++ b/tests/integration/resources_permissions/test_userstories_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_webhooks_resources.py b/tests/integration/resources_permissions/test_webhooks_resources.py index 34d4cf00..e951cdf0 100644 --- a/tests/integration/resources_permissions/test_webhooks_resources.py +++ b/tests/integration/resources_permissions/test_webhooks_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/resources_permissions/test_wiki_resources.py b/tests/integration/resources_permissions/test_wiki_resources.py index f4cdbc12..1bda977a 100644 --- a/tests/integration/resources_permissions/test_wiki_resources.py +++ b/tests/integration/resources_permissions/test_wiki_resources.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_application_tokens.py b/tests/integration/test_application_tokens.py index cae52b6c..ed969eaf 100644 --- a/tests/integration/test_application_tokens.py +++ b/tests/integration/test_application_tokens.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_attachments.py b/tests/integration/test_attachments.py index 06a49441..4c734edc 100644 --- a/tests/integration/test_attachments.py +++ b/tests/integration/test_attachments.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_auth_api.py b/tests/integration/test_auth_api.py index bc3bd3b2..49b8c7f9 100644 --- a/tests/integration/test_auth_api.py +++ b/tests/integration/test_auth_api.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_contact.py b/tests/integration/test_contact.py index 4720ee37..17676f55 100644 --- a/tests/integration/test_contact.py +++ b/tests/integration/test_contact.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_custom_attributes_epics.py b/tests/integration/test_custom_attributes_epics.py index e24f1d8f..c70ea88e 100644 --- a/tests/integration/test_custom_attributes_epics.py +++ b/tests/integration/test_custom_attributes_epics.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_custom_attributes_issues.py b/tests/integration/test_custom_attributes_issues.py index 50b1a696..1db1632c 100644 --- a/tests/integration/test_custom_attributes_issues.py +++ b/tests/integration/test_custom_attributes_issues.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_custom_attributes_tasks.py b/tests/integration/test_custom_attributes_tasks.py index 0f6fa3a4..efabb8c4 100644 --- a/tests/integration/test_custom_attributes_tasks.py +++ b/tests/integration/test_custom_attributes_tasks.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_custom_attributes_user_stories.py b/tests/integration/test_custom_attributes_user_stories.py index 9358c40f..7b2fc7a1 100644 --- a/tests/integration/test_custom_attributes_user_stories.py +++ b/tests/integration/test_custom_attributes_user_stories.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_epics.py b/tests/integration/test_epics.py index 64d3edb7..d6f6930a 100644 --- a/tests/integration/test_epics.py +++ b/tests/integration/test_epics.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_epics_tags.py b/tests/integration/test_epics_tags.py index 3e2c66c8..2f367ab6 100644 --- a/tests/integration/test_epics_tags.py +++ b/tests/integration/test_epics_tags.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_exporter_api.py b/tests/integration/test_exporter_api.py index c71fbbb5..40e6deb2 100644 --- a/tests/integration/test_exporter_api.py +++ b/tests/integration/test_exporter_api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_fan_projects.py b/tests/integration/test_fan_projects.py index 680872d2..fd0d8ab5 100644 --- a/tests/integration/test_fan_projects.py +++ b/tests/integration/test_fan_projects.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_feedback.py b/tests/integration/test_feedback.py index 82de1139..7f4bc108 100644 --- a/tests/integration/test_feedback.py +++ b/tests/integration/test_feedback.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_history.py b/tests/integration/test_history.py index c34d9092..0d2a7341 100644 --- a/tests/integration/test_history.py +++ b/tests/integration/test_history.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_hooks_bitbucket.py b/tests/integration/test_hooks_bitbucket.py index 6dbe06c3..0b685411 100644 --- a/tests/integration/test_hooks_bitbucket.py +++ b/tests/integration/test_hooks_bitbucket.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_hooks_github.py b/tests/integration/test_hooks_github.py index cf3b8bad..180b8061 100644 --- a/tests/integration/test_hooks_github.py +++ b/tests/integration/test_hooks_github.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_hooks_gitlab.py b/tests/integration/test_hooks_gitlab.py index b40c94e6..8f54811d 100644 --- a/tests/integration/test_hooks_gitlab.py +++ b/tests/integration/test_hooks_gitlab.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_hooks_gogs.py b/tests/integration/test_hooks_gogs.py index 11685d1a..16a783ab 100644 --- a/tests/integration/test_hooks_gogs.py +++ b/tests/integration/test_hooks_gogs.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_importer_api.py b/tests/integration/test_importer_api.py index 6a2e7883..84dccbfd 100644 --- a/tests/integration/test_importer_api.py +++ b/tests/integration/test_importer_api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_importers_asana_api.py b/tests/integration/test_importers_asana_api.py index d44a7232..44a400c2 100644 --- a/tests/integration/test_importers_asana_api.py +++ b/tests/integration/test_importers_asana_api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_importers_github_api.py b/tests/integration/test_importers_github_api.py index 4d30b8ff..a21494fe 100644 --- a/tests/integration/test_importers_github_api.py +++ b/tests/integration/test_importers_github_api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_importers_jira_api.py b/tests/integration/test_importers_jira_api.py index ebb96a11..d4b3dc24 100644 --- a/tests/integration/test_importers_jira_api.py +++ b/tests/integration/test_importers_jira_api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_importers_trello_api.py b/tests/integration/test_importers_trello_api.py index c83f5c57..4d940505 100644 --- a/tests/integration/test_importers_trello_api.py +++ b/tests/integration/test_importers_trello_api.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_issues.py b/tests/integration/test_issues.py index 5fc58827..8148729f 100644 --- a/tests/integration/test_issues.py +++ b/tests/integration/test_issues.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_issues_tags.py b/tests/integration/test_issues_tags.py index cb355f8f..79f2f28f 100644 --- a/tests/integration/test_issues_tags.py +++ b/tests/integration/test_issues_tags.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_mdrender.py b/tests/integration/test_mdrender.py index 64a5182e..106f5c3e 100644 --- a/tests/integration/test_mdrender.py +++ b/tests/integration/test_mdrender.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_memberships.py b/tests/integration/test_memberships.py index 4f3568b9..ad2e70f3 100644 --- a/tests/integration/test_memberships.py +++ b/tests/integration/test_memberships.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_milestones.py b/tests/integration/test_milestones.py index 61a54bc8..be3ec0ee 100644 --- a/tests/integration/test_milestones.py +++ b/tests/integration/test_milestones.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_models.py b/tests/integration/test_models.py index 6c0b7b01..79a973c4 100644 --- a/tests/integration/test_models.py +++ b/tests/integration/test_models.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_neighbors.py b/tests/integration/test_neighbors.py index 7f00a55b..7441e6d0 100644 --- a/tests/integration/test_neighbors.py +++ b/tests/integration/test_neighbors.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_notifications.py b/tests/integration/test_notifications.py index 4bc99ad1..a552cc4b 100644 --- a/tests/integration/test_notifications.py +++ b/tests/integration/test_notifications.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_occ.py b/tests/integration/test_occ.py index ccb9013f..20e69aa1 100644 --- a/tests/integration/test_occ.py +++ b/tests/integration/test_occ.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_permissions.py b/tests/integration/test_permissions.py index bc39384f..ee114e80 100644 --- a/tests/integration/test_permissions.py +++ b/tests/integration/test_permissions.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_projects.py b/tests/integration/test_projects.py index e4945150..07eb9caa 100644 --- a/tests/integration/test_projects.py +++ b/tests/integration/test_projects.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_references_sequences.py b/tests/integration/test_references_sequences.py index b0084604..7bb035de 100644 --- a/tests/integration/test_references_sequences.py +++ b/tests/integration/test_references_sequences.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_roles.py b/tests/integration/test_roles.py index 7ad000ef..aef3fac4 100644 --- a/tests/integration/test_roles.py +++ b/tests/integration/test_roles.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_searches.py b/tests/integration/test_searches.py index bb5e681d..31cbaf6d 100644 --- a/tests/integration/test_searches.py +++ b/tests/integration/test_searches.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_stats.py b/tests/integration/test_stats.py index 790dd3e8..1138507c 100644 --- a/tests/integration/test_stats.py +++ b/tests/integration/test_stats.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_tasks.py b/tests/integration/test_tasks.py index 2e9ae356..12252bf7 100644 --- a/tests/integration/test_tasks.py +++ b/tests/integration/test_tasks.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_tasks_tags.py b/tests/integration/test_tasks_tags.py index 60856688..968bb07b 100644 --- a/tests/integration/test_tasks_tags.py +++ b/tests/integration/test_tasks_tags.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_throwttling.py b/tests/integration/test_throwttling.py index ad2949f4..8f9b7976 100644 --- a/tests/integration/test_throwttling.py +++ b/tests/integration/test_throwttling.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_timeline.py b/tests/integration/test_timeline.py index e898a1fa..14d84a35 100644 --- a/tests/integration/test_timeline.py +++ b/tests/integration/test_timeline.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_totals_projects.py b/tests/integration/test_totals_projects.py index fb7f1e58..1433750f 100644 --- a/tests/integration/test_totals_projects.py +++ b/tests/integration/test_totals_projects.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Anler Hernández -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Taiga Agile LLC +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Anler Hernández +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Taiga Agile LLC # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_us_autoclosing.py b/tests/integration/test_us_autoclosing.py index 13ba78d2..a9b29a6c 100644 --- a/tests/integration/test_us_autoclosing.py +++ b/tests/integration/test_us_autoclosing.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_users.py b/tests/integration/test_users.py index 6835f62b..7f0208a9 100644 --- a/tests/integration/test_users.py +++ b/tests/integration/test_users.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_userstorage_api.py b/tests/integration/test_userstorage_api.py index b1b9ec16..1b6af766 100644 --- a/tests/integration/test_userstorage_api.py +++ b/tests/integration/test_userstorage_api.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_userstories.py b/tests/integration/test_userstories.py index 13e1df8f..37c2682d 100644 --- a/tests/integration/test_userstories.py +++ b/tests/integration/test_userstories.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_userstories_tags.py b/tests/integration/test_userstories_tags.py index 0cc56868..4ed136ec 100644 --- a/tests/integration/test_userstories_tags.py +++ b/tests/integration/test_userstories_tags.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_vote_issues.py b/tests/integration/test_vote_issues.py index 6a4a1bba..94615616 100644 --- a/tests/integration/test_vote_issues.py +++ b/tests/integration/test_vote_issues.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_vote_tasks.py b/tests/integration/test_vote_tasks.py index c369e268..4ffac011 100644 --- a/tests/integration/test_vote_tasks.py +++ b/tests/integration/test_vote_tasks.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_vote_userstories.py b/tests/integration/test_vote_userstories.py index 11ab7532..7d742c01 100644 --- a/tests/integration/test_vote_userstories.py +++ b/tests/integration/test_vote_userstories.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_votes.py b/tests/integration/test_votes.py index 68d8cc4d..0230463a 100644 --- a/tests/integration/test_votes.py +++ b/tests/integration/test_votes.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_watch_issues.py b/tests/integration/test_watch_issues.py index 6d353012..518d4c29 100644 --- a/tests/integration/test_watch_issues.py +++ b/tests/integration/test_watch_issues.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_watch_milestones.py b/tests/integration/test_watch_milestones.py index 76082db4..e458220a 100644 --- a/tests/integration/test_watch_milestones.py +++ b/tests/integration/test_watch_milestones.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_watch_projects.py b/tests/integration/test_watch_projects.py index f6caafb3..bfb7b37a 100644 --- a/tests/integration/test_watch_projects.py +++ b/tests/integration/test_watch_projects.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_watch_tasks.py b/tests/integration/test_watch_tasks.py index b8f12d23..00167afe 100644 --- a/tests/integration/test_watch_tasks.py +++ b/tests/integration/test_watch_tasks.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_watch_userstories.py b/tests/integration/test_watch_userstories.py index 789f6fbe..e11bd93c 100644 --- a/tests/integration/test_watch_userstories.py +++ b/tests/integration/test_watch_userstories.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_watch_wikipages.py b/tests/integration/test_watch_wikipages.py index af59d63d..b84733c0 100644 --- a/tests/integration/test_watch_wikipages.py +++ b/tests/integration/test_watch_wikipages.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_webhooks.py b/tests/integration/test_webhooks.py index 071bf89f..d4da70c1 100644 --- a/tests/integration/test_webhooks.py +++ b/tests/integration/test_webhooks.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_webhooks_epics.py b/tests/integration/test_webhooks_epics.py index f77dc829..a7a4d49d 100644 --- a/tests/integration/test_webhooks_epics.py +++ b/tests/integration/test_webhooks_epics.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_webhooks_issues.py b/tests/integration/test_webhooks_issues.py index 8789408d..f6b98c9c 100644 --- a/tests/integration/test_webhooks_issues.py +++ b/tests/integration/test_webhooks_issues.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_webhooks_milestones.py b/tests/integration/test_webhooks_milestones.py index 7d779350..3fe92e27 100644 --- a/tests/integration/test_webhooks_milestones.py +++ b/tests/integration/test_webhooks_milestones.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_webhooks_signals.py b/tests/integration/test_webhooks_signals.py index 2d6e5bc4..7c8fe6d9 100644 --- a/tests/integration/test_webhooks_signals.py +++ b/tests/integration/test_webhooks_signals.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_webhooks_tasks.py b/tests/integration/test_webhooks_tasks.py index bb9b7d14..55c0a12f 100644 --- a/tests/integration/test_webhooks_tasks.py +++ b/tests/integration/test_webhooks_tasks.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_webhooks_userstories.py b/tests/integration/test_webhooks_userstories.py index 1580df57..0cbfef61 100644 --- a/tests/integration/test_webhooks_userstories.py +++ b/tests/integration/test_webhooks_userstories.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_webhooks_wikipages.py b/tests/integration/test_webhooks_wikipages.py index 0e46108c..26ecefab 100644 --- a/tests/integration/test_webhooks_wikipages.py +++ b/tests/integration/test_webhooks_wikipages.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/integration/test_wikilinks.py b/tests/integration/test_wikilinks.py index 20e185dc..1dc19384 100644 --- a/tests/integration/test_wikilinks.py +++ b/tests/integration/test_wikilinks.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index da0d7085..1a228a40 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_base_api_permissions.py b/tests/unit/test_base_api_permissions.py index a76d4359..f56cb05e 100644 --- a/tests/unit/test_base_api_permissions.py +++ b/tests/unit/test_base_api_permissions.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_deferred.py b/tests/unit/test_deferred.py index 832c4b0b..69295e2b 100644 --- a/tests/unit/test_deferred.py +++ b/tests/unit/test_deferred.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_export.py b/tests/unit/test_export.py index 18ae7d90..e40f80ee 100644 --- a/tests/unit/test_export.py +++ b/tests/unit/test_export.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_import.py b/tests/unit/test_import.py index 58f9b9db..164fc816 100644 --- a/tests/unit/test_import.py +++ b/tests/unit/test_import.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_mdrender.py b/tests/unit/test_mdrender.py index 08fb9009..4c798d41 100644 --- a/tests/unit/test_mdrender.py +++ b/tests/unit/test_mdrender.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_order_updates.py b/tests/unit/test_order_updates.py index 3f9625aa..3609ff01 100644 --- a/tests/unit/test_order_updates.py +++ b/tests/unit/test_order_updates.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_serializer_mixins.py b/tests/unit/test_serializer_mixins.py index cc88552f..d7f8419e 100644 --- a/tests/unit/test_serializer_mixins.py +++ b/tests/unit/test_serializer_mixins.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_slug.py b/tests/unit/test_slug.py index 1b9de84d..f3dab268 100644 --- a/tests/unit/test_slug.py +++ b/tests/unit/test_slug.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_timeline.py b/tests/unit/test_timeline.py index c96d3ee8..91bc7127 100644 --- a/tests/unit/test_timeline.py +++ b/tests/unit/test_timeline.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_tokens.py b/tests/unit/test_tokens.py index 57955827..552cc7c8 100644 --- a/tests/unit/test_tokens.py +++ b/tests/unit/test_tokens.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 2264e970..0c11354a 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the diff --git a/tests/utils.py b/tests/utils.py index 2a8a4855..bcc368cf 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2016 Andrey Antukh -# Copyright (C) 2014-2016 Jesús Espino -# Copyright (C) 2014-2016 David Barragán -# Copyright (C) 2014-2016 Alejandro Alonso -# Copyright (C) 2014-2016 Anler Hernández +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# Copyright (C) 2014-2017 Anler Hernández # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the From 8f20575e6e3ee7e21a16d106f36899f8eb3fb528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 20 Feb 2017 18:19:50 +0100 Subject: [PATCH 116/144] [i18n] Update locales --- taiga/locale/ca/LC_MESSAGES/django.po | 2 +- taiga/locale/de/LC_MESSAGES/django.po | 2 +- taiga/locale/es/LC_MESSAGES/django.po | 40 +++++++++++----------- taiga/locale/fi/LC_MESSAGES/django.po | 2 +- taiga/locale/fr/LC_MESSAGES/django.po | 2 +- taiga/locale/it/LC_MESSAGES/django.po | 2 +- taiga/locale/ja/LC_MESSAGES/django.po | 2 +- taiga/locale/ko/LC_MESSAGES/django.po | 2 +- taiga/locale/nb/LC_MESSAGES/django.po | 2 +- taiga/locale/nl/LC_MESSAGES/django.po | 2 +- taiga/locale/pl/LC_MESSAGES/django.po | 2 +- taiga/locale/pt_BR/LC_MESSAGES/django.po | 2 +- taiga/locale/ru/LC_MESSAGES/django.po | 2 +- taiga/locale/sv/LC_MESSAGES/django.po | 2 +- taiga/locale/tr/LC_MESSAGES/django.po | 2 +- taiga/locale/zh-Hans/LC_MESSAGES/django.po | 2 +- taiga/locale/zh-Hant/LC_MESSAGES/django.po | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index 53ee265a..5031baec 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/de/LC_MESSAGES/django.po b/taiga/locale/de/LC_MESSAGES/django.po index e4b681c3..ea178737 100644 --- a/taiga/locale/de/LC_MESSAGES/django.po +++ b/taiga/locale/de/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/es/LC_MESSAGES/django.po b/taiga/locale/es/LC_MESSAGES/django.po index d9a9dea8..27d01a0e 100644 --- a/taiga/locale/es/LC_MESSAGES/django.po +++ b/taiga/locale/es/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" -"Last-Translator: Taiga Dev Team \n" +"PO-Revision-Date: 2017-02-20 16:40+0000\n" +"Last-Translator: David Barragán \n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/es/)\n" "MIME-Version: 1.0\n" @@ -1157,78 +1157,78 @@ msgstr "El estado no existe" #: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 #: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 msgid "The project param is needed" -msgstr "" +msgstr "El parámetro project es necesario" #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 msgid "Invalid Asana API request" -msgstr "" +msgstr "Solicitud de API de Asana no válida" #: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 #: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" -msgstr "" +msgstr "No se pudo realizar la solicitud a la API de Asana" #: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 msgid "Code param needed" -msgstr "" +msgstr "El parámetro code es necesario" #: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 msgid "Error importing Asana project" -msgstr "" +msgstr "Error importando el proyecto de Asana" #: taiga/importers/github/api.py:137 msgid "Invalid auth data" -msgstr "" +msgstr "Datos de autenticación inválidos" #: taiga/importers/github/api.py:139 msgid "Third party service failing" -msgstr "" +msgstr "El servicio de terceros está fallando" #: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 msgid "Error importing GitHub project" -msgstr "" +msgstr "Error importando el proyecto de GitHub" #: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 #: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 msgid "The url param is needed" -msgstr "" +msgstr "El parámetro url es necesario" #: taiga/importers/jira/api.py:155 msgid "Invalid project_type {}" -msgstr "" +msgstr "project_type {} inválido" #: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 #: taiga/importers/trello/api.py:144 msgid "Invalid or expired auth token" -msgstr "" +msgstr "El token de atuenticación es inválido o ha expirado" #: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 msgid "Error importing Jira project" -msgstr "" +msgstr "Error importando el proyecto deJira" #: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 msgid "Error importing PivotalTracker project" -msgstr "" +msgstr "Error inportando el proyecto de PivotalTracker" #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" -msgstr "" +msgstr "Solicitud inválida: %s en %s" #: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 #, python-format msgid "Unauthorized: %s at %s" -msgstr "" +msgstr "No autorizado: %s en %s" #: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 #, python-format msgid "Resource Unavailable: %s at %s" -msgstr "" +msgstr "Recurso no disponible: %s en %s" #: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 msgid "Error importing Trello project" -msgstr "" +msgstr "Error importando proyecto de Trello" #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" diff --git a/taiga/locale/fi/LC_MESSAGES/django.po b/taiga/locale/fi/LC_MESSAGES/django.po index 44f80774..bedd821d 100644 --- a/taiga/locale/fi/LC_MESSAGES/django.po +++ b/taiga/locale/fi/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/fr/LC_MESSAGES/django.po b/taiga/locale/fr/LC_MESSAGES/django.po index a73f1311..262b2d5c 100644 --- a/taiga/locale/fr/LC_MESSAGES/django.po +++ b/taiga/locale/fr/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/it/LC_MESSAGES/django.po b/taiga/locale/it/LC_MESSAGES/django.po index 1bb3a8ee..98d7e7f0 100644 --- a/taiga/locale/it/LC_MESSAGES/django.po +++ b/taiga/locale/it/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po index 5dee6802..e9fb7663 100644 --- a/taiga/locale/ja/LC_MESSAGES/django.po +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/ko/LC_MESSAGES/django.po b/taiga/locale/ko/LC_MESSAGES/django.po index c200901d..aed2fe9b 100644 --- a/taiga/locale/ko/LC_MESSAGES/django.po +++ b/taiga/locale/ko/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/nb/LC_MESSAGES/django.po b/taiga/locale/nb/LC_MESSAGES/django.po index 795b3758..58bd5a35 100644 --- a/taiga/locale/nb/LC_MESSAGES/django.po +++ b/taiga/locale/nb/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/nl/LC_MESSAGES/django.po b/taiga/locale/nl/LC_MESSAGES/django.po index 805c7d77..51ac720a 100644 --- a/taiga/locale/nl/LC_MESSAGES/django.po +++ b/taiga/locale/nl/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/pl/LC_MESSAGES/django.po b/taiga/locale/pl/LC_MESSAGES/django.po index 189483bd..37dd69ba 100644 --- a/taiga/locale/pl/LC_MESSAGES/django.po +++ b/taiga/locale/pl/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/pt_BR/LC_MESSAGES/django.po b/taiga/locale/pt_BR/LC_MESSAGES/django.po index c051a8c8..84abac6a 100644 --- a/taiga/locale/pt_BR/LC_MESSAGES/django.po +++ b/taiga/locale/pt_BR/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/ru/LC_MESSAGES/django.po b/taiga/locale/ru/LC_MESSAGES/django.po index fb92d9e5..07838035 100644 --- a/taiga/locale/ru/LC_MESSAGES/django.po +++ b/taiga/locale/ru/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/sv/LC_MESSAGES/django.po b/taiga/locale/sv/LC_MESSAGES/django.po index 3b75c061..e9eecfb6 100644 --- a/taiga/locale/sv/LC_MESSAGES/django.po +++ b/taiga/locale/sv/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/tr/LC_MESSAGES/django.po b/taiga/locale/tr/LC_MESSAGES/django.po index 03024ade..87cd1276 100644 --- a/taiga/locale/tr/LC_MESSAGES/django.po +++ b/taiga/locale/tr/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/zh-Hans/LC_MESSAGES/django.po b/taiga/locale/zh-Hans/LC_MESSAGES/django.po index 2e171868..d032baac 100644 --- a/taiga/locale/zh-Hans/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hans/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: diff --git a/taiga/locale/zh-Hant/LC_MESSAGES/django.po b/taiga/locale/zh-Hant/LC_MESSAGES/django.po index 65108422..ed4fab5c 100644 --- a/taiga/locale/zh-Hant/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hant/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2017 Taiga Dev Team +# Copyright (C) 2014-2016 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: From b8bf4bdd2135949f27a738a57b09d5c3e265d144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 22 Feb 2017 18:29:38 +0100 Subject: [PATCH 117/144] Changing to the new gogs logo --- taiga/hooks/gogs/migrations/logo.png | Bin 97926 -> 29157 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/taiga/hooks/gogs/migrations/logo.png b/taiga/hooks/gogs/migrations/logo.png index 384a58d20f381e06132089a10c9d5b46e204acf9..34385535534c7520f4b1194e9a5def4094874374 100644 GIT binary patch literal 29157 zcmXt8RZtvEvt8Vs;2JChcbDK2+=IKj+v0A)-F)pNRIRF!2hP)Se$004%(oRm5M00a2XkP!g@fPq_;6#xK$cbAaYL`FtN4nVeu z1^@skE^>PA008Fje+HAzgh>hj0Ej)Lbv-nktvtL<-7Ep#-rlUXPWJBRrY@GO&TiJZ zm%=0f02M%9>YJud-g&Qg9<7e=<%bBk)8B1UO6UP_kxXyPWLL%-Aiegf0w_Y=B(!9 z6zf}nXt##pQME>8%~@a}-WD9slBy)e{~trnIKu&iMUjI(&_7B+AwRnhyUE-`Sod?C z122zP0y0Y@UmIt=VeG!ZQg30@7F?N4A@B}k3_Konlkx1!PQx&(3VTj>v1$%IkyBvt zMz#3yWuAOkCFrsTr=>JjY$;E}FzYUn4Zucdj!aiStfn|-?%3MRP~*S;WN3NqA=de{ zeK6a?f3&`79iyxSbIzKthjE8s*@vbo2^{A3MG7`+*>SR&Qs%aQO+n}3Gk@jseZFJ9 zpz2X#0r-SB@5WrzkSNaCXEFRQ$LHY$z-0w}c*<*b^La~n6M@y7lBX8QhnQCB|{k3p{QuIERhSai=pz1%GRmVMpJB2{)?B;476+M!ig#W8^&G8e;&wZP;!8T+BG+?>7VN( zMM&Irz_iR*xxVRi(l6)7jG5XEt;ie|=Xrumb519=B21`-uE zZ<2_Q)(N_O6|WtpNyyHB$V4QVBjO)|M5h!WibZ4v*~!6&Co@4jziSk%4J6yt+yQ9l zyt!vk%`3fcNR7c-VyV_GLaxsN0Gn%}ayC%$zbb)XgvcyVKZ!V%3m=aqLyp#4v*7d8 zZ5bmt%E8DEHdRrLS9EDnW8@^BC+piZ3^Th;^cuhb17qc!7>{RC?LY5B(KEKVOi3O= zj&C?C`n~_s4>>`_KmLmxPU*OH>B&?Jd;QBI{^N+_v=ieZ`(Rob!j(*d0*Idc=dvv! zISs>1wZyn%|A`u3PPx2pWzNV_OAL=U6D?{CF1UX3Uw9EhWDcCJc=YjYdbPQVI~SU% zgbGfHZGm?erOBD3w<(va8itm{e_@V~`{A}h4P%GnMpb$@C?aVSO!Dcr1?>|=n40kQ zzcw*4v%BRnz~a*|%-F(RRtb|VX&8Xbc(1!q^|xj_q{TvYyimX{r~@p8$fJqEgVZR# z?cjQ;8Q%EK?OjYuHE^*lj58NOK(lfzZ0G`!iW;(}WT7dUuIdgzgU?Ajp>R_%*YMQb z^0+ACX3>GTCzD`$Fqyqn+Ffmge!Ga$rINFe!RlN*8!FIL+%D02GbkeqRzjXt(s5e1 z_`F8~3eJJk1+2K=O?y>-=9L6JQr<~=Sz=visX#QyVun*WYB*T$e`GZxg#PC@7e=GA zf}lKZ@X_B$f4_f_ey_x7C{?)}w_!U4pJ=~}iN{x6jQSr70IhL-^|8&0CFsZJtSA%_ zJwCo_XeSGyw;TUlv8p~vkNAH80Io{ia08cKmDbarhDVB^2mz^l0%XVdCBWHFBKF_c zTO(0R4*`e7xZ#R8nJ`ZZ^&f>;V3o}lGB8`PrYu#k(<19Bc@pcVC9(nGz3Q63&P`}L zFfM$2M-0<7r0idoUlQft{0iDgyBC0?XD&Vu#MVy&Wey0QQ+7dUwa z2k$Q3z{TlBshXp!Tu#lq9yfHcJD1m2Um2CcDY}A`l#dkNgWPse|KrAN^}i+!U%ILF+i*bQ z2=;7k*p;=-zy$(k(pvr4Dhbjk@$uM1#MGycN4PRLua&ClY*&IVHZtkOi1w=PfKLMj zOn!gma^EWlHpKmm8q8Y$3xuJVK_qk(y}#G)w>t}~@fO+>KP1IHxHJHG{|&Pw^*OZ` z?Ww;0uD$(S%&o}7*8U3;50VKr@K@jv!8E;S>^_UddC&Ph)aLxOq^X89cPKeS}}Bw<~s&Dc0ty-{HOku;~?+J%~G+iS|ub?#fJdqfr9+AhNbdbd6)+3 zz3ji99&Si34wpjh9BeySYCfEhH6!j+uZQ)1qOb{Fc4q9 zpDJTO_#^9mA#yKKt-kb=k_U+$?R>SbUP;G+lJFXao!|ypy4Y2okcCN`pkPLSCY(Z} z<6g6$U8jT&_xruENpl0+B90C24TjJk2B&{7x6fwYAX9of%p&yj&S$G`3NmOBb^xjk zyyVRpAxnwl^bfL20TNN&TIeB$UvV|C37&<(`uCA8XrIYFLN@c2} zDzc|a0Fdfq_cF?aFAbFcyuh{G!@|DjXasf?C~8K53+BU^aYd=VzmcVfVU3 z51F5zS{y@o-Kp=DEnwCTB|%>z6GwU7g|bZBY4)n10t+pKwoV}PO{Q>te}4@U{?!b^ z>=8!s?Hrwm4vH;KWr&FyT0}{4UTGWt=(~ANr5RDUTT9G=`x08|<!^cZ&0uOq7;iSoAH577+ zBFM-PiF%?MYNQ^G*cQimpZ^Ow&Xh(q;1C8rL+NGJwk(s34ew^7|;43rj-3xxg|H5~a2(s=l{z> z_GCKZ0M!38>cI^eO$vf`v*Z(BjK_eiqFkYDOZ8#5yjdEgZwr3I|H5b3=2}_rDio@N z))6oKKu`CkAf?xTHdkyyH>rVqcL?~euxug!HilivQ*QMUrgX&hA^T19AhpYoemeI& z0@2UGbA`arHXxSPZS`4UC{1Rl%r4JH<(%pdF^#jV6KAPF&|DdikcdS5399X@!zp9K zU&ybDkZN0-*hwt3`?5L%Di&b@>R4hbB*gi_(&WNc|ajxqveMV&15 zrp%1U24=nLjjK=p;845x=H%#lLE47HzJ(4+!pq7;D}Vpaw9M@R@1HFE*^^?m_hbA{ z+vi3^$d5I3{3_G{Vf!B3WO2r8;OQB`#p+8u%z#9gG|%(6GmlIkybx6&f995X*@q{=SV~(P(nuw zQKf*2TeLv%6T$VRp?^|

    >bZ&6$0dNV3$>w8Z#Yhz=Z+n?USzWP1~iu{l@YVTCZ- zK)l$zN$_117M)7$)#axD6Nc5K=_k-7prFU@ja6Ew0MX|B)aoX~Q6PT(Pd@G8BOVzA zJ-_hxC9!li{ZGR!662J%63=SYRh+oPi$Z*X>T=KW>=IgSb%u(QvFXxm&S> zbIrp`KtZ3eiWF9lh9mr$HYqVYy|DjguGj-C`Mv3JszP`h5@+jg`osjnuET1)>Z;JRdK5e3EY_pYz^~KF`P%A?s_o0WNaMr=8oBa?JBSOE(JSKjq|H^YH9B+DJ96#%}SQd2zm&Bho`(h`UW{&2iOxf|mP+KD31;&s2Gk z8jqSMb3A0v!-ILF#wJ0ePTU;1tXEN?>$>bF_vG>M*x7km#Lld6m!tGuY~5t~Zrz~l z=jo`^T%8k59K882O(wy*>~hTbpD9pNqGgi(Hgo1{P2Krj{CX#XMAspZjzCXe;Lz8q zzSY;;f*H}`k-d9LAqj4x9M@`WSe^X&kRwOC(TlqS3)9QqDXlkRZo{K>MYfVrGdUtH z-1;`{BvpKgRyCU!i#H#k} z*yQHW@yjn^OWkb{B^n~K%6IJSoX?y*5hQ$+d>ZLR^pka`f}AHGjl1Q`g?;nphT&s3A{&}e zoZY$lM)NRxnx(5db}DfruvQ{_#O&;4? zn?0;U>UO3?x6P(Qg&E40VxB9J6Nwg)e=OI2+Xq6PHQ&sPwU&_+lJH1K>G*jgNhY1I zaidRCia+U zfGwS+f;@nc2LTwbkRtQF(bqgZ(d|$j%jEs)NU6|<5R)n8xGi^A$VC? zu8J0AnhM3&oLI5?y=CsfoC0m{s5K>xN7R2Atfkd8q{jL}n}-BFEYm(DB(6TaD`cxm zlsqKT3DPkLVc`s;C@S$>;H}xG&X)Lmk)h|1_xne0MpO)5QVh%pzwQLYZj6w5_L!&2 z=%-2|5qHGOWkpGUBnWvvzkz^Kov-Fww*08jZgt^&r?CRg>b# z!|VW4tfe`^S0lKU7WbhG^;k+6ZZ<<1>)AsGi3rWDyl=Vt-?TKvC@?vA=8}R;WGoCk z7_&8bMt8sBp(MyPCm1jP9bI6mx0tV(_HbH}JBm!;_GaVJ`O8@}YG!NA?gynkdc4|u z4GEO0sA#0N@%X|maNa6-?&F@LErBeIk-+Wkxnpmu#}0BvVPonH0MCw$ueN+oKqsYy zZ@&Uwj?;`di}GnM!3Zxc?m0kC*-&&VSIBGoZYoZc+XaNTLv^z2q=QEg4H4OnE;7|| zNk}bsUl9gV_w>GFOz3_$r%g5yE-q2LZfk8m9L?49z3^mS>kG>`VEVqf>?dbvy}ys* z_b4KJ^&WVC>7O{!hvwsm>ZmM4j)^4d|BK7TFR-;vH@OMt^tBpjTOb`-sLcG9XaiEX zQe-Qs{)($SLXRtwzD`wMf@w0Fh(VbgJqzpMv@Yd-YS~++8RP{HtUmjWfywT=BYdOk zg>`QsVNOM1&0SxtD8B{*-}gYh{$6yY)9L>rxDwB|Mkf~;+$j|O&;E>0;60tA<|{MA z89vnZg+U)M1^?E5n|Nc*EIZA7>{G(T;PC5P=4aTK^%C>GcR%F(Lix!ZkYw21HdGKz zNf<3tIXm{}%z5g>=Y>TpkTIK#{omgh8}4bq6ZQ<%S)&Q0t-y3M!mT#hsx9 zX8X{>Vq))g$hRpUUqzE4arrYBZ4KS>wj8nm9CxxOoC`TF_x{!f92oXl9CTmhq~LV=VfHTG9U zFR@IijM||00L{nAZA+q{VM>$zeb>(#i|#@tIr|3OqpIIWE?wPM&n|a!y!*Y4*6zXL zABt?ZL;X)%+z$n&$&;$@UBA2t8uSY-bgQ8)gt=xt3ROVS`$GP2D?Zj9)b}-BBHj+h zC-IY#(*NsrMB&zH@gvfgjgq){!a&%pYT#w9^qo|OYb?w%Yr0X-p=+cPlsr#QgSYxe z7qH0H;F^I6%OG8}6!#x2u?HNVLzEw6GA!0NkqJu&`biu$c0JNPwH9%j{pe~6QYH5k z0%>_*Mqr!$)edPbriEE2oR8mF1z+eZulQMPdTYa$>T9T?CIpUV2tA)aF(a>oCgd)e z|ESb8d~JHBduzh8{{yB+X`247ua(L(|LWrg>00E)olIi;-cJv>dLU3ntn+Dn3f@}g zc2F}gjBlE_*Ck}4So6-f$M$h^2rGSNK$zJRF#6*JN+Z#@e(BMC8%f%uAqe%O69L;p2ee(}hS4JX(G`K4X^|#x9 zO~fBwV79-^p-8Tnm~AN1VS;fE$NRoWYR~mBymg^Juj4BUqX0?#tvZ#&WJX=jk&xK- zO#er~^i!%!$A-hlq)O_KU-&s$UsNELn^@1CR=!s8Vo^Hy2R)g-n@ZA6^UW400ND8p zjX_Gr{A^!cZ8)FP98bflUwg1U^-w=;1AoJi=LbC`U(rv82P3emfiV{6_qL<{v*l~h zQrC36;x9fu>$m+M@%hd{W1$rNg(|{+8@$3X@SBk`T?<^&LH=4nR?Yi^^QFUs)U;Bb zhI${dZ&7~JmPTY5y~z@7K{COFMeait4tuk=SypRMG+hXn&yUaFwtf>533(GR(vi3b z;~%K94>q4U?_&XPX>~U4>T_-gL+q1_U1Fs2O8VcNV@{7GkZrCmc@uv-YP7y6SUX{6 z^rWj?uDf82w*!{ge#G;&@U`ciz6*r8Ct3{n)Ls8 z88i6k6RWE3lOHddN3rq7N1id0nYO-;-C%z)p#}l_Ds1$Z7t&JkW79sK7}3tXXNcDu z%@>7&^8s~CI=k0CteD`!AuNv7W!bGbwu-%peAE$s+}OsG#O2$~tM}*`b;&}WvgE8B zDRS=JJ)vHK8@NAeZ}-2;OQD^OLgd_@6+%B7I&8-x{iilM*bnysK;I3h-_J*w6+@>V z+O;`iV7@oWv{mNu;>3KBp}Ctr0fW!m(Z`5OFi+O#_+nCJP*T^S z_TGL^4UpK(yz|SaN^Wn~!DIuqnxQQbKXA@x|HaJFJo?oAr4v0zNb1XT64Xm302W-1_lWp9 zd

    +-Xx@vi_!VH=w6`mRhq5M{1@wwJw*V&0joJzhF&!gCyVFRqeQ-`>GqA~y6<2Q zh1y1MVPtNV3t1{k)*Fcalr=#*Jy073Q@Gybls@1k6}-5(GJIQ8Kclf8z)%}7K<{fQ zye-kQgEy8fC*zcGD#(WTng5@V@0w1(@=+wLTH+y$9hLa@G4)`tHA1KKj%f&MPyLVy5Rrd#i_|a(_cWb5B0;l;C zosZrGz2??BTC<5%_0^N>=SVn}6?{J@zlU*@RANihzdQhH#}6uaWomeG0Yp{Tp(s$b zDA6A=$Jdmw5OxUDvdiOgzr5tp=hSB%#2@@qOTXd1pZjOT1kU0Ld(oO>_2?ZEC*TVE z#&1uU>m6NqLb#oJ<0Dxz=iR_<-1iPVqg7TR?#3Sq|DHr37)$MKYW3f84-C&ig-OeQ zH>M-@#(t^`Y9`DAymNY739KMzB5f_!?LVO!fCNKB=F8O-y>$nJGA#axrWR`=5qA>y z_z#4j=tBr;=gZmF@bZFPGxJ}GI4PplJ9tU4XKK8cLP^jwpQ^S4s&W!x)L7i&-tWUk z8hp~&=}5D7Vv#?%9)_}u+-0ERGm;paa4A{^;m!u};+(LW-qZ)f_JzI|UJ|x$*y5Gj zTh8Lh(7dPfKy=aDK)|^&!z8cs$RRVkJ-$^jl=Gz&rC{|n*1c|jqE_r#UDj`Qhmw>_ z8TlEsF-smeWdKv5_6yGEnAM@qnopF?B+jg*z2= za5%X5c%~{Cl}UYUL{wkS7H-V^EejkNFBqF2TwVN)0IMTOz8Oj1lc2=kV?PiqUbr|yv`Kz6w3Bw3}=79V)FOj?NK%Otb&Ex|bI!;eT z*t>-=f`98uEk{7Gn9$w80YGsR2h>O~IxVGx)t4H(!gWJt^JbvE#_m;Ji`egcEbj%X zgHkAxpKj&NU*&u?u(lrFUCd$rSWruLTaZ%D@2f(}up|{a_eAu2o@4O6nz%p7`h+up zNvE`9y($DSA0j$EFeurI^J14=+VCqff({^vt&uC*(zO6A??lkjHhtygO@+J(XKrGl=cq6N;)Z zo69$CoRoCd#EnYFshv;!`Zb)_bO`Z3s0LCOOgmNf^`=4}FwJ(@cVb*ieq-AS$5z;_ zkSjZ2BC#5i_Z`w3RDfQjFLTpde`@u|KQ@oo-BknW!?9agPt2~TY{QG>j{|U@%(=WH zIqd*q-F|m6T8l>bCXc^b8}I+*6C?cC207nG%_ZMc3TG9p1$`y69KPJ$*m^h8vU-eA z&fk8re$SaWs-zJUSf}{W)opuxKDFoKu0{@K+fr4$ZcecW6@F)A>JQPVL`HfA^u**O-wc}>HD zRVQRvGMyLZl-AQ2eA!IP%sBjhS-sx?IjWON$rbk@A=L#wdkJbc%v{d14P9FU-(dSCjfVL4Xlu3KaD@c| zRnu5nSidA!f3qnmwQot6s~YIe7CjPajMxxe4en=24lO)zTJ!JiHSY3kVIjmxn}$;Xo1^(RLpQ=b{|nzW`W~X2JdU> z;3(<)7NM(O?7j9Z%=|mrdC+q1!swMtr`|7!Tk5DW3YgD5SKzieL0a|NmWpn1~97=##Dh_iC~@!Qj7H=4R{}M2J7Tl&{`BEl>lmKd z5iDk}Tq@ILgzT@xk%CB@@oQ<@2UWh`(n_J}*rZ%p(v2&y)vG-vzE;?%2i1y*v-#9N z^DG4lRDFGXn)l_z)sS2c-rr(m$LMv)ut?RMcZ;!mXGIi0lTCbC9;t*f#^(vf5G295 zd?hn~hVV7tU3%wq`mSaLn2OEzUlrW104EnLnO9p;Mnt=Ry-$rx3 zY+y>jp-2s581L-l^50o0=56bzVOPK?9!cQf@3oIT;5x?Nh6u_R@T|`XO;A=r|5l$J zPu*mOCBZKMYE2)pk-V}%53xMK^}+<#R0-{@18}5M`&Qvgt9-%gtNI*I!tWOAX!r!Z zEXgK#G4jIC#gj-ch@+RHXwu8UnH~T(gu(t*^`nb^?6`gzWNLzLGC3t0e&I9^Sl``_ z^8T<9v2a^(C9U)I^(1YH8m-G0BGbphpq|g)L@JE@LNY~Pk&c_bNFWO?*OxL9ALWN0 zv@Tqu737ttvYXEx+$p?>qa_51R^C_@e)+>XvdEM0zE~MU-=0YsP3IHf5F4ImthXlS zcePx!-*vrk#ut(qx&x`jxsCkQGX#@5W(0B)$LUqNj{zL;_r^Q@!3E`dy(7-3;e* z82;dD6xAS3oU~knS`mnWt0feLEev+Td7{i$3mccPFBkDnD}+5Mxo{1U;I3 zj7KSMu;5vactf>6j+4Uiy(uuIKlkTwO9-5SWVXI>gCgs2N;Ir?WoJs0Mk%j>V%)OFBBCh1tK3%GJC-{> z$9_J@)m#5l)0e%QrQ_bx6K4cbQaNrig23!1e+jHqDW*r?6C*;tJDVt~pxJ!c9yk`u z=rX6C5*$9`LzHGINW<`y;a5G4}3+b$mZ4tZ1xf|+EvpL&O>6nrn~nkieHZoBd= zjA_o6-9DyPep}pv8=Yy7`&-YZ`YU@>?5>tLjCCN_wQD>#BV7}-0r`*G8vW62^9PHbTt#is}Z?3Hp>_hy$XZ^6fDERX(>;z*U z2Zxk!C!*u+Cr zp!oxBA#9|WGf1rF-#0qVe)zBDP%GaGO-elDk@(XiT7~FviTgsqgoo;=^aXBptg(4@m+e|ihAh`sw%3*|;wuJs7JIC+TAJ9IPP zp8hV3|BlNk@res~$t*dRNUwKLC7K~(@-g5sw%-VHO;102E#DuuzEVWGJJxOE?fws^ zuNNlBxccAkfNJ1s8yuc)QJl9GtrZy}0|PO?Hvyxk2d#?AlK^p|GS$6KK&kWj$?jIU zux?ingfB8Ol3W>bD6jP~O;eisl&Wmfd<82hn?was@0ZF3IfpWM#ss;{eTf3i2QE70 zbZ6$gDbR5|rBZS>edqylGCX!}eXR*V>LBL~oy45n11$;2G|9VkpHJn_Q@E$GF(T0| zH1!hsi9K`RjEtFNSIPRT$<~vz!bY!wZePgT@{F?bC|=KC!>NiGr|^W-V6-dW>ekpm zvLr%KnqDucLGo!c6%c`Rzaj97&0)29mv+7)&fq0fC_z&DS0!t?BsUq@-tYUh@WmA7bgAJw3$^d z6NLkvH9&=rFU%fbw!xX5PZ8k!fV&c?n^zCn<^DK(Y2fI!@Au{BlVg0irWHMK#rk#K z?;FVxw*s`Uy8uAn`W9s(U(z}b_#jA3P;kV>?LpneV|c|?cA1^87|H4-xV#=u`7)oE zV0q;M+TEPsf%y}paP>BdT|0C!QE=oudOhK7w^IY0FJ!9pQhnXDtm@R;?5Pqx^c9F= zjK{*@;AIDhYc9(Fn^X($*;zY^Qu#FLTb~8F9I(2+rr!1DxRvSbcoPE(@_NoP>64sz z2p}gUxxbHuc{pzV7^Ipe0%B6{v2%+iRuH!(CHsVKwCAFx*`Z1%iKT2dRhD;8>dI$5 zZg84EA*f_n&ms79Rp6k&M*HeO!Zmb z%Re1J>BZLErk*$?j&K!sGrlZsF%5o<;W`N&FDHlDPF0X(cyD--H1Qz}dx?ivZR>Aj zLucnT?{-Da3%&0|bMBuxyP;W8wO3Tdyzr?Xp?%h$2g*PfEpaO~6cl7Uy}io@s;)?Y zNW7w;`(9`L1rkxxn2&kfOdP3UL!Hbh#|=146{1-eb@0j)$=OoS?ZD=}O#ZZ?VbPcJ zgnk7On`eIY4mCXzqTK$lbDCU94sGq(uxCt0&nEpqHF8gE=o&pX@=(ZkW$e7XflIgf z9v==2M{;E8{q>h!%{M(#puCf>u#U|2s&@C@xCK?yi0% z%oNBY#Q@}vQ<9}ZZ^B14B_yZWIlU#}B#@VM4N5ba}vR<1hwJd=fZvhRxN#-v*5fj_Y!6Bt6Li03}R)n&58MSxr4O zN*5n9&OrM4mG5I+0ch@jq6lKxZ|}_kOFZr0otFd}Ky1VpB4hj8;(~M~XL(7(#Iba9 z5hfFdEC%iy3C!JYNRIY@7nZ>JT5sQ_O5+PeC$5`H^WGs1{E#?negQ#+%E{mANq9*m zKcl6Nh5W)Rq~mNZjD84*F3?egZGA1khOL~GWX2t>k7H6yAGgy4|8HpK!Sv4zpc824 z-$cs{9KiX&2XGiJ1TH#F4hANO-qHS0H$4*)LL(fv1G5b*;-Wy4DCtPpLnZ8RXClq- zM{xPi0u1gFA6-Taohv*KK(EjAJ1*UNJ+@qNe2!LY`Of0Y+{*6`SpJkfg}q|_k*w|c z2NZ-})LCR?v;^qQHWz{p4|zJr?Ftaf`6Me}r=(n6+W4{h+W*uh=YS3mX0aMoEu^`V zWRV)%S)utYkL;P^gDhW8pMCz-kNRejLnV#IKzTpp)#jLD( z1uE^yu}es-bX*2fZg)Kb0V;i*Il*QvO-_$>wQGS)fk?*NO)sL;AxDo*O*4|c8#1&+ z`-Af|9(DR+?SgX?Qg_w(lKK&qxhE(&AwV7@7v8rwHirumFz*c~yuv^D z)Z0G1lZOc+RbSBrrD>OdFsW)M?bXLH+baR~mstE6@yVD}`uf#uZROeW-^tgL3fBA9 z*7BNi*c-kP9^`)Tkb)K+eOb$31r ziCJ`%r}kCtnBXNNhcP75C=#EC7S3^@HE~Q%PUb7SbW}*5$+ix+jkx_H(eeaP@xiX- z&A{RX*ZK}Lsj}xU`Hdv5;&ZdnKaiZVg%2#wscw()n9tGqAZUt3%x}7%@P4QY|E_k4 z&;58B>Urp!HStbg$M#Y_UT;kH7P}7&om^%o;B8(lB>O#+dDBY|xWLT*aNYpp0tOd<>D*vQ*LuSr z)X+HD1ol_B3KLl_M~Mzj2fZ@TO*(%%{rAsj3~tNH>_#2d&TZsqj%p`ZEVpA@i}J1~ zZz!b)7gXqwSp9bs{k$5lu|=*oxJGxKK|2A>j6b7g zZj!R{`hYmY+p{9f9*?`e1ln)kSIA`&78o0OWdcz&r(srLB`;3);+3&#YP5a`7Z^D) zix>s4)U_~PqL=-;M|ANEh(OgS*vVCWJF%Fs;N17qT_j$jYj{}~`?QtYgsSTcY4hkm zAeTy+4KQpZJ1~ zhvEejtnx{caPo4dh7@=(6b`iWycw&3hw|Ny(ENoaojPJw9wh7p>Az*pc5G!oS^@@$ zDZ%jw>;;!jwV@wRI7I{3jC*pq4(8x?y- z_s{A0VuGUsp4T`72$xt)yjl}SwdQn-&NK`y_DN@zmn;PWkLAy zPd1|pD9|?58Kb`0Yza(R3!K^)uiaAEM@#qy#%ROSTKu7gZVJ z8+VnHgj58WilK|q@UUh7rp-a44}86C@e4XgUX`gC_6dy3>Ix+=AFw)a*_pb7Og>lH zph9AdNvm8hfcn=6-qcnyEq8!=%4I@s0ldWdr#hbIWrKxKhs@#=Gkv#L- zo9wg;K*oBStmY+cEY5n$Ue^^2wu%*YR?SKHq4SkUk@rv!!cs$y-^WbZ@blE#h*^pg z7q5s4l_jm|KlG>_0Q}^h@(56&?^hl@Sy-=je|l?zIf+Hg0V}5K@jumANDk|Na4V;8|%9K~c2g91Jpbd}m^;*$JF-z5>xE<^lfw-)%WzcMAWsqLjknKr9WO{JrbQR3;NiStAsfRB}42{Ql095EN zNc0O3CcOko=>b*dz(tFwo4P&{e==e zEhHkMzkL6-3dqX^5jl_LF`fPzYte{Z#vRFaM>YAxQg>+_04hWgv8CxUYKt}jy92st zF)bX>wBO-o_NVVVM~SJ?&2fS=9E4^+@fugajeD9Pun)8tTJNEvslP}La@ySA3C@n$<#Si1l# zIG97Y3=h(Q6IW?iknbNRs0PwIOq@0=ebHMCJqoR*4>l^(PX14hEZ;Pgb>ki?A6Tiz ztC$p_)b)MCSh@nz%_>C_$J3=CmT+-!%UvZ)`u;`PH-o9_n|S05^6Vd&Aoe}v#|?z) zW^yW|tMVWf$*aF8E47zen`D3rT~F?t6{3%1st(w>9Frb9-=!XX7Nsi1Ut_P`^MKO0*F3td4#X9_Ecmr7I0A_{ryjbfbqJcvzK{^v82Rbu&ccYTv#}?3Fu3bQEPxe?pBgBNe8*afRjR{On>SD zL*rRT$`_{1k7GRkhR%@QcPbiroH@_@n-CbkByu`#fpqr+vj5e(9P77mX`hHY=Gz+U zJnc4HB<##vhj+AESumM6_Cl}DX*@l^UG?o8ZzjHRWghLwT4zPL%GiGR-!hMg-uoXA zkTqahX(hFI39z>j+xLU=CW49~RXK1((e%n^6VCZyA+`yjV(VX6D~BEx zm71ebNJpx>4y}&e!hvK-;b?d)nr{vi+}8s88!N@ywoyu^R|8);$Z9|4dJU1sxF}Y>Vcl!Q46elQTK7wo_tLF6RmgL{s zBJ~86;#F`Sc$UKtj+}NnI`!V1q!f8Z>oWSVdO#{Mh#ujvLX~?pH@~M4`m;Zd%oP?r zlX*(mu?|}>PmD^fWUd}rr%{hvl>_JFV?j$amry_B!|k99v3{29=#^PvmF2cu9VV8Q zgyYCG4KNK-*5{GstkrmPD8LR)JeY)0^+*V$>>=DJ>BPK4aCS#)4}ywbzP*;GyA z`a106R;9JfJ&FiD5dp?GZq1fgK(pm&D^-y+4S_9u&YIxZqAq_pkRPC#<}pKOgYPjo zUmj^2m)-C6xOOrZ?UBTs(TSNzLIqCsev>IYH z*J(;~<+HuEexqW%D`8H`hWI%=1-vW8JUXz-bzdmz*dugT4Q;6>$A7+{qurIMt^+KO!3lCSU-vw28o_B{wb>1<9o>nO8pXOwJ7-1?Unmk%}dCI7d%7{Q(Ajs9GXn&qMCz#D#MzX{Jj~Gr7!fW}fb5 zr%TG7n@(rC7rbM>E14=l;V>1hIA3FZ&7 zUkNo4wLAfMpof4{ew>-C3!57_uMUF~a`(>+b-6-UwG9kL*5USO@kyUHal2tbh22~K zO`q*A{hbC-tT($b||s+)`mjFvnG~W z&9p4b8j{c$lyT*y9XN{*(WD_dO(K?<-eqz&`YWRwe}L_E=}&pJ*6_}%$XIUJwpeN`L1idGz! z+FP;F5Y_NpcS~vRgFZ|hlo>E`e_4zf=fSnQL@ydY$tJ!}k7fJaAVB*c9m_!KTP>eP zjGk9MVZ;%*J{vk$IGu1}3b$v*R0AMhq+ZfR)n7wmPl#FP+ zg1lk+fj%#|1SXwNef8+v&i|&Kodd}ceyXb%qKY_$e4CA|{DKN$VUerG!-)6^`t#J% zZ*|;6S=zDwq+R!I#mc%2i?&CiWbxv;Ov@CB2j3R-zk_L|CPug|z4O&(B z;n>Xo8e=Y;1BGx5t+)DmZ9odWLy@6WIB`3ah2je2naimM*OQ#DJ(YDhL8Xx0`ipi_VmrqpZq8p(U@#*T}PUFad*#suXbD5XTxYLOCI4+>~rH5^)^@k&>kL(2|C{5WkFY z-HW^`l?2MP46Oc5R5#e4jSvc$lXXr~Ol-09kF%p&)PngYt}V$G~J1=AJ5ipGE7T4gYr+Gu-Zt z0wbATY%MW7bIBn&#*;X@-H%7jttd2WD-jTd`Dvf0B9_sHZu=*b)xVA%r>D1gEItF) zg<|5L326S#jn@>s7V4$*Q5r%2^m9T#nTrC~7A(10{?twEGg*7uA*n08nwNe@$1EOg z*;7CsiR`W+y}C{B_$Sop8z{%~&CD)kco=@??&$V`nt$CXM@Xnz<+6pUoR(j7W@SL! z54A=WpJ3xgP&;s2lAq<@&k^()(HF7TduLJUr(ur2K88zcl|0i2Hw(XfI9OGzxat%@ z&bMz$!+UvRfh56iA#*WF6c=@ND@P!qV3j&OD1=Nc!w=HMXV6W*qib&Kwr@ENh zV>_}E7}m0x^LF1Vl{ePV58J-fB$UUz)z#+W-(5Q+&h_)~D~>t?zks}nS>AP8ze|)Q z46^j^=F;p;=+7#+lLX!T^Y2xOm$#ZwZF;EQyn}bkOo!qKHoC7sPAm6 zvcuaxVOnmuaufQ{#u-H0wslZI>aH5bqAsW9=Zyq>j!l>$|LXuMUUA3^dZyZyVC$;i zap`igL>IBbA25i_xK$?$S-dFj>x`&KR2GJK{%`pustF|mn+je+&4oXof8EKzh!Uf& zu9f-6cm4khXfc=0cQ>W`xS#+4AOJ~3K~!~3&FRsUtgKUa5DMP*ZUvP4|P%m+F_`$=suo zd79x(Cq@E6M*I7TN2iB)o3FfzwIBW%zBSdW*^Zt%$z%6@n)AQ-87sU_I-S!s5u3w7 zOGgLwsrU*&r91gb@pN4>)ZaHfoCybnuDx>C{^J#o3s99Bz|&W4*e-OQ0y+VjySfeI zukZsF0uqrhv2YlI0hYe`ZfqILh35jN*T=bidr=1a&@~OG+l9;HEnc>)a#ld~OTNce z8h#Ezg2U;gp`{g@-A*(dHg*Z_@1y_w50jXhq;bnO6pNmJF?d^A*!sJ7(y@6fFFpS} z10$o<*=;x#fz)-vfdJ8P7?<0P&0fF+tgh~7C1>-55Y*MzlZeMj7?Xk)OO!j_-r4%S zZw!v*kF9PID((RGZ11@qcpPX3XkW2{mZeK8TCK|D2}KY{HUmPMM(5SnnJs!rv~AzX zxo_T&O+YLZqM@y=^w|4?R(+ZGupFKc#$v37))u6$6OTray2O9zMFxKG9c*4N_3JlT zHbhND!EqL{n8POc!Boc2!k&Rt1LDetBQ4|GlLj!ec=wdJIq3QoKu-m%7=Up(qMVFW=7PcfEgVSPe04r_T_a{Jm}`|nzV4l!oj?Biz(_^r22{)e?Af{Db|IA?0A7KhbM0Ch zJ1m~~la*Z9vucS1(O>{28l~yl8}W2>mMp(nEWYjrjy~`;TmoXDAim}n?76+)^Qrol z81yW8fX!y7zNs0P$3rXEUl7O)p4aC?>UzovG@-~hzI$=o<6j#X z9WI#1EKv~$uxH1{H%Y{|0hdq&i`K5AK5LRlb*fdVB!|nzWO7o_SZ^=O?)bgJ{4(M6 zdYOvFiM@CL0mLH_8rs@2?r&1f7i=eA4xxzZ7yIaRxoBu&Sb ziO{flTUCY)>)JcG{0(oUy=ODeKl>ab6BE?iY&aBwu4x4QQ^ezO>Kbx}j4P!2vH;KH z^Pwn$NH`2oCxv*^-Cdn~?(ZM5Fw$)W9KfC(o8B(re!w9Vg~e+(P}iE87&0H#DzMpY zL<0d5u^8&m0L$KbPstf^08-7Xd>{P!H zR|w<9ZfI&j(=-yX7*f-iI(UGAAAb*LQ!~Cb>nvNhQ4DP>SF`=iZzFDVu>A8#dx=PHksxrRtaGASA}{kI@+@3Hqm4bi>WX^C$yC2)poPPX{_H8nfBkcOtJmV5u};K#*z9&z?7W(7 zuX_XIzy3M)fZvF^)YWC|FlBXZG?`pT^=IZOaeF-JQ5C=~5O02GSNn5c?;kx~JOgvE ztSffU&W(R2;ERBw*ljG?xEXI_6UH|wB3&}?hZ4LZ$YcBf-o_@J$tj^Dk9;3#(Z-=E zbnn=Seb?`x14zlxnbT-mfqTr1hgJZ^RbOTv6?uHQSCqxG*!VL)x;-AcR;{M9dnxwh zhA#fYFLU5MZ{zSM{*>6rP_cqq2Di(FXUu3`d+U6L<2LhNLV3J&Ti=}Vr_j*YNPB0x z-^wT9$4_6m>354~Vh)zn0QT(M_-9h`w*Yp#gRV`Rao5#hqRv|AM4qJC8Ga^&q7a&# zK+!bfLZNN@&fD7X%QY~23pSwZNmgjW4X=rId0I^6E zq$G6mIQ`#y2q`5En>HgVxa|1c*Zz&keMaDz_C-rFI&tSm_4C2$a^ZA32^o`x> z&Ly2kzurG`xOk?;F{j3s1hHr5#(zNaCty^wyEkpd>Gc%7sKAHW@v@SOKW3>*&b@dL zH6BBEx!Lv9Z!GN#0GK%6%Tup=6|Ko9+q7sAZC%}1F%mFq!!OCTl9wkTFIUd|B#r2} zCO9vDciz0d^mJ-hZE{aWc8>-mAIzSw)2|e_b3yd#zyq^4n}|WG!8`&4F*vZC0QdXQNa0B{duY#=fBq~}FTDUj$CAY}hj8;3JNH9gu9b#wa3v0h z1GmRx)C8ndK>Y4K-5uli_l?Xd_T8-d03Nyv+l@Om{)d3~060A!x_h?Z@D!NlIpe{V zY}gj&%t$U_{1P%_K-IUk<8T>Hs_((Cp$4s=X}S5%yRhAMM|v~N(Y^}=#tY5kNH-3P zrDpR=8f%4&zu>*|B$(jInWq4l933H)tO0~noxSHTaQ^xI#R@qqM9!b1|N9RE;H|4m zhm+5XtoNPc@~m0j?HABu3TRsCFs5MXyY2#${&vSI%GJ~Ia zerELJjDz|{<&959=~f060Yy8?HZJ@)(lh^(xvs;sK0s;sJP$lvGF zU6Bzd?!6fq=lt$+?m3DiQOsrughN&1Q*B_wSbq(>`-{r1p7m>GvWXWX=Xu@7KDk(9SA-|O`nMFHe-=rS=o=bDsW;ECk*vRnoX6`S7z$A=77;>7Aie#v zp`PH6#uCfg@wTiUz>Q~|5$XwcIow=Cs%ZdlX~&td(! zh;+uP+mO@0{|%)Vo?pD)6+l)L-t*lbkQ_b{tJ0paXP>R~1lEG}aW6OLa7np!V0{o| z5=oL3hb_alIg~H4>%AY~oWE>*ketMww-dj^(Uovp8$N%Xq3cGo{t|M2zn_7jK|B@1 zCBc_&JM(2cP{7k=Yk8oqJJDwjF*g->G^@+gWz|M2k4W}w9zJ0I)F`txN4ilPt-hbR_H zPJ$STvpzD|(|_Vv;x~7=D9Duoxc&6gJ7k~!JK$_^Cc1`BdD)x@taID#s&BivT=nwG zy8DaCd3;_>Lq{u>urq0t&KT{xUcU7G%Y-)&;KaATgL`khfv8?amLy8~9KyB<)wr83 zue-kjxkY7HsQ3%Yius=wkQ2ftJ~~D&?aYzrLU1ToV))JHa`CsnhvI3xd+_t$yMpB1 z{|P`>UmwBRvHvni$;Df_Ok?6+@oS+d3gK{sQmKUP7=bf44|SjPk&{oo;opxOSu}0b zl9YGz>v#8h4gGf@odyt&buzGh$84*7oUs1f2WML*M<0C*)6fxKA8)wv)-{V~S4<|j z_QM}!AU;|RR~2q=r+4#~8bf-#v%Y)92QW>8siQ|x%TB7el4WzKP-5%b-obmn`5lxs z*c*_0^Z*Zk;zJ0_awgMGIKgo}Ugmqbk*vQEOv_|qbPQuALCiI6cId-rKJ?In8Dp00 zTX_xR#%bk`bayj&@+m7*{#ipBH*(Iwq9dV&2b6WnoG&9Q9(pRtHYG!6{}=ya@p4vy za91~%{KqeeZ{0z;lGdu2&2sFC$5D#~mZkhler30;FBbf`=!FI-f4NX#^x5aC%AYYU z9?6y1eaU6K?}~q26Xmx`B@X}Hmk^ePBujMn_b*%dXWq)i<(8H3#jV^DJp_;9p?`3o zb}z+wNx#v#*gZ=cfTUqOIDH(9L}$jy^Avi4#<`VauAG~9cl8fA+|g0>)+-%4zzaY5 z(b8qE5dKJn5B}&H@@Kr3xbC+Zql^SdLF%H@@~ z@h)Db8`fW1@oVKu#Zomu>;8PH_$T)qTyzWZl21CQDF3)M=7>q3_&3#oMu{;ao9fkB6P-y^FYE^347B(c$$t zK}+*_%7r}sP^jt`@4$`X&kisUMdv}~LB#H14%-m0 zE5jGQf6ex%OR~&~uYEo3FF&38ZoZkQF!4$frf!f=Ca`UrKq!PHFBH9Y)|aSz*bun| zWtXS;mT8iln5bm+b#nXVEQ>?AGJ)-<@ZqcWGW?2HF4m}3p>*^J2S5L5Y+XlIWCk{E zLQ$3q-8TKFfn?+Q9TqNM_1SXiWD?a0BEo;B^P~;)&khyJi>4V{(f}MR6dyk!7&xof z=iS!kQP2uSBC*)QW3=Oh_2(K1ug~#fEEn>KQjyH#k1_C$cdcp4tJvl(obv7qc<`S4 z$WKlX^*AZh)MAlBI*sD-;PVF;Xu{gExf{8~e`1Q^!Wo%1)?zTL_*jYdl@n zIpeaA@xE{UE0Nj&Dh-BJDskYmA48jR{0m||y@bMxc>Fm{Z+_OFBc~e%iFh1I;ik8h2#WJI& z&6ywlIPd@V_vqfbw$Bvc$Pd5I=(YO*2!_J+4G$tMr2eA8iVthf`qL;Di)1qy01g*b zo+)YH-8UNlp_?LIo8MD9Jolz_K5=q55cEhAYOzRrZ(q#=U1!!`qaQ++WP;HMg>)KW z+r)3bg|640g};G;L>EG^y`A0fxrpGFt=xC_-4qH%LLLRLBw^b&<$RuOB95k(kt7+P z&sS%Nvc9Y@Y(X)fBQ-Hea(n`{RID<7$+CH-tnzeGW7FAh=7Zn+0WW{o1#7azHy7hK zUdJ=v{6_%1J}>>7hLNQ@<9@f@{i;X<*}M^3#D!pTauVCN(QKRBQu&N7yca#1&$~)5 z=Gp)p&S~YH;h=5_@u!;tK5WxOR+O34UW>H7_Mq8Vzgl38sK@KY9|}@Pr@*$E{QYm} zJ?GptTN#*(-jjE5=AO&2qHXMdWXPqGn7V-gJRW6c(y;QC z>SOh+Z`&57T%L3yPGWqFLMAhv&;o$0Y4Kc9=b5rfZ1*d<@azA~*`NJOLY*zn)&5@#F$B5G$NbB#0k<0RW}FgIE9ie-IcP zc2{nLV5lk&{d6yPU-?~>bdo-whi;z-&m88Lkno2B1jA8hcoqoE+1tKy);BaAy{w|C zCCY^&x~k4o9K#mGb(3+;pkP^Sef=AF{U<)fNpF19ioW+skv;G*2R`?4ELBC8CHjXq z5eUu+P~(>M-41PGU0Ht`mSr(=>=?FflQB%Li)Wq)_Q!W$`49_w{>{a*r?@X2>^gVQ z@BjUI-A*j`ww@mP=8or<)!koIqDFT8A22|AVw_|pd#k6bhgbjmHTdV{H&}a^n#Q3U zuji4UU&FD7{z#8kq1Wf7)2l4_Bg(Rj$M47I_v7{XP&^)FNk&p+WZC&ANfNeYBLLen zuuKcfG%<7oQ`gXSy}EQauT4Ub(k&9YNzyd%h9c}b@14BnzkH0oQ(m@a&tf5DA9FHb3YB;kzfEQtD;w{)dOZGHca3qdqBX8PgWbP6 zH`aFk=Aa)*k{I5(YbN5&anAa4Dh2_`@iEd9&N7m>yO%Tn?do;!3DhF>!Vw<%#kCx` z?&lQ7#%S}(ba*^;dKDs-jJRt7fgo?%WK5H^VUsmXB*nv)*Swb97hJ^7KRpj$$Za_E z#v=3ZgB<+Ar?E;UBpf&2XnRd;{}&1CPs?el#&{((*pafvZK>RiSC1v$?XsdOR`jZT zXt?L3uq-|HzTPgMA~`O?!#j6X8#nWR-L}s?SQs1lfal63Mn}m^Ijbt3ju>ZL`6EJG zwz{l$Z6Iu$kw+fpxx4S;xqI$pWdFlRmPy3pA*4uzWSO8M6H*lXlH}Sj2n3o1W!t7~ z*%WPyg5mtN1cW+cocP+;v;Ca6u;Z<7BiPZgbfIgA)cyDH=wE*ht6WAxqGzCgCb37= zj=wlqfBMhZ_!ye1VI%m(WZEcL)~P=lO+4kUQ8QRES6n*K{ZFrM4}W2I)N!il-*ytw zuC69!{go?zEoyrLN+inZ-@1~vQ%`eK@VY=R6?x%-`+4EP`-wmOH1TJjCNpxZ+J*PZ z5(*NEg!8v%($Ew(wgBB07&Xt-;0Gw9p#vUN%B=>`)wUC)zW z{ab9qKmvLP1_;+EzkAl-h+bx;-eta<#X^Cpiqp@5e2Is0#cy0amiVH}3TI)(24GJt z*5(Z=Pra`{))$gxJYF9s>^=>-o{Qyi%K9}|sz>R`2~uO@07zaRyZ-*`^sGThu|~l% z43f`3N8-6>C}%R1vsv_F0j*d>FBQ=XMSPJkvf{xP3K8k)CEV3Tw6~wGEho}GIM_7G zJ{K?i@cTUXy>EdKNRmwNK);jGXG2-PF=VrloGk>SBO{omN!hZwb}AJw`poUuK9|nA zDQzxRHCnuMp!<_M!v62SvD2}*v7sSiLvzN)$2seZxkmzW$pnd!V+i3m4{iO6FL1(# zKDMTA!!69f)-|5``rk8t!!H0(WQD$=Ap)V`@xl75$o`y8r^!^De*QC^=b4iFiL1vF z|K_gZ`B;@7=6egJ{Z9q_=Wh!72E&SiS}fAm-Hohxj)MmbZdrfM3H+fDfpCOkE{m{j z(huBA;mN~vopm;{Z-L0jEi?q$~!-SjC5? zV*Tll$wUHO*Ac)SsT_GzeDIn=>4>`q)W@oKVjRjBk8KMDcD8wxT`{i*y%rsk5RJt!G|kC8oXs$H{m<}(!nEz$-5L@!2)3^A+;_jl(_jC4EVT?kTSo_d z{e#G|vN5c`4y083QBze?mE01~mQ)@qmao}2p7_#;1PivN4OIVVki}X^-8P(#w}^3kKW$vV>MB(B9Kqvvu`&XMIuk zuohmQkG5D0OE=I}6S=h}H`Zb1ctQGsdpY!l&k(=uca>Q85}n=M z^z;wZUuK?*hEMY0o^0H{mvyS1f2+W@ZQ@gLgb)-gi$A3Eqgcu%2a845{{D-hVFuuE zE@$qFgr>^2ebI?QKf<;Vf?2We7sYYL`U}ZPvP`(69e*H%S}bDQHtOgIf(4+CkMZQ!zQVKL{wIvA)4TQg{qzqG5stR84d*z5kxBFXcdy{_ulx;#r=9?ujZCqg z9(wu*P&_W4({af9^>3SzGYykOG6BG(Zt}-m@!qS)5)I9h*6=s*v}ou+$}m5%BNUV* zoUNqMh0;2&L$_+q)g|TJmRGOjxw4Wh6KZQC+!l3K2@C^ERY~1*CzCf_j}im?eC;R^)N%PO{IVHOG`@4SPFU;h$>AiVV?;LjXKp~wbH8qK8%tX=gM4}A5 z`@IZacrl^PCoa{1;}1fRe&_+letE4kxmQUF0uTrU=J-msIJ{NKIHo&20Em(iC zkAO3)n@N+2$I&%y=7J>Aarzkyyyt!NoO3Qp==k;{&=YYcescq3zx-L%gKrw4aG3U3 zj9|rA;>GO7TUTy@i@9u$R3!-P{h0!f7E52+JC^*qo7$I)H8TJg@4^?z^gMP^Z|6zv z9tGK>uzBaHiv)yhX4ZH0i>_F%l*^MzBq$dPv(77l0I{>qrtjSIh@EvdN}x^-`zC}I zpCW$y?}^{?Te1iDSEB=i<2V&*i_qQ?!x!+^{G3h9`VDgESxjykmTfaOGJ<8>ff?<@S|i8?Z+z3k3#M7dWl3MgrjZvXH5b(Sn=VwX8maxhR*1y6Mu3{ z)43^;y=~uE;;k+kvSO^g0qBqI?C^OHUf9>E$VddEQHD<5v8o3==jxJjRVg9RN=5vk z@Dg9Vk*r^D0$^#m>33h)f^xAysgS3XFU*=aoQuG~5RsEkCb(%cfx#hygF^%chw-*| z;BD_fTFf7#2DYZ6r;=!iIC?Tc`PflPM~_fGdW6!E=g=$T)47l&37_9jFcc;fjS!eS zWZ6j8U*dfe2r{V@AQ1|N@cDhUX}0TE+#uGUzBoBCNm*5~5nMN!wlX%a*gGh&N74WQ5k5&oK~&DO8Fe6Y?e~q z*}5Bww$ZnFOC7h;)pz4pD<|fknsvg^G)jd6TDeTQRKhacdxR>Xuww{h895k4uEff> z)H1>_urw8`RIJP9^&lbP_51J#f`mdrf}s%dLPn<1tlz-ifh`2_$;oPbeE>y~2?oQ2 z!XbjepfhZlskmXRKP^xyma1XC9xIf&H(UJ9zOne{mb!bjSQi6u*-*60OX%r~`a3&= zvV_OyXY;O|NcA$cG=TNBQi)Q|={{?vay3&;E&QP%16#J%OiDHn>$|)egcI^hRaFd4 zMORgHO~cR)gqS~USPc|K!Rzgo2Kd^VLjbua@<}>E(@%jX7byY{4%k(rJUz_8*PrlS_VqRbt(?sO=f-`P?a? zz_-robe09X28ZbEpBrC)Wvp*oHswN&VlGE1m#fQ)x^3Gdsv!pyi9x^PaO3g$7}&ZM z-*oJPCT0Dls;DPtnI@)gU>YWtWnftrwq+rNz^+U%iV7#oNFXc7l7u8nD2jr|<3aW) zD2fM<*NZakwmhqIL|d;ZO7!xYC=Yzp|;6!6(?p7~o5Wl16s3=#~62!(<(hO&O+<{g@*#pw7b!WN_qlV2v% zhet*dr`-W&-69%{b=!?{1nk|Bz|(2N{_ys20EED@EFvB4uHH|9jg~KwO(aN-jgcB3 zqnyt>Iq51wmOzZ_x^%c$=B`YEgN2ebrWq70yNtvwAg&OSbl|9}y-^o};egL^$Vq1q zKp-5RGx4*=tiNJ~Zh+jpOK#-cv2-)DJ_vG|Eb*x+gm7BAKVRa3Yylxj|FCx~@s87? zp`S<+&)eY5Th{Q1rYnbwW$Br+O2)JRiKs^w5|ShU!!Rh9OXPAniiIMkX&@ov@px(| zwm!+F(kXP!nb^HOm7`#qdv3^=pKS`}()W+TXn;=ybz}ckCcgC!37G z8Q+$2*-Fs5Zsx`^K3~o z5qxIvc;f%gy=PA>)+YHqZ?h%qdE zb4C-IrZHa0GjXJ>b89Ml!``vPd)$5L#$eqIzy~(bQXA%$pRjc;8(Wb#(m?7hgsxJ`|wcLTWlfy zJm&RuytS*1wo2E{>+{pUW%JDDrB$*1Dipu&=_X|TDzP;;>+71%)Z}D!cU{i1xHXX_ zWm*ME;)7R@CVuUvx=Z?FyChk9r-bw_;B|m30bM>1!+sx|gFeyi_0H2P31^8k6bujy zh46YjOiWIqX&RP*pHC%?l4Y+byU%K{A#tkq40eD0jJEI>Pp@PZ>gerrmg{oac^+^8 zs%_gNsxBW>bw)JS;=1#n4!Y?my{*ZCxQ`H8~J*w*RF-_-K zS*JAPOJ0)TRs_E`CHtnIj-`&RL35-%gI!+)>8t%dujlN}HliNKFv*Hc&)^V|+60(x zC;1kXZL$7r*~ZJ|^LbLqBzEOJ%9$2-r1HcK!xD)9vCr9E=d!@%;{%&|w<(r5UxM=m z;!P6x0iqt6VZWaf0zL-(KJLood8VZO+1|1E|68lJEQSp;0GEUO>|pl;yQ85q;)cn% zs#D{-@;pd4NrGQ_{NX#UI&wr^k2YO8)cs~ju+J+?{jX`8Stt_ZpJ2K z{WY58bN)0p>l?a3GM=DZiK8cQ0&3i!En*2VDof(BACD$)b5mNQ@Zr9`u%(#iN=WAe z=K(_iiX5*Is z&9-eM_Ue-USIhMYd8wjh0G5dl4fMQG$owlpoZ8{_@XBb26N59Eek55U+TKY=Pd6UV z(klk_Pd6#+yDbkI%KC<`lgXqhzkW-5wrx`^6v$??&Q8x7JYP}#%KndpKzzgKOn&p)$5=Q{ zS__M!WdIt0i-+4{KHK*t;L|{~%j@B^IYR?*qUuCDJBhY;;`P-I57v?O*JNqWrQD3w znSE9WG*zWg$WzQ0uxkv2C4_joq)G=1CGw^XFowiG%ck`h=f(-Mb^W$EdnhAwPC9Fc_lFPh@N^4gJ+vb#!KSPCrzum<>WUtd_r_Q!=Jz5tvc z16xA@P6-9*^UqdxNsDG(n8dI7q9UbY7Pyet$D9$At?kqG_6!;2SmJh1*E2Es6OMvgigI-e}6?9Ue| zRuZ2`a8L+-==GadHJfYrixn*cu+I488F&kmJ#WL}1Ck^z0NT#(jIuoxK$aCYpL`Nh zy`N-zazjzlH?{dH3*(uVb{5aK7c5ISez@%>7I2{2=oeqRLOYs+<5EKpf=5t{nrsZ5KKbWS8S&8|W(9O)g@yrV@ zZf;=>(J}x{0L7I5Fs?a!*~_JJjiSCdSbw@&Rh?PBPa4)e?kZ|wEzvRnO@JRyPEI9t za}vNdO$>dB2xx9uzpC>a$NIHUE8TxX2*xzy1{a02u*PT^fF?o8Fz%c_R!a*QfQpW~ zX8mRL4qRXbtY3?AB|7h>W*w#0?__&TP41=uN=-ON%YW`n6Csr~7XSm@u?oxhc7YwMWYU zG!arYGvivReB85st=x3r&MCv7B;;FNRM5gYpk)A>2&1}wgDw`C2dKqHvc6lzuk;Qq z+pdoPr!=FyV`S=47qzso4rm#GCW1h^eX8OQpq3Wd^4@6HU)ChwGA08nqME8!gLozl zbN}TVlm(}S`Dht{Cc@Pt@n@!VGY3xS>v@@y*NXMsV4196i|OvajbL0gTjT#GLdyU& z8Ip!kjcPk@UqB<5?ADm|D`ybQOaLZy6V)x7m8XfllJ#tl|Q;k2^qp7qz! zp{Gv8^W>&K3Spyb8UT~JsgF)1_q%Ik3+sWF0cbKBggXw8DBd6kn|8uzq#@U(>7W{|ViC z;;JJ@me}Xq!g`}+0GbfSc;b;M%}~KfjA@(p8Z6nlWPPzb*005M_g?^0hIzA#hPANH zXc>Se#I<0h4f7Cy5CTSO&JdgjSd_d@l2b^NaxwrqOtb5VH<>x`BGXi}8nmXzU41unW0&}6JX z4NX_8Nj{T?`D`nZXLF*J7obTI8kl-;q7*c{eIAdds*D{wwz7g;E*LcEw(6a>J+t2@ zZkfMdad9oIDOv`gNpa;v7?*Fe4g bOymCp`q|SR$fnVD00000NkvXXu0mjf znt@^FT?5?Dd;6^KTkHE~t@&rKbN2pS@w@guXD0HV?j2GhMj`+JNbhQZ4FCWKzDKsP4-%Zl$w^FL9;V^y6 zjlhnLg~rh8^OHmoP2exFzmE<55E1qLY~KHa<5=VIN40|cA|$;t6?wBR=bAfFLp0-!}FqeYlG z98JEil4cHqz67;+#7k)rKxqIazgU$5KuH}0%}V7m1affzt6m%HMc|$QV8snt83CYK zCu#m5z$}rS7L*$guu(sa00Z{2K*`|!C^f)T7@)D$>W~H|1OVZ?Cbk+tc@5AqKtcQk zARqyR^&`S~0UUq8>f4PQKETT~fJS}KL~fU_lw$Q30QjVRk*njBRtq*G5OBjcF%i7Z zGjNxlk4EA#*5h;~!8YHtYqx{N$mjO^03bJ>mU1q1|J-MQtaM;NBDR{$QeYj1hvu-h zUPLVq7P~3|z`RG$4-~&pB_mW85BePS{^mB0{UhRB&*Ny@FXT#9KCn1mD3qnQQAi(9UNbd`tM! zdU_@94zh+Ajbs_&=(uZLXL^ffQJ=~!7Mvcle>F)_-J8+eWb-rVd~Mca0~!@4KA&tJOtQK`_TD8Z}g7h`JLRG0Mz#GTQ>lB1m+Yp z`d+EnO#lGk+~8Z~%1j5X4E!y4%&oZ7t;9$xiI*yz9c?NUDnw79%rC5XOF~q5UiFu= z+_DlHRbmlq(YJq<;7TUgW?V}q?@E69m>|2Ar!kliNBJ88^<(y55g_X*(;Kk_^l4!y z?5!F&RMDJlJrOke99r?>8X^W!Mr_6!EPL`Vu%yGy)$8MBzX7*Hkgpo=h$IGo(U%`3 zsZy=`D9QLz{XOx}6AzK}IJ(@7p%-5nv0v)9adRYm)cVR*Pl@PYu)Zx4ZmPk5V~i?}T8P3wLbXGZlPXg6Hh0|{th*I? zM#EIY>ch?kH`e%zGQ>0(ZzS~mdgAy6UpkSWjqh97Qr1%YlIRlC68oMRQI@rmTi%J` z0*}G>XPVcRDVD{S@t&sMRyO{SZZPxloe`yY+(VVm@2U;T^us?=i+QF?_lMHm)yn_; zK52x}p5Ff0q3pLuJ>^W&b={O9li}XAJHJzYV;^{vkiMb~?T)bHxt76z&tP}Wo1rXK zyWrYL^tEmyVM&pV)YUZdG#6vjTh+G$Xyd;VC21ycB{AI+GAjC1@M-oFvGKlfuTfml zBg4Q_bz@P(#UjGd*XdGKZytpB(d<-Zg-|Va|oysoBkspxN3kg|og* ztEbF?Lgz;3&rb^v?~s_{Rg!SxO_2;R$aRXlxyZ2ybx-Z;t6H=xspdaUdYm%0BQ&+%SAge8_-QC~U|Gs}LO*}(h zWc>DO#%jiR2E4}Vq0dA9>W|g6Pw#$NdRXvaySmXi?4k67d{g6x7M1Fsvp(M(Yxvwy zNLg5?o1j~qJ!aQlzFXZ>T~u?ee0c(IsL$=YkIqy&eHbngrtI|uFgGl zKO#C(E2LL2ML{rwscYt2(~_pgp_|3L-|%5pMrB6Z*2k%`ZHaA%?eOWGKCv9$><6Om zL+#&G=k%9{&f6!hhE`G;YH4(!lIny z?CseHmVJ^fHQ#D__1aysEyLidkQ?YHXg~B1pb&Z!WQQFYtQ>5Hb#~$xzz&O5l$m;Z z^ks5OIVQJGnN~S2t}ZRZ<}vEvmdXf4#W>QkcHg~`aL#;|9ItbbbAm9cUX9s z$t%TJ*9cR_A0jE@-an>Q-QnOPc&k*x*{Kp=w5iy}^e(SpKp2jU5zqgz5jpDwXouc{t%XKfg zi{3P9lWNao$Yj%{d$B#gEicm~68bj&jho6RcAbQ3yLG!2Td&@dr(s`EozBrULf4b< zdmJm@l;A!PAgWd=_-*u%XZ#la7rUn>wy^%l@6yS|*?j$5eU;y*-biNdpiOlm<0%`RO%D<&@&Z!0Izy{`YMY_fi^O#lxB)Pg%&cwGwrj?6z=jJmNuRE zwWzqG?#ZC-u7JIyI8m9-gUsJbvQ*W1Gpp@kng*=agCF@wq}z^OP~jSm&qh&!=a1 z&nk}s1{{~t0c-`nvmSK4#gSauijXPxBtj(yb9d7|r z2~y+NnOzGvT*1CeYsZA}-8!8 z7+at9L*AKUCC?O-d*G|NZ`9-PYb|6X!ESFbCMzi`Fh~$FZ8i12+JDt%0RD{JWv8CP zV}4i-9la{sC_7-jSL?C&Wont)q}C+8Ovdv0y2rX4Dq%#gyCJh7y|m8Uv2NS1smkB> zc#SDra$x45$#<6yJ@zwOT7IT!-_PZ^^Y{=>Hxu-N`+T6cVbYs>`*WjSqve6pmhz

    4bt#er}8p{7C)rE@dwz0ror~|9rh=<67BNS6kQh<{lqWkw*vj z&$e2mysI zuo%$qi(7g=BM<5mu)>tVxBz8*!9mYi(Ao337iuaPSVjN^rNcmnBFQwsTxfq$HwH+5 z8gdZJ8I;V!hyi7A_aUwlI4|fex~fH06LmodX08<-)F8+izn+$ql9G~AAEX4%lTJV% zW5MwkqF!O<>Z3UXC@71b@1av#&VUd9nm^@4wuKz(PV?8D5_4R0_taGXx2`1!rK_m0 z$qx!jO3L_W2GmNF@#{Cy-JoM$1U+U+S^x}Amqb9Q|2XFATwHZIB#JfYVieK8XxXqU>E&A!p8Yu*y?%L0S=BcJro+(C;D&L z1!Bu+pTEk7(bv+Ne!5&y^d5#U6K=F4^iCo&8YAR|Co+&ZxYL9ld>5X;xLm`X3%vsh z0y-`Y;2?3qmnI5^WlqZQuj!jR;Gk0c0pouWp^Zvt>2Hzw*F^(M5O!DMf5g6@%LU~a zj_N^Iw4DF#I3a9j;Md>2(F5RE9G9GaWjq8Z;_u)6KY+#yB4sZ7mj%<1$5=I3T35Au zVruVCN0x!E>+cC+Jc2u|I9@koDm#!S=N)4kA%4qqqh-?bhUat|2tJ<5Bg~f zsZzsbXI!XZw}&R2GrQ_*$|5q1*3Y=naGcqYWCZm;4Vr#?mmC|0rF-vEAtQhyenlJQ zA8ZDFdP$+i^N;w@h(3=!7@m*m-zz?7$x@2@Yefj{A8fYLzw}4r{*nARc!61CW~iqw z!szy{H*^P7b`>R8D<-t)v^@S>G?h8qT+2&tiu5p!!@rQbaLMwY404!VLf@Vn|8LlC zbC$tZ8DW4P#a03rBp}hEf9|*ZOQQXosK;|DEs=jM2@!H7F4w+X(n0QG$+sAj-~Vru z;}8AYy=h2GTqL0Jui4$X&=3%kbe;BMn;WL_uomJd(?+t)`L}Fbw&R86q!ZAbuGFrn ze{l$-sJ-_4s$tUO{D268oW`A+ZmfTD{K6-a2pGwU_|V@}LzquY*e-J^LQL`ypm3O3 zLgxh6V5$GhVL}+aadeITuX;P`lLPT%cTwX2`PI&GwW1<*E%xuLT)I*X4V)%sl1iN7CUp4KKx;y}8ltrNNTyd?gh}H)w&`zD~Zf|;ORe-)4Z z&{Fe{$vH%oYX7124MY21Tbmoapu*$x(p{vVTH4OwELt{=`|P8^i+jQY1ZZdXRau#x1h!T$w2 z2%q_i=!@yokc0Tncq>;-7?5Ms-s?f@w_smwUl*+Epx^{ZI{T|uxFTAS2+2foWx~AK zkN8lHr*F{^tXaIPJ@i7`<_<*?B(v0mOOO{riXwLKoI&@mdemTN6kF+uUl01$9OX^) zMU!6e#f7#5yg^NW@r7=HqH(GI9!i12?lg&B#84iHH=c45vakc7vCVTYqwfkNcQ70j z{3gs{|7 z3ID6GfJg|z39jpxzsQFZPUDqawP;>i5kB2*R6DA zlPd<%qH~TP(P0-^{*~dT@~~zP+Os7r>gC1Ag}Wjl%(aA4=6@59?~MD8*2CXNv6a&Q z!W=;a{5NJWF5ob*^cUtluso1A`4(MXGk@D!Bx zikNTNMfgxLzkg%CTJhhQF;j{DjrnTGaBfGRocQ9D5RYAeqsb_MK(o$qTs{$8R@$LR zHci0%?n?WQ02}7Ggk6KRe|cP@j9=3y2a1lD&>C~fS8n6D1!(MZpSe~y(*uc}D%eTKzTrGY}@*J{LH zH2Y<(yK&f(Sa+^k3WLa<3w@rLjL5h;IYt=e_yHQ?Z_zh`@vja{7b|8UVZp;+(PUSp zUa8&wFNfzBmNSw2zblE}TpZ_zOB4bINxKqlBTQ|Ct+=RBJr8bxtQ39WE^tDm0LA@LFql!p zL>6^-qavKY^~f{$Eb4CX58>AI&T?CkpdanNetau6X0F?TDize1)bS#OxKH2h!ZcpaO{fx#m30i{;QrtpecsLk{A>p;E=pppRnMY)wslp*apUEpT2CZn$9Q^`>Mi2gN+9BwvH^ zPQmSN%jr0DfvAYkW=9<&DAQ~^obBGwhA}62XgnA`r9704V^dxv1#l%`E4JLV6Ipza z`Mh0f@mi<$g-SQ8#T4EzyIGT*;F*u7ZUnc}vQx&(jKISoNSV!bwTW#q*S@~y>_sd3 zzAj5)CNybTrxR;O-Ij7D+!>_T2~Ces<0&x@hStZu74Cj)=Iv#k z-Bznd3zj~&QMlZX@zmY60~l7vy;Vwc1I2CZUa%A0`JCr7VGts1F`=>iaBsquU@D2@ zx90rk)H|rr!?`o5cIubc1GB%m?6hAS(FR?Z>|NmRY^F9m>w?jrijUbg+t_18EU|yl zuv5lAyg5nM`pS6XwIc!Dz$FzFvN>{V5s)!HKwTzgit5jOh+D3 z!gVD%B38mLgK>r)=^ibXiWEwB1yFgO(o+`ITlDS=p0%>{ye$uwdokk>C+#d z`h&19P;U;kDZ!96M3#*O31Y2tk88D@Fp*qr;d)O)Zl<|go-bu{txZy1>7eWE(K9Cg zi;nHr@j^%@798v89_KW!DjElIs&<(>&uw8IQ#3q1s*{pe%^Exgd-uhqrsCVOYqRG% z4u#`eedmgX`=D7jejWSk%UMe!MC16ycZzM4{X>wGcj6Uou;=}AI8f&qxpNNqQ5Y$! z{@8`*SbJyS&Lt+Gaq^2$BEnriAdOBi{tk&tQZv@4g=qKiq?v7T^HYG^%PAC z=E~%`)T%c<^KwYB0im4^Ihg7q7LT*3?smxsFV77ZhElEFh-I2_p&J1^2_5KF^*=@g z6qsmwW`I+>vdzTYg8RO}BOk`1A)T+Hl+pS%JO)u7oWyVw#lew8$6Qb2Z{+LST>TOY z>rDiulc`SmWAP;-sW`Y9yqi)&-y;rPL zT{OqEL=nhv_Emm?~pbX3TZoC7Z@D>ZA}@Xn$q@8 zYnNCpliRXm+LeAlRZsHxOc$&HTk}BPbWh(1tP?~ekbfw5quq5uhYT4`iFK)A_OoX^ zmgjM%5gEfqXx&`=K7Ok@8z0FxJo#t&rBI$-ddjqPzlYgnKh)ZAis@U|)lRbGd~Nv# zT(-OFRx1kpGQw=`C&=zh6l@^MWiuk)`mWYt4Bt@`R5XQkv0tX`b$i3-CQ?dIxp^!R zHTit!m8!2kFt=wwh08QfF}c0jUAm08PtBic2Psu~0tyhau6TX2b^f^(GAH1n7 z?NZ)yFWuWMJR3+X=2OL&1{ABSi0|MLaer>N6w6pbpD8a6EL{3+d5}!8^HJq89zd`9 za@ZK1$a@p{98V_Z9gB9HqfZSsABf*}d>LZVK}88tSzboOnnq^9@qa{E4^!ODZyng~ zQry8oy2o{s#9CL&MV-06DIEk3<+gm0fi0wpB?|L;*KRu<^GO;f5U)vqt z^_+KY2gi@p!|)c)LH(;@=!3FG6Q$$xXbnDMvIimZD?@Y-vInhHLi3qc=0Hgdan|C+W`SfqzFhefIeK35`^=<6wl@120?0~&&@ zW&d_OQ=!)au{O~*6K%rP!bD?b7H=nizLNLEZY^RGwsGhS)Ju#4wHs?lv1q_nIgrvb zGTTSh5Ds>((&p4rco3`IS@~rpn|i)!upU7)ixRmoajK(LmW@wSSh=dhCz!7 z7pETdaWkCJQ2_LZJ3PzDTMMPS+yP_yEiq*GSV9;sk~zmXkUPC*c^4M(^(CEI_8?fs zb>Teq#7UdyK{%8BcTtLZ*Iy~2Io#i#bANO0Ucqk}`$%klTesYew6#n8P5+|YDgS_w zbGKYW6Ng?-&@n<2RoLd4>NCEfagKn@#}v?#U+is}-(*>vRwZLQWr90#^0!el4f3|K z!rkJTj>6qmz31nn%a-7D(_(=OKHjr(iOq?zU;Kf^LA{N&+a}qOiZDI=mBhh&7Q;KRmrE%qYVHqRP|S|= zwS2HdwkK#|7GA4FLy&@w(SLR{ZlgJZ@`pCRu@S^26B)Dq&I`l5R_xEKBt>_$mpi6Z z5A6luaVrpW*D+9UJddqedg=Oh-|g*w#iMk#b7tjJX#%3EsRH}dxi>dmzfmFIhwqO@ zr&_|p_U8=o4>s!dV_VHcEW3Y;P1>g({G|VJRERFUiG>MQ3N|P9rvh7v$)_7t`3~qA zvV;2Ax;7=q+L2~u@elY?6Z#fbgvN(`A%r5g`dvHM@T8brIkB^G%HriS%%I(I*t zKBC1*qbKOf>F^WJCb~{WSz=DWN59~&urm2v3f4%yisC*xS?u)G;$eo}$6sru1O1|U zQYx3xF%BuQ!Z>3nUBPX~g=Frb7PEb!M-_}d^?5FN`}7-;loa&y@l6xMZ0y_)OEBXj zGpwC;t%^X4&j}|r0$n-+AnswAv&q_JGaR}^XL1IA5;Nwq&`NIl29N8gVc&@y_^Y!} zCd;EiW&e=P{KDT-pDA1(C?dw0bq`Fu`4}$5xZcfxtb39NZ(5fRaQ-yrwcw1_>PHI;={~G8+ob|a=U`+Q& z+$$sIV>qOFW9RmcAB$8h*%;CHoa*2|HwNb$KPG{|V6s~&Mg)uoea)kP%IH(E`$Wrs zh^$ayQ>yYJB)jGkS-UnBn3TYIKbk9;k=_Rz*nQA93lA)16U~NCdkxtKNp@>}#^5D32RtQ~vy(uWNQ3xxhSMDD zmt{OiOUa8p_zr_Eo;$y3rN3X<&Rt3eqWx2z=2cQ1SPUzaux8QgdPwAvJ#0r@Lr{0h zAaf}I86Qq?dvH7;A*4N-+I*jj$UD2JHd1|Us2y?rRv z<9pJ6Jl?E7hn##FjT;qKa@0@4d%ZdHw+{JSW3Cwp3@$kQSwt~fIQUt1@}V%Db#T?z z*slj;zkJ7jg^m5{1o7jn)V-=6K)$YM$#L#dy_LNY8XU^_wIDrSoWtIS=FzX2eiP+J z4}Ta>E;t`_BXOx1vZ#l{t0eJ<^C>gBZ z#JP%4H984Kn;`Ot9aN|;;<44ZHejJe75{2@JnVSQyGnhJb>oKE2KXjg)XR&yb!#$W zs;;`ACQiyZ!k#};jEOK_@mvE}1q{Z87Q}xYsx)hd;o|8EyCzq8jh~v(O;k1K zh@|e-gJgbE#H&*^dfn)ZYbKpac0viw9xcE0iyIye`WfN*Oyu3HO-tmcGZS-)J%5;p z%<`wNZM)&?+V{avqCAL|NY8g?BpGak@fI0)(2{r&2J3$mUH0Z%99m9ixGB?3yz%&hY|jB>6dX#FFi9Q7fF;N}(Lbl!zaXPNu8z@$nLz2SFdtMNwj| zvFi>QV(fuYvyXb0yhT5x1*s6K1a{lJm#><_TcmiM@5*cY(%`?#p2Pk}ek*~fe3xK$J?!Q6p!=5%hZ-dQeDhg3udqCwAE^g+B|pC# zi3^^=L`pIuLmNf9S#PNX&U@@pJ>P^rF1L98d6%74bMA;G+HLXIv1f%U^K|x&$G@FJ z`l7}8u)sEiM0F(1Q2=ec?7oHp=10Ykz`Y%QDLm`MQq(clIo*m(Ib*w;5`&}ggo)=- zj?)o0$1qRGB6&Nc-Lb{tb;F>h2`ULWKA+vXrNAtVlSconnlwQa6j1ij;zfCmK&1>j zRY(ZYEe?*e57&VzTHIgHc@a6-eWI@XfBg984c=RxLI(J*HxPlM-bIWyya`2Tk1tyK zJtV$~t{DCbxrz2P$1#ngE_;rS)DTnVVg9i#^?SzQTh3QqHwsGWHzT*htX9r{BwJ=E zDlQoL_s>YCrs&EOfM)Pcp_59m;BlZ^XXUVg8=-lkmPa|+>ApJ~DAMua^L{}Vfpgh5 z!X<{IWqv}LJY(uX&<)_%Ab)i-)F5FN zx!9({2v-t%8`E&yVz4DR9SWK6!6|g+(R=zVDRcPds6P!?<}hF%alTBkE=}dKDlpNe zK^hH+#E8%kOK&AO5Xl%)yl5G@9nHaU_TCJz9m-*KTYnH&9jr=TYL^ zDeZ!cq|H^&K3sL~zLj~xOd6uT1a|e8SlFs1EU|15p^2gpd8H!wA@DY7XL~Y5-68vB z^QU)9JrV>C^dGLfBxCoIHnuZ(%`lvO_eXj1K_kR;v2alZ#Drsl&--g~Qo~28%@=cn z(_CepkLOQ9y~jLc%_X(Pk~wn*p;f;`3@Q57?o(i%$v$SG4c9>w*alX96@9Ibvx7bH z_VKU}#LMR;w&I4)S`+geLD+f=hox8UT@b_%zI##WwlBr@8A53kzs)B9q z64i;_SA$~P+E5;XE@V7axTlGH9fmVRcwqfo^p&q*rjxLpl~?ahZ|`Z-mk}5dz+tcx zA{y7KxLTXsFpkdG7I-;T35qFh9paom`Z<9Vt`;_*dbeB)w!TYLM>2Nno&3E{@n{10 zaUvEw$9t@nn46~wb$%a_t4~tUslmF~m85;*!h>Ps*KA@1bk;=6o^2Omjxy?UQOC2A z)~knAUSB3E?)RRHGugN{j4wV%Ki4?}Y14t;?{Xr{8JRv3xUwOa_c8yw&<9y{y+!vt zQN#iF#+CD)r{UE1_CR2cKH)Zf-+RswN24>Ak+2A{kh!7!6Bk+Xw$JCZ3mvNqoU4vX zVm72~i5**}p^7gcETcD=-&fFtnWwY;sd7Iu0aAY!v0b#hZ^P$_RX`t`m(4*l5;CkL z+jSr#JSc9y#UNUIpysT3e8wcO#mzzL^CGZQ8i(mVAB8SX&BndXcWK^k&nT6hnIt6d z;j00L^(<^TTz`ylCQ@?w^4TIHHaE_6*i*C1nB6|*kLE}|VYk)7g*sbRi}Z=U>J%*T zAkARu>%9=Q)~T&W3%^V;6*H z#4r`aEtloDi11WvpVyqmxa&KRO-bMyBh1%xp=`u~vS^BWO(XT4cUJh+xSBx^1fe>` zYjK{EJfBBLnU~W^*S%qz!SMq}?TgPNW!c}x-5-A#Ts#LD4d7QJWu9o6oG&VUR|)5} zILvuU;?5#9;?_rKdiLdMMT~x>BBcX!SbMUF>n|B1gxvNV5P3uv^P@0jq?(3W(;oWu zzIx@saAt_ulGKabR~x#qudjl>&VjxeyE_rJat|JcA{<}(X}WYko( zHg+DZ7VzVG<_UAiX7%YUEU-0$4G-OmUw0cSL=IOk{OQN6se@{({@Q36GVFm)6v-p; zfUb!Qv4#{gclWh^*|?QvlXw!Xu}I)2%iy!&@MQ0SPiOk#qG~9otc-~6#;oN=^=IHi zS-+n?4^8cIvRUo<(Nx{pc7yL+Fg^n#qqT=eqPgH56BBw13yZ!q(Qr~GiE_6^^;p?$ zDLO%OsV3@>SaF;>7OM@%XTChlxHdd1m5ekAxKMjj<%{~FxZ8wi0gh_18Aaz_6C}%T zu~ahbtQIHy*&W7&wuf8|rzxp3C|HEX`S+$H0=zMSmMJYN$`ggfcGa)P2h~pkw0VLP z%yWYc@SSVt@tRSGW$rVc<029g)#Eu+^`3lYHO|Ye_^eAQFywM6%n}wPpJEv#?E*QQ zN)vY+OYBw>-qk+O>I>swAPEal$HrkR88M@bZ_+OwZTbTBjtJTGy;KeUNI_XZ;8gl1 zCbg7#^7p{}oC04#GcEks?odRRYo1N*cafJYj~=r0-g7>&^Voq!jMglyhdDK!VyWxI z50exGRw}og3@L2{vevp~cF2*YGWwpb6-uvWy4U`GA3gEqsa9vUWJ1rMWg$q~O|9fV z+>kwP8lo_424ay+@c96a+YH4I(=W?RUg;(G?_B6Zgz>7XLnMqQ-yhWwtbpwv^Elh4 zuZV2r5N}aiaMwYC>LKWwlb^?XgJnCh9{QoeLp8S%skNW)BJ^w`|P$IleiUZAdY8voq?w9n7y# z9+JWS_VC*p9e{aR@(9s+GJHmkte?(i zFdyv|hvwxlnBk{Wm&oe2@34-hl@h5=u4v8j7<`U8Ti8GZ?bsUe&`6u!;=APO zA4!Ej-+{f1cZF6Z6@zWNyLp#h=&;CAueH52WCR-@#CkV=DCj|#E_NN)ZGP#k-Kw5C z3c^Y;5CM(RE&bX;0K$adV<&U1ZpA&yRGZzPtX4C_}R5<@Ol zpjQbjwci9Rf9E(I6ee1N*RyoG7-~nZXp%--XXI)iy-5nj1RP*8BiaqR}$ly z*@u%I$OzM?y3CW%CttHE-`si#b6%&9KTUwwMg>!k-{Uv3^FvJxWE}{Yk9xRyEL67Y z@57$et$!;1W?MW}Cr=ew?lgIOWgshhqdsrMA=`K5+9RL&u$1#@*!dJ}H`co`bVN__ z+<5RY)%ly5F;g|Dedc=+pUxHYTZ4hN4P-nQF5C_^a~2NbEsUEm0OckaRKkMh4%t<6 za6?Qu(G6$^GamGK34VN+@X=A_HQm|?l|$W4;yV7iNJ8tPm3ouej@4&M#yxQmq)iZN zKgVS2aHTJ;{bq`Jn_D-_9WlnhpD-7Aa~38jkehajAMWvp_cyMjJ7NON;T%3ARq^1Y z3wO$t^r$VKp)2(hEm5(b_1Tc9%ttWz=-o{h(8(TUp(!gfD+h=Z>o-9zHTA6<9MgH0-knLc0|J3Y}MDt0f&=-4s2d`fF=vE`QxOpPT#`IMn}0LUt*6Z%4}WpmLEoQKEpm1 zoCFmUM12H=1;VVx?P6@$H_e#DO*8i*i+RziR+@@-n_4EPmd1DOLwqJoP&K&GPrs0d zR0;L_l}}ip&A`tR&&n)g&+1>(>>awJOHKISUSqjAIXU@fSNz9y(l5^fj!hd@9S&*7 zW@iV?X7`dqPtP$C2|F!@Ei}N-w~O!d3BQx#N^J9^ew~q6$Ns(o2N6*4E`vF1&kkOX z3ciz*G4#W@M$U?6f=muqj?f8PUGcC;kCyg2B`sjPJ<|Qq=F#_k)r5XjNmWCsv;T4j z;U^XQ}^Jw<$mezI}jDi7Q;x(*3(R3uIYl{ z`?%ilKuMwIlZ6=Az@%M{j$DxIaea=@LS(?IEPS3@5z%u!g-@*F`X<Vj@RnLC)mhFVm$EPhHc~SU}*F7PA zKoC+ttq$K$Ww>7OxxuY0S2o_6wE9-vZWmMWo(y-UYn!rSxX3GNJ-PTCS-sff2)qJ z>Ehy02P@18I{k?Yy+@TPjMMMNR4GFC!!$}oP>15g6V~)$F|BXM+27vuPEy1-lr&Lr zgvNPf$s-Nq4HwQuKT>bS?T&B4!8_tsqp!EoW$)=9r6R6Py}P$u>Mo_bmgrz*Wi|Mr zFwz#37zMnt=Z{<*Lsz|LMX#5Jdx9e)J_6-17YX4mJO)G5&hQKGgt!@$-gu*0Ub=yc zG>iYdzUR+n$So%dVF{@TA4}qQIH_;&tdgEoibAw{zkSo_%y#st^$7O$@bDO1QSnnbYXIiZk%p7JbdA1<2f1I*2U6=6VhrW!A4B2U2w%g1YRAt94Es#Nm6x_X_nuLd6Eua>B03xO)5}aL+g^E6dn7ixu@J9AAEFZa$oK_UBjEv62V= z*AycQ;CAyGnfIg~N>1%h7z#Nz9KS2%_7J;}$t34=v@lcP#$x3T>y8P*NAcDyuZIyPA3ug$0exf#$E7}sMQ>S#1p*%`?%M1 zP1R@JT(>Ti*5k_Wvq}+z)643z)Q=>bgvLd?dDL1Jcp-T^Op`RW$cnP2n zEz!nFucdur^{CkrC0c;8Xe`|M zw)#{!ByM`aIRGYpdjB=)rc=b0m@^prYm|iZv}x7&o?M(z&~Ef}zqA$950>m-ocU_yL~oDsut1l%zY|!2fuX#g4ToNf6xFwSx*nbQ<6q_L#2jr z`zp$xwCyLy(x2DWX$(EC_&Adl(f9TDk7AL+GVT$j<4zM5g#`ATyVN?P`|?KxVqs>V zR`L>bIhe@|`R^B22E4mBCxluMx_AUW7}h%WBMzxbHgm2E!#qkl!JE&YqK|%!H+#W9 zd?Osu9H;r`9a`ebl1a}v`kcOooa8mF2hD{a3YQd(bWsh#L00jdf<5?Nj|Bus?!5vv zPBC`bzOMw#s)gm`8oS|vGaHX;a@k%Q{PfhrAyF`B~s%~Y{WO^09#47JyyJ5!IR5*kelVqrd9$? zAc|Xrj4yO%fA1*$Jd6U=Yl45a<)=K-ba8P}b=qi{Jrp$e zRwQh8m@y>kc8lyvV6a=U{=*7~?UtI=$jN-VaR+mnG2uds~EWXHV-`fiR_0XNvEox z7f(G$&fzQiKt*Xi9zKrYogsUpM|~2cmMxkhM5pI_-rZdGK@EefX9<2Uy}#Ul4;C@} z6OB+}9lDS5_O5ZUHw%i0VE#HfHOK`|X))Y`nFLj6*m}HtVrLTgJoTrE^5?HLHT#`H zLGd+BThBe~0;B1LR#aI}-*}DEL<2uw=s`m*wnxcB=HBaA);iliQDH54J;4H9F|_9z48PkqHPEVZd&-ArK=0FIh>+Z*k5BUY}HPlsuKa zXA>IA`AgRJ;L*H;5%AUK+3zU6(m7c;f=m%PPrk7+;l+&FWktt7*=xC9UOqNHFugTe zB1X*?xpBoBe_aHZ&tB&;0 z2YSrDOYw5Y)9#*?I;>|C-BMd$M+$^vjevlB4Kd|-{%n)fy`7+aMaW?>?DUk}1@Fc3 zzLY~ORtteJXo;8B%Lt&*2U$JDh1%BvLyv;AA05^xRUqG0@{LHQwkS=A6#V8v)5jOR zu=q9WO*!cb6`-Su<4tE^~AVttpdLia0WNZN&{Z z9m&aFkQ!E7mnXclXhrf!1kwWAPhi?c&HT(c>D~csma(9p_+AU~?DR&ypk(`i1;wZ% z?n|unaySr0sd;?5la16vF?T_2%1cG`$5Y?$K`7IrzJ14iIqRcR^dm>ttiYR&0Y{sJ z{KxE+2{!^pRpW_6XA$Z{h17|8b?tL3Z0y}s)TR$Q$93rXn!qvaYbVl!?enQb?l z_?w^fAJ3#R4%TT2s{niGzytSn8~+fwuGfy;qrud=Qo&Qs4X-7ecV9bAe#w{Vu3h|7 zHy9Wj7j*Dp1VUwr3q8;Fd3EtdafLPqe+<=L6XbUuu5jFs#`Q{ORc(=~*PM1zgQmzU z92V&n0c@CJ6z@Gkv{IF)sQHqrvr2HhP_pL!+@AgQm6Ni`IiG;2jOM4}@Ox6`XRmjO zbFq|WOsk!))y(?w<(y5gp0v?7D^-|gR*cJRmbagTLr(BxrB_lzWhr+Lueq^J-%E|) z6`&@d8{BUq4_aYD@4ntaz97!$Lw#88P$XT#6yb0Ri_i$OFZ~elO+kU(aHo!9XJXk0 zSNt@CaO`0hzSmfHHIC-&x{eg{%191MtOgz=YnSb7+nEDvXvnzOp?z1g@UxIM*aQdC zZY^qnBv>r@i4%vc+tTECz!no6v22sLO_-Cajr=hR!JPWR;7{ydT_qyp9_dOrm#_V9k>rs^-(5WqX^IgM07D z10(L?p58OnLFb&_{kSnaGeU1x`9i-W^G_kK1p*$J(g%CEZvyz&=7^YXgN4U+akm6ngFJSAc27I_5wG06x*xOsu#M})R^95{dY%p(2Nk~aWn>nSVn3GpB1q{q4(ynU~ZSFBfNCQd!i-<2Z9hGTpUeK8EJ-{UJI*5H=#Ef}CTl z|A(lnaEo$%+Pkzg(wz!|w3HyAfS{xxAuS-?-Ai|)bcY->P zmLPyIihs}xQd|N$Pa`OMPUthPX@u@;@Id*fgq1DYREK)gw@lzP;*NA}y^p8|GcWO{ zTKXJpynp(`2dRd^KBFwU_;9!xV3e1}z$SIa(vnCy9N!sW^iS^nDtr;Y#Wh1m;7caP z1o%frvlt0InZPAX<1;YtsawG8C?#TXVQY<`fwya0m7MTjU*o(6ik4*V|EwF{ts@>= z=F~`R{L)V=MiO6X5@R& zAn{R_s`K2(r+!?HtRt#N^4srTdIA`VLn_qR4s&ys@2&SpTw@GC*X)W$Mi<}FXP zms(foLaQJ2P_L8fv`M2HMD#7`M3kK8J|@*^nV`pCT*;>`cuTb;?v=IDn+A(VmZ+;8 z@SI?OA0{}WO0h-W=>29h&0gZoVH+xMF z`UDc>c3lywZV;2COUg47C;mhx99gqA+&b6#IR)Xqx)Y33gtYgidn`Zq*2%rQkZ;I?}*dtLH(@#3~k(**=75cb~<+?r$tQ(k|IwTR8o&(0)t=9ABt39^y zm{`s^Ve|G(2<*KCZaUvWDO0+o-HNpzH{k_#+_c)JbV+sEg3vUs0|S?K^5y#v_xf>;)&%@CZb|13kj#*$9F@1D=K5C&U zIjf~|mU#*7`|L?k=Mn(;z{rYOQ;n-3; zU3RP9yYw#4B0I@(kAb*ykbUtBU-POiDv^v|NGr z0Q7_%mORVf{p-s0Q`lehf@b7-SVg)X@~SApP3*=b5d;_Iujw^5UYu00tk!+^8q)t@ zt@4d$qF6o*)^R9|Y`lGY2470AReigQiJ9NX((NGPu;f|!ze@%zz-%Jhp>Ad!!A7gR zLVLt_@&2^1Q#st@9{-k*f(r&`!jAB)XwoP;eF1y!t>D?yF^3<^Bc1XJPWXCMnoQQb z82Vja(}N=axvK)HV#nUQc2ccRFX{CAgttO|j~t4L=Kq7HH{$oog1{x-n`^Rh5&Kf& z;IV4pMhnMG->XOe2Hj$PXb(~|+N(pgdQA_Ok>maarJ|7#iZPbkn$eL#f;om|0jGQ& zahLe^c9ZGZo!MTP%C4<1sU3Vy74@O~Tlw!gfUOf+ChZ@>?{Dzqqy=RU8>#_c zH|QwQl&a0%NZF8_ds#|Uxe>|({xcR-#`mvt$0ELx<0ap1DUNVMD->j!8@<8>eIA~P zZZrq!$(_LCIR^YPnsj3bj?0}3n$V9d8n(7~woDKoF!MVN8oZ_lt2prghPVQHl)cW| zi{R9Rh951Pb1mDR-dfqhCtQ=xj+-md=|0<;I0H*R5p69O7@@X8q|S6DMT(8xfU_Y(H?@^9u|h$L~412?m=5#j^BamSwI z(7r}VNn2ED~`*v5(4e6lYktt#) z@$o+sTR#A27T+HhrY2_pU^;t97ZZ67K7-*H=W`2Y6q)y|e_Oe?!_kzX>O^cZfzbqX8$*1=tgs|{a;E|2I&aKpz7w zC5_Z@{-uM|PsMkMS)g4BiZd)|TLW?-{Me|FK*3-du^kzIQoDB=N1%nYF`v zo-_FiF#eolooFTYCsL$1njGzKfSO?yt-4dJj+DKiI2T0f8jPy2kU`b{Wa@x31fAa1 z_#tB&Qfhj7emP`H`4Y`3+OP{@MvJ&MwIW5TuEsNkb1L}$$Xk>Gh}KsS_vy3`H;gUj67?%BfQe4GO_Wzz9h%8wB)vhvMOG;$v=V>LG9UVXL1nQIWfhYTU z?)c0u6_r;2Q=5VKFOnpXRCpI$3kMhXy-j+P*Yw~lZt!0VI1@j$U{q$7f@@UujWDRY z%yF()+zpV&P1c<4KOmPECUk{d>TYB_zPg|{ zp*W2-^{xM|>d&^6oV-DhTanJoT04mFdwKbhJ$QXn)Aa1DoT@63dDxW(1kp$BbLEcM zTpiM5PJJfA|MumNUvCMRx@p^k)xcOvwkcR2=%1rjCo*dWo(vSYWfu}hC~!^T14v3E z_6Ie$el4}NA=&uN{GjuK3Fp8fNH)UWVBszmj%$680qbKA66&*dzkhVJRS?ayxnxuIDAmc=d3g%k8yXsF zIry1*gV>V-KVi@6jw0u}nM&>K@0b1dw5stod@F409+7S$scP<99=2#6AmvHo6{l9;3-5zxzZKe(` z>T~uY*>l$8Q8)2lYR#UY&WKQse+1F!M3f*w1osauu)u8cY(Ku(dQ#B7eGrUYD9yTs z5|`Ce+@aT-8dK&u{Ugs%34QxGO+u0$bVI9J`7vm=(Kz_@p{n*#l~iufmQn?JIJ)uw zmhyp?ifVlY>MvrE?M4B9bG_UX8;R`Wi)#bt!lL8^3JV)lq+s%ly^Nid*19p4%5U9i zS10tk!CX|e;^@Bb|BDvF3z?!fA9%>d5J$~l)m?}*yUTu5>W;EY!k+MS-k7)_FYvQg z!Rm4!Vp!uPlJp!p+?K!_@1J77;xhBK1lR;;3<)Vng^M_HVaO5G9>$mdrk zx>|Mz_5V-`{k!j|6$WxFSBHJCyvL~z*Yigb%A@1R!1vT8HxrglFYa-=T|cd|H6(?E z)#n!4Avf+HsMp{ML`3uQzVKjAasP1cIIHUMqPzeRN7|kn(x}j5MewdNZM-Jczd-o# zOrTORpH=tAy!DZk60j;s>aI{~lMw}DEW7ePaLtJ3X^k*Ko~KUVJy_oBv)I*L-@9z} z$zZ%yV;qW0?SVM4zPh2q``NG%c%73Xcz9q({?P7@fY%~ z_*AJy7dvU zv?9*?`QcNuvzN6X)VPCx-+UMH@`Y3ttuo1xel?1p4kLzuaL(xLK?1p+eG}|as`2n$ zDh(~DW@uLXE#aIGIU0!-CUdB?EFl}LiQ;9-JL8dCNdwx{WH1;(263znS8LZ0{~Bfh zdbmW~&3EP0>>0It@;~~s*!eK)lTbtCEWDpo)$!qS-UU7`Vp_3d%6L!psKARH+S2fj zojIP}4!Z{7y)}0YX{@wgc6<=}fnTflbal7*ow1v-lkupS9A8Xl zRM=rj6bheTg$2E1W*Ju!1jud&B!Sj+o&CF;_cm;GzWmr`WSVT!7thC)MBReH!*CkY z=9|sv+g{4fZvG)U_^)k7%F%(Dd3(s83I=30{No80_d(>yW zwkM?YykRBUJZKE)fc9--tahJxiaThY^ZvNN43&Ni>BJNjBzp zqrpz$f@eA|?d$c52V>K+^Jt93^|w@m!JSm2xTDtlheZNf;WJn~D9cfFEEjc~t9sk8 ztZ*KXDQ7UxWs>C<%Y*X^ z)MSDD^XmFbHdyrR2fi$|5QSf=;$~rQ5NCaY=j|&iE7%YBrlzL&L`2iGvqHsdv5nWs zwEm|7Ab(q9c0W8yp(`gnszF}-EuyvfNcXLN3saLi{(RX7d)IZ6ZS3k6dW^*rVlr3h zj~$-at>pi?H3vZFto#`iyXZ}>6WF2`-h7rZ`YQ#In$+CVit55`bXb!VY%y?jye_%l zNq;`g1sKbj0#iDFsU_X&*RUIR#7I5O1QVeVne^JFS&BTLGPs+r*cdZEGQ}%g=p}w@ z&n_$#^YcnE`*5w@YKu9y>naYL9QQA9W{BKkqrD8xt3O@~*-O0gt@ZD2CwD1pwbj+p zMwJza%E)C`=rw6=Ur!&DR>2rPjAxufV+inHeE_bL54k$g>Cs{50K1!=lv61@z9CQ8Mzo|KKmm8pShNdWqGkhmWnxnb| z_d5Bp_t|gURT)(kr(nj=0o2|+ zJUj?qEw3T3nnuj)G>{#j+f)#9E|@g-eTg<8ZTAKiEhkXON<+pXa1i_-XC6;QXms8& z>NvkW_>GdiT}34ufz)T4h6sk7-jST7aq6_WpTxYmp2!xz9qmGlzPO}rK5ad^8F%nU z|DJ;8YT%(;MgP%N<>-143%dq;v0F_xV~{yh#O||@?qAH^-GVs7rFa+IF1tW0>b3-@ zJ8q^YOU##dklJIo!u}4GTyZr8kdBf4Bu7?u?kOu-bq~6WL=#HhW;+2e#`#Xg|;h_uZq`4y*OBez1|x z5R~lSkfkv+=I(6R4lD)brg;G&ME3Z~_(aLa$GrrayEf;@@Z4RgE|eY;j@`8bD>0P#XU`i^N_jiA z_8?+}yoWj?(}&L38C#MxNB3-)qQ|npfGSNY*&^!4RbO~@(#Fh;Is*RPvMu)@Vs|TO zsln6JW@~_sa=u!GO=ZhZ`$l$(X!?sQ(T#;3dfLa1;(A`r)_`5G?-g(7_}x5`nRddH z*XX7UCAz98ZB;cCszXP{FC&KtHj=D!y?t;Xm zj91UagjR%2^-uCR71^HpUX~eE+`2zfzDJ!bIh71H>e9U8o9$V*1#sC3Y^s0LsOq%r z#kelj>47c>F0($Cykkf8dw@I(vFe7$JmddMv|AK_mt^RQ{@TE9_ASh;t2p=>?(LF4 z-vLEHM)O%Op4X80>ZiJSk-@XeDp2;-)fH}RA?_F&6>V|a+BNK~cMiCE5pJ}7Gw&C` z_;4PVaoTqcLO|0L_FkpQaXO6bD$`PO{P#kJ=R`U$a|niSi+4d*VD_W?@;CmC=bJ$NvL{lYh)_S z&)HuZRqIajjrM)sN2)3@ zN}cNe9qhNWcJ`2Ge{ImIW_CaEmB1u19mfA3cMT(1n3_eUuG~X!$$|oMygJ;}0cZ7v zhte-8wj5Ab4!0w!{=Efq(VTb77P)@Hj|yf7@99i)^Q`+H27~7w9+JOdlt})rwv)iH z1&`ZzpB~YHuElG5Fr=4>CH7;qU35LM;=v*4YtsbE3d~N4;W;-oJO70eLhXrpQvTX` zklNyGzcAkUq+$L%l-D2AYAUHY)wahsxQ2`0{>k+VH$hh} zQ+>AO!-K!=yj{C!KvbpE50~%-v*LWLqtTxqa5H$f!8fTBWBKwuOFCPQ(!_!-aU#|x zfDv1mi|nsiXBxVf)ZtxBOj|!vk#O{L{{RQ>(l|2%+Y+N;ON-fb1-4#IZG(ZwdI$0v zgi1x-RiQTbq)=jzMmq=;T4~gkgU8#R@TfST^WM*&rIxvkjFJFLA%?1MQOGr-nmOUI z&O=MZsg#In(<7}xd3kDD`ft8wA-2!!xJGid=C(wOmLLcFr$0-YQggo4MaUMu7A+$0 zFu(--Wj}{d0Q7*V)te;I%dgqsZ|^4+*W>Lp|&f5H!V8Tzi}!F+TjW38uvWnzFLS#KxR0C##yoGld!MZf&5=M)`k>o<+jg@MVUiq4H;q)+8HZZ$u+Gj=#0qTl0eX+wHh6 z9rvou0k7h2;d_E0B%&3<17)%R_}=FFFDHyhb>ES@{5pR&{vdw@)5_c) zfB`r2(6xRe)Df8W+>aKWouQ`a4tC|2?58xEqd% zW~@oNs*8Kp>Ph(d1_N?^R5+5JO52AeIq1~T_bmf60A}^DTIJxArus1JMsVLbUv+HZ zuBvykd3rB_{3Bxv+Q6J+biubfIiZP}Dld2>R(p@cit#@(%lSJpWWRa)bJ7rF7-{s_ z!V!jH_RB5{ZbSDF$69%Dqo2iT)H&zS_GZ%%sk`1L7*W9|!wLiErLS%^^joH;%ZM_g z8stBPX)9}0z!&3(=mEI@qQhqnn1kw+%Ro#2Jon1c1A?3zaC2EV_Jv=t2rYna<|ch= zp(%yPcLRbSFJzC3?9&?i_VByKt?o_dUd>L5o(||@ax6PilH`gU^;PJ!_;AkmxPZJ) zCimek;2ksfQ2PamZ4cJmQyrT((J*ddrgh#p&sfQHO#pEs`bUH*iTA3LB| z#yU3d!vQvx6rjvSxzri=JD2a1o3wY#+!JV$>pvLfy4$=*tD*v*RU4zsgQI|)fQVrR zw=55|lPYoGmR3`s)*FKdY>pU*dE`GRVXaS)G4P@NQKz+r7=Riioj@}EkNx_wk1apkX zC7P|?l@jsWup{eMfUSaoPF=mFA#3UacC9~Ss^M2qwR3V_ML0!juB&o$mJp*kJcVi z(a?UTgc*0#ol=P`JL-y1@bi-gQrvszky>IWNt59ak#+o0o5Tw|jeT4r{4Gv2T#T_T zY1=7$ZsjMYn<#o7AAdk9?R0Y@dJ47gVF2i=54xGNi@VI!El+iYk7>?Xtk);?f9X){`Ibs2%wdw%d z((s;cRuRN85QQjI6`A`;x{)x-*s()4@!DTg23i7}{8USQ8S<3GY7;|{kWKmE5R^29 zilfG%#i4fm{!j*Bnp(!zec8JVHVTDIe`^fRVu1ANdy5J%N<9Ve-=i z@YSVceo1(^h0|2nGv%5pcl&99ToxAPEMpozC%(vYR(rlrd?b9#$^f;;eaguwa3^h3 zM`vms{NXMeNPHtlz_wU5HZfFk0gn|3^d0DxL?SZqM9mJ4e=cgvprg}Nv#=<0n&BJ2 zegQ_~0AoaaY9(O8Z;nzYxQ>6vB#^u)HFn#T=_r0Ee%mx>a^xz;eMC7zDDl?$$~u;P z@m}-^;sqt3^{}180zV6Mu3IUJQs~X!eXUKS^(b<(3Z<7>B2wu-3koGm0OAH1`R|`U zZZjCSx(csknt^<}hEUHOJfM=NAdKoj>8lswH)MgSnNv`@+V(E{HC0uMr0cE&*}1A? zhu;rBM$KPP;D)f05Ezmqnw#mE=B-G#agzhi1F*>^U%Ec7h5mG{H}Sl+o?m74;dKWJ zRlI#_g?NW0lJuuL=}pGM)%thP-gcoD31JIa#~n3lkZMBQioik40Uc)9+;Y9RKxNR; zLDSB{qC6ZZtj7bOQqUU)dTHEE%hds_TO4GIrqoO5-X3oE(VF`l`C$b#07>D6_pW)xejX%)0%Ek#h)Jw=*`~R9foXZ|xPW4E zfWAiSsIs-JAV8MWPwmoe%I}t%pkX`^I{P3T*X782f*0RQHOsxT^Sp62p5UhkIVyhD zUs&pPg;Y(VtQI zHJC1PGXqbL=N9`cN_Ry@w&;r-T`*A@fvoZi7}2NJJE$d=w4D`JfCA=a`OzY z{d6KqLSlt!V1AAS)!ASLM4RWA0r(6a2UF^?i|sFv8%MP65ZZ58fbL-p5y7MC=vV6@ z$A1L3hZ;4HZ&SFl20)<84#as%c=MGMXu$4TDj14A?Ohr7Ii_KB*YW0;f1IQ%(BMS3 zXY&W0{2qvfMfpK2{s~MSy&LEF5S{69pL$~)o=UHss_^lZ$Zvc=z*skF1|}0AM$%7l zAa|OoFGJ42cl)G7AZ5Y{%&O;gv6$UnZTkHrm^4Oto5NeupP2YbTR+QJZ}DVT54L@% zjm1d2J;k+$Ajm!3{g1zFLBrQV18b5fQj@%yDMIRJ^CXse2On1KCxhg{Bg)n zGzSEj198l-bDxWx`wrw@4^%*?sOZr0-cWB95h#jU^*zP(#p-{WLC(xFHB&M?s8;XZ z8A!<=LJ)%g{tdud2@aJdR0r!#^v>i3dk*L*uHO?hj66yOW zSXfx(%bZp=4r?c-!>8UDJwVBFO=3COL!Ey9n>n7|w1}RNo{-;M088=!nkjrhV(>bf z30wS|`uw%vHRBOfQT~ws_%bW+Jd^EPQV2s4UuQ=FSWNU)e;mCy`LcDkZ%AK#LsM!p zQXSY$gyt*7goAdK4#5UKPYu@({NC_7k%XjFqmmyZg`p1eG+?I-OO0F`6OcGK?Y2l= zJgY>jQ>cu}{m$r@cyT4KFkx66xbP0GYj~LSN5`EMf8y={Wz&mh%^49N;X$Y0+6eTh z9Mw)Wwp8AAAIVNe<7;<&DxEPMn)mDxUV$oRva*MI^;s^h?e%B@&jF8gA%HHt|C3Dy zQ~o)vJ0zR|B?Mb77OkZD-58ZvV&6X+uYG)bek%c%xTn*a9x1b4Esz7~;N?J*M=7Zo z!F)LrN#o=kWKll3n~WG~kuPInruTgM$y7)Z@7@>)51y%CgXV*3tkM2K3s7J^Y(Ha* zf!x@=@&(&0+ksX2&bMP-t3)-?Yca_Nn*^_x4aj{unQ%Ps()Vbtgwx*7&aJ9Ij~92) z0tVn{wTlvcg{1iSvHZe0&ojA>{hqwHVNMQ)y$UCjSRz*^No?Jr!O5Esw6H4$tXuwt zZ-Rjouv9WT{VExh-STYP;`p{rVM6yqeW6isT`7^oXm_7fFs@-K==7Fycn=CV67}?5a_sv>{C&IQ1opb2TDjrXj*~_^yX@$mz79 z@iU;B!n9|TQ}Qu%6wVoSUtx=oJ49X23=0C>pM?=2Banqv-TPVrKZWj=>B;R7BBG-G z`}=8Vdf%c`xFK$rAa!D$D7kq3PU+XlrnVA&{jwC`H6LJrFHpcsLJA;{M-v$_V+ZUO zjUl~gp%CeQJ*P{0{A=e3u7?Ro#8N=Mq5b1A@;V?*6($z- zH9B;ir-3yp#{9+Mvj%{MWp>=a;h7{<7Gr`=OLZhJz)+(-9!7b}EPfG#Wm8A*XXex8C4gVf?DlrIDaZeS>Ap1ioN4etfsV7jCya%pA^Gxosp{ zq*(_-r%(?ZxDn>dX^69^=p_3LATC|oUTaFpV&pr$y~uKM)#w=NhG*<{+=SwbLs4%B zDk&80ikqbR`{%GZuY7a%YW(gAF&jVLnS*!xr&ZS)wsRvQ>VH=AW6UuKx8O>b66bvb zXaa~!htRss&KYn1?JXIUWgeLcTh{U{-A+3oM}3nnlq*zYd4My^y@{>^**l zC&5XNyuS*^oJzS(K9(!%-YKfIRw&poiF&u-Q*UpJ9by%1Ho55Ri+ap4s1)3+URY} z?it_q(52X<8XF2!Ge>u*>FG6mx!hPR=vwbn1w9tM%{{gwWqWa>A|j5faExtBaq?c6 zJl?~AFvx-XmdUt$pI@CrK!-y>|6LJ%q+`2AaN7id1VTdq zUG+243mc1kIhahje!9(=ppJs!_wlo%$bJpL4J#3`l0*d{GGbU#jxM}_AZ{@2zIsr| zk{mz|kUeDnTI9M0lEg_nlXyR>fs)5%AkC5gRaVi03s9CoH%>AdtMwZN30U-f3o)^y z*>6C9xkUbkqL_@$Tt5SI3LIa3fFd+6cyyGZ2%-ARF~}CU<%A1o3LJb%_KJjL z@%}o>l;g&{Lx$L$*(BEK@0X2rE+Q3r556ldL&=1)unwr7L)!>9o@X8&-dEJ<=cLk_ zLQ+u16C|lmqZ(|g=f9pyArUKr=gX{ptQd!gE~Cge$<{rd5}#9N@7)Tv*%gp+EFufX z9-@w@ktdfWAz3W@hhIrYd|rBtzh7B;yT+AAWHHM7o50U+z{gN=26hKoaEnP9x9{`o zUr@d9j`3mmB4rHw%9VNg2HWsRzX4ubXbU-~-=#yoe+MHZxOpwMkHvUPy~VpKV#=HE zgEAVYlFBX@PXa zfGe1iq~q^v%$Je!n)qr!X|pgmad%28Lh)X*P%eHlXh>(0^$3$JC;(XuC;R6)2bygM zd@arI<|wl0jx0f!!6gvf9W2Gtv6V>eL$G%J!9oC6IP7Zm_F}?F8H~`p7}NW}mhx+T zI@}SWwI07*r4}7A+}RmN$47#_8TaffvrP}WFZy5)237^}V?q*2BEbvoPP#-Nj4u9$ zdjBTA9-2&qhL%^=b^CPC@g)|wyHCB5LfuIv%6P67uU^(T7Q--({@O2h`OHP|?lmc? zRk_`GG)^3?`P`=4n4vFKT`JxCmy2R`RjK+4d@!~-jUG8!*(>K&E4pq58*V*%nPpuQ z3S8-)?+y}z$@4pp|0JPSM80r);Kcx1fi1?k3~qDJB+mT5{+RS~ zROg5|uu{5Heq%&7%1(D&JHCqIC!A|swdJxw$6`Rf2#w5ktq>(QrK86e%uXPZn0P#r zGh9ut4%*Y0gVB}SO;JpDN?duYj)krI~Oz<~! zzP}TO)S4O}-*S^ZcmLxv+@i~DJV^Lz^h`rU;O?SA({E9qXMUMoy@u?8OPJ4RRuav##v*ZdKLJ4DV&*7x_5*Mbm zGT_gshD_IV#UX+k#Bkl0)>GN{;Y}TfYjvbD{Sa>_nOW4Bz@(v4Ib|m8pLI%-#8md2 z!F5vuQ>8Y%6X^_fA^_uAY>(i29t7|iK%D-h&FBGq1KcuvaSQea4mfXht@tF+{mED$ z&;=x@8wEUiVxw31WC!AN46T+Lp}IFj24C_{5v}S@do!5H@;6q%$^)0^W{fhMxCM}S z++x^b(D3pgg<ZU{x{J-!E%+7U$qXD+-Ov&I@y_06MO|u~o#Rq@@@1ZdBkrfFPRq|gW9O`3 zuUREF_9+#KhCT9+&)-|828f@ONyiGw{q@YXrCVc@;_Y0H1)MOogXlg>tZw}2FJ1NJ zQ?sBpy>n>t+UP6@0ETB=_lZ)lrsn*~^VAf$XIktj+1K?KC>680%&sRIxL^v7M+PmQ zxwzH5soXM-vATf(mV783FK(f%ldEm>xgUPE4y&|#f03(7c$P~2JZ1maoqMJl8hcBE z@un3$9Sh6(lvoLW5i@zvKQA7?kT4vT5Au__$pNyQywwzIy611D8zmk<^R=LEt|}yY z3{k8IG~7v|60O_tX5b|{(L>0j1vJlQafHn~m6M}ws3gJsCUT9x<^=dpotZdIY=X^t zF<|c{q&uw6KUd9jZ5*K_`r%h$eB@+y)m_uYuy6rvBIAP338GD0l#6|IAWcG&I3-qM zdWJ?D6{duyM5o6CNK+>PkU#oqY5hp(18(3mN(?i^6el2*sr%7L0r_^p?9}q4!8ZFi*yJzXoJC4E%%9`1cSo@T6fZAN!{tpDAA1sN6N8@ zi7&C?WEtC8wAqkHl4Y*ugUE)gBP3-r{>?8UViFQyw@_H##fdPan=ee1xOfKR&!?*@ zw1D9;Hr}0GkXP5t4KL;QO60wJt;Cr%x?ZNom$GUtG*RQ0#JxrDy)Kd?UFo6T*nS^f zoA=T$U|q2=%F_x+KS*7VbKvYup>M!*XR^xl(kWHxz$1pXu%jcsCh?@|u4(K>#iZ2! z5z}r}AWsn&g6n&i8_X;$kA1raIzkC~uV(-aPQX6JBemcJFR26bsB~)mOP?4^;&3bl z7&8i{<@&CV{EUs<5)EM?X@BXhn#3EF^T$^**gPwaN!CHpN+)Wv(E}uVL7}A zfi$9lw*CDqBO(+I?tfGH?h{c9dZ9oIRPT1E0i2JYed-%%fZ}Z_BSRn)^uE{!b?tJ0 zUKcN^mqGWZh*2?7M;|l5isL6Xwdej2zLYU3%1Tc0hdE32tVsVEm^5s!| z#bEb)LDs}cz_gHtZF-xsE=JM^yAZtkw%(6$M9fCvqJoLc&ZgXy?QDcl@`Lw%pBYw8 z`MnkLetLes@6VZIb`_Sf4rmFYXkxrYp@hmXbLyLU`=5-{2FqpZx-HnhkO6vg62WXo7P8OQ0-;5elP} zfEXG6>OtvWS@Ep_8vc(%t3OQbte$ii5OCZ8Lz(g{xqBpAQP9&!>>SG_G-**9yC}Em zqbjQEABY95u-qGZd$zabHq12>Ub5o5Bq~?NN|#+n2n5D$O~v+mBQ_Dl%TO4-atDz) z_|(+Z_Pa?x<`b~i4ldm%o2O@#bkO4}5QYtF$Dyv}_x7Cb-%YBs2sbu34U2?fWyKO$lg!m!j{T zrc+yX2Nhe2j=VH+LBHc8Cb4oN86wsZUwa{h7K8Q`FK(6_zzK->tge;=_=C9BwVrlb%8VF)aw+pwI1@Z$x1Ze znGx6K2||5qFfWbu?EEJ5l|OT^k%GwVXJqi~TuMPnNoG&ak_d(?T`KFuo!@SSg!gU~ zLyby7B*}StjrN0{w=3A()iX-KO%)lG%*2*QP1?+ zU!ix`wLL>&d!nSI*D+%VWBx48&wl4uXAF2vT_)T;8oRMGNEU;eA#Nd@u9RX+5Un3a zYqHe>8qO*X2jAEfFSTCl0B{g2i?D3ArLwi;-VpJRk4f2DIx3>x8Q4u#D~uC9s)4E) zXwWfus2XgEc*j)H-&FhsVAw*E$N2pxN_D64`rg56^|G9`rWq^p6_he(tJ-rCt#`vw z*>H_OPINcuTKm~8wj;|)zlM)tl7L`ma^8C`3DJ|XKlrL7i4?p5(cm%N$ ziq6Xej71I`OTRkp1se7iKmLWosu4-Pd<>NWqu@`nMa6i4;zcCTy=CC_oQZEatit?n zNWTpX&C|y?blg==ZV6Yh3l+)xw>rbMm^MPUSpH}%_ z`;n?79qvQ6y1uc8o!QK=_kQ4>k|rau`ig}khGp}`q{7Xwoc6oLVH7Tah5T#H&Nicj z9w*wui)B<-Tbq4zStK6d5S?k9H(jaPb%bS^ItMnzZ^L|K=pr_EC*)IAV@7#gv+y;Y zYEd_nv`c|ij-glRe&izT$`~kgOukvS>%bXf7SDmM%uy-KX4rYcacBp*43_& zYpL)p2g_71OI)x+Bqnj~I>t^oOCef-!VWIr`_Bg`Cz@IYHJ@f-aAEt|Hl8wdVYN9x z0WWgMq+F--dt>A0ogBg0k)`Cd;UJkfpG9?_gGoCb+L>K8uEo%;W3P?e$iyYrZIKOk z0%?*&3JQ08IUD-!p3P%-hssA#Z9xOfnb@^ZITBCDRNjZ9tR{#shn|r|T2?EJ;)K3? z`K3L=3w}p*m;xAbN)z;n@F*qvzDQSzIEz|llKQCU4 z6PD2$)18xJe@l4XD)ja{)^ymIbG$06C8 zs|?ve5fSyR5vDlhCqp!a7hSJE`=_R8jHsp)Dh^whoo0Esaho?{zI(Gx(`M{p5hdPEeUpcvgQ3T^t@Hrae5X8TnZ zT~@YeAT*}ug+acap$d|nu>dV#`0aBP72QWhfjIu=!S&D8IA_<4C~@4Dchmh`<E+0AI9i9N;)gJ~TxSz&66-*v3U{m7r>@Hpy|ro%FTQ<%`gw zWK>UKP{mOw!OX58e-_*9WYZ7`j{D_2J(2o1lDnsWnud&pMV%Ay{SF`-!)%SukN*ju z8UNJuAj^v-*@G_FOQ7uE58A^gyyn_KCR==aFD>cfWq4a#%k`j7#vb~Y|6|(A`P-3S;~~LZ-Y@h-jB=A&G1$WF4urSW;0Dh6<4_ z`#QhZGrd3G*YAIidpqa4u5+C;6@aEps{P^my?ze$CUJr|eWpU*S+z52SE!*#s`$5r zjHoj^jaMWdXLV&G#Uc(wX>bn%UZT(YHgH$}cB!T3@)XA{PEx@ zxHS`akA1bXsZ&7-6bQlQ4}J#fSGP1)X%Y=8i#4;Z+{ZjxFet^6g)4*~XEkpLrNtQ2 zXwJF=6mCB4RCWHmcgdHc3Y2yTjNaa&j4A-c-LD{D{*tH^H-@(0-AC0G82jVdzE2Pj1I zOqWYcyd-)_6MwAzT6_0u|MBBz-1q$4G}F*=fz5dH?(vx6$lULe$0dbp;q&`0X7v~9 zl2mjvUFte!HK$&ktz*c0f6sPL9<8)n`1#{y+g{fgfd*a%!!vFWt)u>Z3jVgDv6cD> zibvO>(|_OqH=uPGfP&lW58Lk#N`DNIg?q2^EVSotiQGK3_AO9$lJC-@xuihDImUwd zx98lxGnb9*=k&I(e3Pjr>sG%;4bQ)pqpI~%`C}Z}vu$`SL%s>;At{)_@F|eRXj_YI zRG{u&pf*DSMFBkYzIOl~6`i~=E&(11Q!-3H>E)H|mr*P)91U-rajqM&@4ry3_C^|G z{`6su7<=tB&(tr+K=)AneRqhuOcVVpcZVkfU`Lk>`u!_qE9XSnG}>J2;yu##E)4St zdRU*#k4{6$&%fC@$^8bvqtB%#Q6KyT+d{U%fxFAqF0=p6HeN}tA90J*26QRV>5Quv zb*ekp7`c6QbmZRZ7O$;2!EIj8j=M}`d4uO3JX!`5qV^AGdq3hV(0i(Zy zVRMZUb5^nyH&p;*!D-}s)(f4;=B)RQD&$Y$4N~TTYaT~R=({qTOsubIrUA^i?q444 z3qznsC)RI1hEc2tKRg{sB$0Y#z~_dSyrLOzPH6Ds)k|u;7Y}Kp>1y)&7)rPtwF~vZ zPq3ojHx4*&CSBgwHnI9^%lfvtCp$OdBLA{=ogiujFF|JxEf6obi7(utk&7Z)vZ|A` zt!BcuRn4d@IqO4GLxaG+bG*D@R-JKP%VZqmpPymh zLy#RdJPt2h+kD5Bi|MgKqdom{S;ar*+rhDuvMEPx*4YA#Jn)4*^{sqZF8eg)JI=3L zr?uOdYUhv19Y7Pl=CZ=S_DTQO)QA-JRAeLy&Utmim_`fK2Oqo$lSOi# z!2I~dP-pM2ul{C1pmRqYXx0QH z@4T?*iFZk#EVtmlx3cPcA3%1M!6XJ_w4EE|;@Dj%3QbR>oHjZDJi1^C*9b6mROMx_#J4;S>@wW? zHOm&5T86JEg}rAlwJj}0t}aDoRCZ{BoVOBAp=+ljcMjA<@7pPy@GUqKkVv`!qCV?z zA-C$%1)2QtW>}1QE?I&b(5l41=TCb)#&iH*d`npU4*Jl^fxStE%KbCVY{I~7a)Z=J zrhXtmgGvZ*p$fig$NfC5sf|0eWj*Y|?k!c}BE<(R|6-7rY}DdO(KaSu0PYY4IwPJ^ zaMxPB1Vsl_|4=cBDB>+IG5D2y(}^^Cdnjcrerw=~XPqnWbR&Mcu*ngB2G+LQsTIqn z1NvQl89r^j{fgdf zUVCtIUMK6`WzXm*6TyY~mWJ)w;av9~8a-Jb2(FE_+N=-JX#RU2%s-CQ zs2!j?x7DEzwK<*S189(AzzdDpf{F%7Om(`v!~Q}$`18JXv-2aRT4(ILr)Nu7b;A1W zBX>m1@I(?uGWFxchZ-UT)6rB)aEA4ky1^3Qo=_J)U&&tE?b7mWZ-iLB>zdHs(C{Rl zECyq;z+EPKFTKBTf?f9_j6(F|VrH5LVLivtATa=wIxBnNbhMAn+zHzK1kWzGLD^ql z+&A8%v;}M-k!svN4juwt4TIZk ziMwJ`@0M+N0P52~IT-L3%0Qx!op$>EqNaglMU9Zq#m6RwEa`>nm5UHbD-w#8*N zvW}ZQKCr&K!IhyPgYu-VE`^p)v+khVew9P;<;NFA-Y*)?NwcY@<731D$I5ra#|RC6h2_gbxz| zheZizzI30PAJgqF?F)Ke&gW6enqntM^18Ru;}=W=CWXyMre6KwYusG!9BVVzvwcNE zQk_q0-ea!2*L?^+68mO>ihbK_XUQ2F3 z3vEB}3`b0D*=0dybm3rn&GCapGJo)NEuJVb`utzz_RPkF2IXkUKcX9g69Ix*n)n20 zK$W(d*ZRduHge0y*j4f>^9<}S7(9-XR4)zc84wQH;cstAtX;t*{OP%{s_WwTDqJlh zg(s82m^=u`XFWuMceSPilqegyvL3&dMoje4sj{2$+ocjritKHut``q52eA+aMTilO z5{nZ4wh`Jt_HaN7lb7DK|0&y;TA8qW6%UwNqU7qo*z3b2CtWmwXU8fwhTkke;9N@I z-xj41gSlCL^;tgsQ5x+j8)AAY!rOK+?t6U^A#>9Kl@f)gf5nmSi0?lzCIT)>0sb-u zDj@qZ%5Y*}FYrJq!eY#Q^NYgjUw7n#haDv>KG}vlzM?sL+eIaY_Gp$HHP%uZU4Zd24Pj1EHA@O(v4=P0oi!p39p(Vzmzt_ms;5Nqcldes}Sn!I`NpH%>H zy1)_gb94hlL+Hd$sn}60->Im&z87nMcggaTNIe69$-C0k5Lx=9(A^>yLV#)=3rPx6 zhqBFIC$J|Rf12V^*mUtVKM_!Pi;q;b;pbb_)jXssh9}5e%$V0`-LYe!yHJiq%5mfc zfJt8zum`~0@@IJPt2O>R5Bs?Ln}qvpu&lC_An7ym)m5F$@V3p1lq0GSdEM(wb0=+e z855xE^JlMbjYUS5aUoi;<64*z`|HsL9Y#KtA6o8K5W)}$6TX1h8v{HpzlvNxv5u(X z_E-?8bwv7rb?Y`+ff1Gv9ZOD!Snz}`s9GgYWi+lEH|%2M(>&Z{3g4lPX|z=_@L2`y zS67VYKB?4G+e*;la73^>B3KX_(t<_Fs2CtrIeUA zEHmOPt&x8Szh<1h5W^GAU@Rn+PC0e~#lIpz@*+r)?pW3HIbj*V^T*l^iAXh332!0o z9*OLz)$uQVNf^FIEobXZnZ{ncDJ!#EVnOaLsA@%V&yQ!fJ&&EdCuJqLAy3K)r#NvD znJyx9?yjOH$%O?!EV1*#&b*>q0A}9rDWaU~QrRJWY*R`LBf{opp_RG8*{Sw66#{|r zEkFvE^5OMdkTxnBGx>w54k(UYoyz=mFWM8As;nz@#-U*f;=FhkpkfRFuC8F`hR3+? zYRhZ`M7}n$>zOov(2dkgeBXI2G4+7{?N43`%-J*xeX?~i_rHj54Q@Q60e^4maICZk zOCeZRn-J>eilulPVd-aJpom%O{(&;>g{qD150+$KcnCp_LhrM z@b{Nf(gyR3hf;LoBu1ur8dqI?1olwOTKOmDHDs|QQqLEVO_>Gm7|(ZKRpFZ3rwmr5 z%emlD%>*xO3bQFV=1!qZ_Mo(TmPuokZU^1wtB?ne{QOwdXWI*S)v4x(0+&uOwa}e6M+15s>Q-gtlemSr2?PsGkWyHg z?CvT5ciXO>ZC?WbK2Op^s;Nc1v)qXzNou>ax8b3dNblU2zU8K;{~|u4#ES=^76#=8xxu=>94jZCiVVjFI!j=Kb{j-YR~;vW5)%)kH$yZ&V5lqIdz##|2EoC-Iz35Rn82{QTpWU_^MtlWEX-4 z7W!ax50n2rs+F&dNEMuHaY0Z+|GVpVQMYDGQ(6(zdpfmm6k0v51=Peg_Vt^$>W&GLbY`$z@g<@H3M}wRg z0t)0-!Y`$cD5jnhyx?4(5;T{SV=u%b-OfGQ!Z5bk?6tkvi@<0;3fT!59|qj$gOyuB zZBvWv!XjT`PTv*k;aHpiL7Qg@zspb1*t@nv`O%%VQ0T}=;qh1^qT{-!8tf>zWhZ=PDTVI0^Eh`LtBFqZyR1e4nQSZnjx z;m?*EtA(RxW=2=-(3^G73W*D$_zAW}%%C``#v!Xpqp~8S%D6w`YhnW1DJL{(t<_%J zOsrzNm$k1fs`r?E5~NfG1kmA}eRW)aX6AqKwIj4jecc>ijHjZ61W0z!El& zsC<`jw|)8!&R6N&&Q)K)aKAYI;*-%tf?WF+w zupP+M@hKHhG=l!aFSY0WMo}^EUh8!csurzvNm;en9f#TMh5xo3+~3+Y*F3c$?z~~f zPF1|)iMtg8)l7&E->#Oz5(pN1tTCs$K&>h>k(zdd3p}#9=RiP%oMr;Id0)X4#+*2R zW38|{d44hGSiKp2{>SAIQFtP3rE#@GW}w}2j7+6v=chheeYA4lOK-c)eXD|R7p_{V zW!7P{@)@Vz-q=rx?HNCldfX`*>)XU&cur}gqYIB$Y*I|U(8Uj5rhc5bYI_1u{lC5d zf3O&gQsKkd;j^JDjXq*)m2P`MXqwRh^7nq<%~;F@yv+q}_f5&}zf-iMKJ|X{ODVRe zeNw)?t)^IXI9Y}h*ammHJCJ!XMs^i&8%Bk;q?CT`} z3ojoa>&12AsVyR)LxBB2LHE)ibNbQ7^slP8^|uSjZ@-rIEw2_8Z)_q^GE8;X!nG1{ zKJ7oUblZhZDX&go-)L$D6B!K8jt7TcPg?zwi)u|Ux27E-%)F4La0A*LKNJlFyKb;Q z>rm27#|lM2Rmk$%je%9{YGi!AQ{{6g=^BTkoSFsfp|4NgEG$Gim$_AWod8st*4m3w zdjX2m{QkTi(zIP^X0TqIrIdad&HA7lt@3#jq9lZ|pzw)C>Vtv+Fx|WnX@>~kQ3?J) z%=D3B;JFflWqD%&!0-Rnv@PxYw{8UrH;1Hp0d-Fd;M&b+j$>A2A~CD=mM?(-8=O)WK6I${2u)5Mb=A;08xTR^xkhc$iR? zK6d)kmKFZ=Mg3};b$jav=aB@&D%0Cn|49UF|5H-4WVzW-vtf(oELiKD~8&tn@w-dAUEAF969yAN-?V>MTwC zvaJ$DrHB4S38@kw5OS2qtg!{T{!mF!0Ff4yW1nNOi0@cMr&lI4{bWhLPQPXE}~AS%$u1>*ceQGjvqa03c%?;RLZ2W6!nb3kEm@q-e!%- z&fSAiL{d(#rV|&wRUe+Y6Z*^P#t$F?@SW;Bplc_H$EGzGgDQLQ{TO!o<-_Dz=B7?T z?@26`Mhhi?Hvs^s1vwNB89g!uNaS{i11!tRVA*n92RtgW1K-C;aPr1R3-N`B1C6pN z0l_MSJNujgS(ArKbb*KjZX~Bib(}C`#&DN3FeVAczu94FecCsG^@&?Zl`v7K`M9(x zu}D3h;pvM4OxZoQYwCcGT)8P(vf!hipoPl>hUK#r0N6@dXeVI;|9(?n_rG;Q05SKk zZIl}-52T?ehkl~FE0NXQgP@NS6QJlW=(^eEcm=ZC`DEY@qvVUTOPmtgghZ-&HDn8) z)aIcU%P|u{1#ky>EwdX-ZR5oQt-Ap+CwIS<$Xa}&H`l12qaGBtU}@NbK0y1@DW2l( z&EdfvQkBrnE+SK``xToX<_3}aQ?)m8cR=4lUjvvCfI-p#ahtVym|aGJDu&BZMsc%e zUy*XgPf3k`5J#Y8v=Rjurru)9+DcJ#Hv+VUm|vdlliEo=7cyVXvzVQ`61~&Du4k2!h~iz`h#C|zHnYi53cN( z>%}v2%;kqWXPBEh1@0>8N=b|Er_ri5fkeAUdnzPA+lt281{uTpgd~-JGoWkp(7zl4 zRqEJjx2a`}kSf8T*rzBKzaPP+5TC_jaD9+S)gaI%x(kPJ>)g%v+c~)KF2*3NB?~1{t)w?jbvH{ z1{{e6r|bEcetJ~J^N#bYs}Zxw_^oOhw7Iz_NdmGM5~=3&@2`izgS*0S(y3{v)1TGU zQhMvIAUM4DyC0rDmezGlB<+`;Q8R zJu2dc+OZ!BcpzO@q;4gJxI4o(7z>v+$b8I-6;PTrwGunPBVENMpCiS0D(XDb7SL$^ zHy~zv*LnvJc?#Cyp=8KiL`_}#hhxX0LsXdMwxEBakH1kXa4g*u^cLD6mHbkvTxuu?gXpvqGqwy5MW?_=wuZw3^)M z)@fL{^I|LisjLdXV2loEB+`zl+=nsZGaSa7n1NEM=U&wq+Ur=R2c_qKZ6P`4wbusa=HR&~fQ1ovfURnUj{ z(Gd6TD+aPWBvQx;o+kfgYgW; zsO}GMfctJeP;kiSn=%@Zbk9Sekn(I0bD`hOa3=MDzWZ1(xbe8dXu5Zc3AWBzxbx61 z%%vwk5xMYC0OTAMw&jDxnB~urW&8ZGR?k3dNZbQT(}^Qokj2Q@1G^h49|z`SjN;_I zr{(dTf?OU5{7nLCfFR1BSqGE~#m+b*_+t&hAl~KxTkJZf) zyGk)nT&F+3Mt^?ogyD?m(%ULj-EwHZU=|re%pq9+LP+50k4z02K8QaEf?tzCflIRt zlpnHcr5lA2J_#t59phmTXO@k3Zvy zIo|o)>I)E_aQIZ1AocVxIqa{mCoqR*LAqFCz42{oN-Fvj=dLC8U^X1xjI0p5Dz0?TEv3gJtFj4k?h0X z0@~I>nDmn>OudMo_9+ziAQFRtOf`IdJ6X743@*%{sT71RL(I?JO-QZ`qro39E^~vc z4}J%zP(N8Th_LQNu4xU{jlAV7C?l!Y3q%hatY?*b;pu2wKA6WI;0b+USgQ#fF?G>a zg?T>BrWm~a=?Ed9rE;h8zZLBPS=l${D2ZwcbJLZ8FImWq4-h&p@IhmCu*6hZ>e56M z%(pLk*zhT;?pJ94Ydb(9kw`rfAh8eTR+lH0GChAsCS<69Y5^jl(}D{W9D|OGkjIZ3 z;K@zruhaWODd|OOJ8#sMY;@ln;5t`#i9jF_4$FY*jKxgnpT3_VYK0)Q>EO&iJrpVj zFajgwsTOWjenYq1r#zoV2vCKg$_#ub331LJ_cBw2!@bM`6-Va&(u;Mlxl zTz;w+J1MloW&ZBxTgU1s(55@C)9Jb}J=F2?}+^veiG;1fI(W(O2^|>P1 zg3#?xm<#>(Xh<>Wq3nBx(Nfo<>7`qs^Xc)hgP7N9;UrSe1G(HyT7?fT&KO-O6v%D@ zFk>{p6kyZ(T@58BaAm1MtszD;cCh8zU{=nTBz*$S+I9`y6&uS72!sh7czqk(boYxE z!;-gBm2*V^pnnPq+tgsj7_FRY;WD>+hEmd(z zSbi5b7xunf-YJ7*kqNdD<5?t0aB=U(J(~YRohB8t6x4NWYcuO)!krW(j|^%@W{y;$ zQd`a+{9w6tmQ*umUlfq_H7^}+Yk{a7FQX+n&O|*B{Nk{c_EI;B~| z+VVFiS*uU^sVA>Uc0zttR7u+j71`Z=-qVP*oic%IMCjdms`;|v7M)iTj1fQG`lfK0 z3H#H)ifCBNy$0F)szJLMSLa@FlSjZVCffbWB5FIx(v?3Q({g1p@i7lF<&YuTCW)d5 zc)n>r4)V{7AUM?XKJ@Q|9jr4|o-WBU=Q>)@#WMXA#1_**Byq#&}BZ z)F#c}`uTd%&ushP$S^a>WVF3*@AB)dy4d|11UfHMx9~XFFDK`xr4_IGA^F~(wDW~U)B7OA7Ws)uNVmOY$K(ecm8?n;*3$(KY9Gp z1StN8sMozjm`9M-e;%nzv|qSpp~U5Ai(8idTVZ1w+4d$H5j1IIk$iCI;T`K)W4{nn z#Pf-mIF#1zDmUX$;t1W|lq@loa;RE_WyEgP8w|Ul7{#z!SVgFX^6K;1>a{EtuoOVd z*(Y9%!nX#yJVWK_IYRmhy}0ShElb;$E>#?g&(FA<^Jfv!GWj;AhphyFv=GSOE#VHR zG+_Y<6aATY_&?a}!?6^4aelw&PNfI`-ED~>+!vp7EkwK#YjXil?d9EnoVduho{`aj zly(+N%stNOOYhOx?B|+w4C=J9~5kz9-XGq{UXFKNn^MF+`Ds?P_BS=o7!5<&4 zY3bF&>wU5c`y6KDh5;W@)Y5r`^xia{L;D4%T;}VEg#-uJb+rgLv`=Y)gr9o(r~@&+>Q_<|M+(9e^qP##ES3m;bI`ZlkXRvO3I1OzOK0tA1YL&W+2UfE(4m8X`i??UD5B z*2`=EKa?Clo{7y-5_^Z*g^|UQa+GdR8^RthjUZqrECjuFgf16>g>n&=N5hX|b4d&2 zk6RFZX8l{vMh~J`wV@IJfYJ#-t{p5fQg$=Z1lE}nC{Mf?W!_=}KT4VQrqTlCF?eE=pFNCOx9LnKplxq@G2F@GXH900Mvgf~ zh?cI$`kHO$)|a61jMfmFeHUGCU46}PxNR;eAR889=l(i|>c4~r@+380_Yv|jD0}`2 z!n-eh=KcqT4|qcgM;~#ZaF6LF`li~aH_hUOHrn^jXl?Yn3|h!^%KW6UGE9dIBu_`X zZ#82ih%b&fx1MJHX+>FL47@u_b;FdNZY)N#eeg2QkKPRMyJs;yxv0!`5wLfKFCCG5 zop|PfJ{(=Pg<@>9XD;_d_GPPqpt}|dm?hR!gt*H_;0Er9GjIH)6JTNX4ek1LaFGzDWgtk4=8`<9@KGvwoU9v0-8|af3-2a6OoRa7q7fM;=rgj(GW414? zWsOenX2}Be`66EWS0Tw=ToW9MIW)lbtwOa1C;$3PF0h9-7h=7vcD>{+M!o6P+4zG_ zX1#Ct+odl-TV0=5i+-us+D@T^kDqh5qu*thg-5)r@moZ>i-`pv@l*xmxfL$mjGf(@ zy^LKXZZj-_&Ida0i?m9D;qfmAWk90Qx(5=Mr=2kt_Qj~thx?x4s3K+tcq>J1{Pg0$ zjBMC%`-okb?-H=53mR!9OY){;B~PQe3fYm3?^QrZzk;z9oD6 zwOrtx^SSGFhD>=n+$^lP|v%@ny*X%rR&MKv~O9k^T7SnH^BGbEneEMX@bXJHB?~`Q3q-pF#o1tP zI0Y{|`fkW*5B%ImOgmDT@UN3TI$FCW_aVD^0>}WD$k3CY43XM|jx9V6Ngg7P7~H@|gw<^jCOtFewG|D>$M_kx~OP8+XGV*OJpT~=93teK2ZolGQQ4j#cC%HdRpW)~Z zTef`LmxV}MRxH5h9U|WeQqAYR`atRSbGT^6wBvDV(x~ICRU=QOHiqQJ|X@Et=0s5d#=JfzqRT7)}|MR&roZBlh-A~ben~Z zDGzFjMNvG_n+P&TaoK}ERiIYa5gbU~+JKCHk#vI~a2XA?I6_BMg&d*pKOLcn-z^at zF-%7OO=M6F8Bp-Q$>(}aO+sZOt{EizvyG7NKFGn@IOsJGYUegycVVp=JNQ#_M$@fX zY3@Cg;+hG~cTF&|--6xxLb(~>NMh!Olr|b>j0#=?y~QB<)l1(}l!N)E)}XkPFN%TD zVvP&+BV7e_KJ~hQ;QqA-WjcwO8>{7F9*C5`27s*!bxhj5zWK!1IaP}?Cn3yPZF`rO z3V}%*Nm?5_U(OuaM@d>adO2s{M--8y8@*pWuJaSymCe4^QhSV~yCeq+qu|+oH=SZ` z)XoRI?)9c)-)WAJEc>VMSEup6G`z*51!cr+kumc^bPDYmnz^J2H*0btGf*B=;0U?b z6;*LPc3$nmP3KRAsUQsZIs412?0bl@Dr4;YQ_bzE04oSEMFA;CPZZESRG3Gu+o(Vv z3q^<*cX!%>q=dl6AN6=bCO^_0{Gkj;Ia`C1PX|GJEZGlp1UN~T`L9&8TnhkYH$(nY z)(z~AYaUUG(VjSwb;FPhK_LvGlOP<$m3R#3e??Jg{;&yvuDhyGub&mdIGO9GwKrK- zi?ALx&U;*=q#=sDpuPc@I)iNV0bsVejqC)dN`NQGqyTVH1^!$NPDlURlkkAj6gKoB z)lY?b^kxv-m(7bD(rP=-zjp^hsk#2%TBfAG#69oX$!iv}NFeyj!D7ar?2CaO4=P07 zry57!{bkB1;>%vEoBBeuPX+bmg8$CBO=MZ6zz(WDU671eLW7(l>*y3ReRJTGGG^LV zg}QrCan5(`b`^1-6tZQ7+uQyYbJpE@(JfvqHw_}6<I2^4`n}31qb6Gr-2JL$U{L}g_s`!PVjdyJy9|L_bpi*j`g1Hw-KU%_+ZKV_FA?V*A4~|S)mcXgj~%LVU_s5Nt#gx!%Jz8Bcv-mD8tcKgGjlRL4U2InlJl4DMW-i z)H&U32fuv)d^bv}njR`yVmfdBKI=nuLp%{()PD7#ru9!pq!9nOSqfx(ad}o3iqLiT z`F$y|16oaXaMGE3OWzf*&eHG}64quOZW&10Fw9@A->T6ZMx+Z*MyV;he3BwW-!+pu zBl!E0BNVaf5h*sLgHQ47`RRC%A&0cNWFS(I#2z%zL9&eLTvl{NQ}R$@6#Vupm02Ug zbbC?^e8cTVEZyj>u`BC&fTz zq;%-zh#Hb0ckB90w&Rd6Fx{CZ5D1wc7C`Gi`Pahh#6l;ZsxZq$5Q{`^Cbcil4t80e zVPmq|r)hW#VfClaaWG@_gGv_-HbcOxUqkjekrVGp05nIzxpr{v$Ib6gM?Zg=JE$;# zo4%^Grl>s?yql44UixW|4yTnTbAmhj_s^m+kR7%4I}YjOUA4gy3rygdDER-BYpbxw zxn*g^7-5Th3q8t0C_<;JTB2D4w(Bo@@O{@e=47u0f|)!D81XY)4(9q-yNZD5b&Pty z++9BvW=G?O*fq*m9F=0R5_~!53kOYJ@&|#gzie)JSRi42Yo{P*Wjg>PX^l)2riMr# z5LW$yhVHd@i8Z`E-W>TOsgZ9aD0o|%Lh-XRNUtw0HLVTl`t0!r=@6CXzug3UMnm;2 z=hIjYh>(5#pOBrgG>l4mmaZ7>nXtKDc15RgGM*t=^syC6EkeTz0X}@AFt5-Jq^ssH z^?w5VC}=@+t;N9dg|l45wB6}kRGNR#BgjIL-Jy#~Ei#2)I{-gan4z`Z^zNQL>(a7p51Ml`bdr(eDRbtG1r-%OJdD^Ul> z?V}H?07v9ge=LzodQy+0YvcXo9&w{qc&ku#Grj%Md7VGwiD{eeZ%?UmMCzfq6x0mr>iNHJvi^ybh#wCmFV7JrJwI83#Vn?r44=TfNH~)_O8@i>5&YY!EcAUVzsnSHs zIKkfeUVZ^Z7aOtlA4Oo3^tBxjf?NKVfZj1^tQh))xpMIzWEstJxw$G5-MJ$MVb zwv?Ha(wFVVaB~LIcp~LAZvxrQi4<;o)$sn@&0FJvM21>crRWAb>3)d zW$)sk9ZA9Ag(nvii8X1IIn9661VBgZt5A8eEs{#NKZV!>qqAJ8-=D1~4b0drQGUe} z(=OjLxAoWT=A8Rl_U)WwE0MW7kd7}wrjSz(=}eW|2yr%KWd!4(wlXAznp8@%d4A z@7K2@62Jj4|sGV zj6^l+*fn~Q^E}$<5BTLX;@(`NV|Z8v$)|8^SrOvCoY1i-OOa1~#DhBYM1-37-W_qu#JcUYVFVBn*MbKM~HE? z<~*5N^=TMkO=ff&w(Je!G8S0H~mN`g8OI@E1sx3WO6j8*NdZv zex5k`vx~)#Xfat7HpN^6?})c*%cTb9?8Pmo!`MBOo6sc|b?1WnNelnVvi zKoAX^x)`YgA}OQ>xl{2;Tv=Vc3bR0jem!E$aUe0T6FKAy%AS)_;|P-S%t(48ck_}U ziQ(MrZxr}ki&&(K4uxps$1`<{=4LF#YFu{K;>1doI0ZB6|kG-}-s! z)iNwH)?6HU$|eq$UM>bolV0);2Lr262VaLqt|w;?2a_0A$<}5b8Jv*&S)V-^>-LI0 z-Niuz8?`l5UP+G#eOIvw{A>Ieq;LmSH=`FJXlQ|aS627GF(ICV7*Vn$Mw=g8X15`s z@P-SBKSK)c2QTdrvHHA5glSPGl3m~b+QaCtyd|cS;O_2OTFQCSr+|6ZVJ^88C0>cN zPDr|idy2u^1uFB^OSjj0dAq;a!2|2dfyUB2s7*4b`U3dwvlh0{XgvGKrpkZ+9*>O_ zw&h60oLuv=A`#*~zsJ|;N=R~X8b51)7VBgTT~$Em;qHGTK1PACTv#)j^=+QR%z35& zdqffG_FTsVY8+8jkiF2q6;T&szcj)&Iu1?K@G`FTk7IHMMv!=S(27zUuwCltQbUBv z-jx+Ky+DNGq|f9bO{>NGB8V-fcb1E&JM`b^5DxWf+oBKz$R`4-2EJ?%Q_*mY z%kOa}51E5KErw4~e)b?|>lw~yC*Y z*OGN53NLdCu?hYCZn_Vd$%?D2A-dAD&;&kS3|c;Jem_rT-VGrV9U;c3oyfXu$k8|i zC17*221zG~N~1i0z-vcHTGTqZR+7`UdA@?ud%l@vF|e+Q{CC%ki%6H#pN{irI%73~ zA%EvoKb=ow{{hRuH^f^!GNRCfD~mWKlN|O(>Bn87ZrZyh&=+t8SqqR^h8zc4N$CG? z*C5qdukUi7=kJ5b9?_$oUZtf?i8@;dh#j8x^*J9?70KAse8B1%DzDwOyLJL;gGKAO zOyJ1B?O^sVmyJC>gGfoG^sKebVtBlCyy|L88kfn`U+zht`w?L1EOp_Zse4lYEZ0dQdXgt4x)*FBT+5ckew{;px`wFDv=egs z$m0e_M#gNx4PL0-xw?B*ZOh8{mXp^H2rx#keh|Or?SoVleQ(c{e^W&|TLkYoa8ZTn zXAl3HI1cGc9!fb_t<7Hf(lBu&{6Mv@cqieew-4zu2Pxuix(hPbzH-b*8y-*)$c2wP z>cRt(HXk@09qbYdBBF}`V3lsD4a~paSMe4>@Ye@Bzd0bOP-FTTzI;Q?4fu((3BOkF zFcid5OCci6u%U9Nf9gX!`K3hwk*+uXx{AH9cf(v--8m;WzqiLk^#Fp8dM~fk;kxW# zb$%d@!4qudm|si4l}9b-k0E!ipVr=03~n5N8rTmbX3L8kjw3gIVsXd+fTQm@>TiUf z6tg*a_^c{K$5WA!KKf@Id1P+|5JmcATScPo`KvJ5YZGjxyLW$m^~>3s-|KTruBH$u1IgY|IXpZz|t|6y`{4L~#H&eWh`EuSZ9*`$&)`^|pu+3T)w{+?J5V(LdvY*11m|BsSn4C@ z{pkb*L~G-#P=Lvvde%6d6@GpCBwj`?#z!p1ryXrfdpfWfP!`)P2@X#5(eHbCxoaA- zI|}1L?SY8PfM=d>>a=pP<8rvLzx7n6R9(wi$@boo*=>85rvA`A_#q|ze*T#MJaG39 z1>3#Pdu$kNS(|&-u`%1Yz9eSk-y!yQ%-G-m=@+|m0|$l?Tw9pkaF#z@5gds1b$+M` zuwIfyJZlPg2Lr(m{2z{MO}^NG(MPF0NfBWV<^!y}x6t;-6A}p#wHaVAB||GXEob0r z5SEB|aalq9lqRakdcpS3_|N!P*$TpX~j$Q!~FXzFNsiF2l2#Kzec_9!tp-{jltE8~OXdyE>Bvx*G* zMgnrP^oCxsOVnN{)lDV_a5+47gsy6Q46%pTPjfBRvj6Ul)HqEEl9SUl;fN?h9^md5 z{k(bUxuq`vL;}J7j$8)?Yqg~7SL&f_^u@k2mrR{xt{%)(NMY_+>l2(^4yj>BbZ4^| z#{&!PK-1$b0vM-5H^O^GSn{M zK4#(tpKiS`{v<)zn6)cp$m@sJpRP>Ee{*8jz>Si~*Jsv8{tBkuUhH`qVUZNTReer{ z8YWl_sw73i+7|2PJ7n3pSt~D&^0ovWChAIZhQl3D&GiNi9$)KiI!YR|h&jJ+YVUg& zw6v4kS_G&*+?V4%Z1yvAPmja?>;7^xkM6AOam-Wzcpu@QOJf_oYi3$5orZk|snbsS zKXzqZ4pk;FP02r`Z(AqRl}s|kgP|I^9CGh7`p=cExpos~wW&c<#A9h*b#F@^lrF6f ztgB>&b~Lhk$fHvo`^#3;wrZ{zw(eoC`#0MK->~q%;BsPpQ(uuvs*B<4m~#6Qm=JWf z3y48&-=EFjr7~vWvd9=6?f)qAj&&lf{X@(Jb#*VYV#-Jd<=&#!r{Qvnh48hBLAOJN za&Yte8q;Sd?+6Co_pNPk>zLklHgwKbO>0R=XTN>2qqbtR++wfsy~K#vzO!wCw8@9* z*g75z?}q|Aq6Uq8C&=G~N+=fO3TQ7E_de>y;KtYn2So&w9Di*rdt$qVMRDetzX#vJ zS?jSzK~rDWrr7HPhm%(4+{p~dY~10P0+d&ZCv0nUxld1SdgJbBzCh3MRwE;7`j4is zSM*j3Qhc^N`F8p2MdF0?^+ni+J&c0yEo;#HJ-O7m0Z*UlY(+&(L7Mip)q6>ISKTGm z12wKoxODU-q)Y&M9a-3wkLfA^0*t87CPazq13U1jgQkG)Ho_zuVh(3& z5`%W0j+c4ow$-nn^`J&vE2B9*@J;kyqwZd`VOuxcSqNuaT`6@+b$nxbumayqwU7&1 zcpwT4S0nPX1lD8xMc# z5(ae%@97DHhpl4zzO^I6n72DmALvm3`rs$~-ABDOJuL@^`na=bJ zS`}_@9TvZwRkfL)r?2+Tnnxk_a%q=<3Lb#p^Bl6dduWJZ&0eX!pXrgxGidmE+RCkZ zq{GWPGR3BH?%aSsQ3xHY^3Dqo1m4O5%Cl9k3?7R_&KV4U<`C*Bl)=zG{HCes9nQtp zt4Pq(QJYyhJxGE~yCnhLSNA@N0Lf$IPZbm1E@?<~;kcif<5LjT-c zD7cR0m;Jy0?d0iyJfG&CZRZI-aPUp%y=N3M(A`}Y#Ct|*@Djx^BbxMWzKL#H44X## z^)c4b7=o2Rdvb$%Mw~!$Z_tzz68fBnaB_PdbA#~yu=TjDRc!zIAX2*BOvgk~UiR;b z$mtn32_jzq^m7R?xLoPEDg0Lds^65{bCaNMMyEfIT?U@+UNkIA^gz4Pv1$h4eaRN;=xK~1RkNvY#{yGCNN%FG;Og- zB;Ju%kIqKeM(5GF#NBC+kIv?~Yoi|T=FBB~HUfIu|Ajp}`Iq8*5*1a+Y-<`%|SPjSpGEU`+io7y-Y5)p1#SJ8sIc>qUsK2u6(<*oD3QL=6~#J24P=?l@dsJlz;&)9Gc)K(P_fXjU%HNU+J?mS2Ct zjl_IO-k+}SG}z0(0Vy+FmL1M9v{xX1JVcjXN+srPf-d4Wy!CwF&O(!->C zj~4mSuE0H}v%sZ%Nf3%(L@@yRe7EGSc(s z&n@d(>|Y;j<5~7sdr5tQ&|5_CO}VL55$snYtXpBk=ve`)SbW2K4Cdtw4Z^3UgnhK0 zqYB{XbjcFVF_y>rUR0f8>T!q}Knx%lMxam zhTJbEIy-V#m`%p6g}ZY(cZZKR^jw^b`z+t({IgrTesBA*rjFopQU2u7U(`&mZD|9E zUZyu|r)!ft5`KwPK_1_ITMWB;UhJ8V0gG$bU+blefE*VP0|Q%xnx?M49wCvn6x||z zUdT6(&R9*hbiNo4=lQntE!;XWHIXg?;U{cPqz*4MhfyMjLDP2>KqG-0S25^9xhat*lQ69b{9PV`>+ z0obH(V|BbTKK#o)CVN#IMtfl#A+Pv|Ol|@|v(dIcUDSFWmOS^lmhG-eIt2%Sfz`jXVOI z^ds0dy5==Y-#LY;yD+dwe2RU?eaKzOrTQq;tssLIQ6NRO^pP~5Wnu%=Tp*fFH=nsW zprq+#nA5{j3h4Hdav|n11M%lCa9?ndinUR>Y2O=^vMZ&Ktbp3=&YsWH+fPLu%`Z!S z`Rf$NoCp{&?M8qdNgrM<^-C5R5EG!(UN2NRVcK)A(%1T+WVob91-R182{1Mu+z|j4 zbCD31>Zex>FDd(FSe)zUKR#SOTAumvNOI34oVm#oi-X=kG_-&A_tPc3mn$gJ^fhkc1ki8?0vPVVy(cciVNf8M6?Q)p~ z>+)5ra_?alWO+wuH1Co`EfvX?S1Sn1f9qlj-Gq+=$m~W7c)+#piyEd z0>M>8=443V`JED9yqZ|=x8Z8Lm)WMnO?%p&rXCPMuN>*8AzR~1zufyJ#0&6b3rD9X zB2^2y%OG#QBRFE9ewbD}4_;vaTG+9XVqOwVOb!rDb8wU&AQ z)*0@oUBiG^&j9V==xCRuEc++-HE-;ZE*V?We@^K4)J(S!Fi2|Gy5#RPcS%JW_l9mj z;(p2-cs;z<${idtP;!<_bE%xCIg=4%t&g|$2&`0Kwf77jJv+oWqKDIA8_}~ zTk6@?`(Gw#Z1o8RPt(Nz>G>E`+eDw$*g=WuaId4RuZm;0iir2U%3BKSx68TEKIaOt zzHYlpyKP_vB{aY%W2U7SPvcj@V3wzc4Qx+v4)40ayXNl8o@GA|pX(|SfKGl}^vf^C^5H<8tkDLT`F*FKLcMe~tZ zqlnbi9xa8zIl{Sf0h#Z+szWv(2a^hf8kaY3ca{WGA8AtUJSgy_qzar}TWfQV2@tfm z@z@`6j<@5`lp390Be*D7+7UITAXtBPb_mN>w>abi&I6y3r9|I*EQr$g~p_4Rnoif zb^x>H9B9-5?lK`*qtr`z_P_;=USFnR(MG?dhh$su=YE{xW^Bm;T|PGlGa*HIzm-^j z9oI&n!0k6YPf_Jk9dG}cl4|pM)|g0Kcu4MozDm0F0<(bp*9$A#buu(pcPcWVrl8<QK%B`c)elBV5{iCYLds#E#OzV9qy4jyLb zCa#%2ehI-|AW4I}UBJeI)?Ac)A~ok-?Kh$kIzW3h=d{EJ<|N1^znZ+9cZ0bcayarw z;5_5_!0{#yx3iBqv2oUxq_Tr2fM=Hou%^}I7tWsE>ZFJDR7N~M!^UVVzus=fVoK*9 z#=#TvAbbpEX+BauH9fD?bkck{B+EeU@0l$|C*bn^kuNhf{`g=)2QfC;_4b5ik)?oW z{2UzRVn**a`nhL54T7D10pv!~^19b+WBu7>_@N2IO(B_a`=!^-iBIVId}mGIr>1(oiV4*B*LrX5%)LdTrG|MI}^fJ5_h~_iA@v7&g`JK>H|K zJ=B3`j(P4XVo(ggF&9m`)NelmJG*ZLz?{28!xBqKHJNrnUSiKm{20juKt=O7N@V1* zEXds`F2=91g&t3>S9V+cLYuWQ<*AsP)F@YaxxgmBfTI0RFu2rS=8}1gIhQ@W`g%3} zca~A_=dQ@Fas~~Zlmrnt1Cil{Dr0vGAni@oG%}V#4%H(fXd2b)v=R?9ElTIEhaqJY zJ#c;BdKXCtMX`cH^_w{9hUKtChX13lz*X{0NI(&|4lB0#?y#{ai%gO8uIlVxdoe0y zT%DYr9m#3jMee9R;wwF9QV-@2UcW`jc6gIW$=uN#nrF{hdDin2)_v%fpuKc#*~n|z zzAR)wbc#((N|Bsz-do0dP>5a)x=Lm4kppg8jk7f5LQk_v9ubmasY?&vY4q`H*A6bP=}&&|bohbawA z`GN>=+Y1s|V#ib(bcyl+Ex^5(#?!YR9``?@Ei_;aS$;)8|v92*8T7s9$N7z$PGh<(89TYAWL@BSSi zWMlFYLXD1F2%2CY8%3LWlnzg7=hnSnIm&S%kHa=ULd*I_{6XT4a)jVn!1RcApCG87 zF|(5&mAb!mBJo6vN)rcCIYE@CPu70da!K+Jhi(;-iU~(IkGKqzT;HCzFA>^3@NP3o zaLFQAPbuu?Q<@GxCbQd$u=FtXROWQ#=SU{*=G;TuhPLXI z2CLN0pnWn*D7ZP(LHm?cP1zH{>A0R|)n03riPy4S+TClvKyxnpx*=j1%9j&+PeJea z3E=rv8yJcpdq$!8dgz$|E?HhE(*w_VbeP4KVTxueM)}qx*=#_9?#Ztp)9amHQ=x=9 zo85kr{2Kwt=~$7B0m;(I4c?d8WV;-?x4Cz0`rW15-JTGe9R3gjZ2_9uRVulO_Fi zCg?a3lT)6XqSjh3n;(0_gOa&g*T-#jX9>l}eh2Pq5HezMCKOpkR0OiSg7 zyuHwb(N8vZpONs~2=|z9wN@K0dnIO(lK4gMZFbf5@GrZpvHTi`PU7PKhxxHrpoYcR zS`+?vn~`}m-j_1yTLcWbu`4noB_p2Z+Wlf^Lp9H%P@eSIn-PFR3nWSsvLFuWRJmwi z+yePDx-f?ZW_4Ow;Q6|mcI@)uy7H1kaUnV3JcOj|9Y@8B>_?F~y{V)e>Co8-6yb2c z=h@XiLFOKyz{;ZLzLXlzYnZaZGi6iPw8hzEO-D6ZpDJ3yW|LqwTs^)p@EwH(WO35~ zS#xL=F1naL`sm%h*eD?AQBXnREjpP&?uYl|l-ZdhoSmZY^Y&gM<+c@8izdawOLPu) znZ@J#mPp5qdydi;d*8TEm4MrAAY<`UP7e()qMNi!YQ(5>Tt=n&2g|A4M8LY>70K1b zckB#2lR^w+E{Op7HNdZ80I@GlV+P333KyY{QzHNi*k1DkNV>rpo1tvIlNdke4EVMD zv;vLN;NYwXOv5c=t*J)vjMjXB9JQaCoh*bG6m8?5NTu{eS&||~S6}oyNA+LBsp$3d zy6?hzil6I~30Hc7uU@w_>H0gIq_8H&UJ$9QwWu+g{;`v0HC1){z*nw)IpVRCl3EmPPhrnt*( zVghUx#f?2Ga5F0CHPczg4=~$+T@i?b^0*7>GB{9oPUiP%_IcR>sT-hIM z!6e))!LU=NAf6?nQ@$miBXuEXdy^JCxzuMnZ%oC_%)D!4Mh~@T#K$ETlF7UF-F1d_ zq}+hK@#_^y{Dq)Lv12BC?=J>qT4g>=(H??oXTxL zjEfIhFt|k{IB~wHg)Zt$lWxa^c2Q2Zt2j>qYBrjW2CR$^WGq-qtJ7ke?>XtvJ-^GJ z`|+i+28Xrmmc@t9A{OU+5V4hBhf8<#TZIn3#ozSw`|FqeX?%ZKoS@vYOzMe?ZSMny z^x%;cj_k{n@~9{WnFv`Q*vJpJqNmIsKwy=y=JX-i3>C(rjh-ri*bC5fXN-#=`n1uA z&oWq@qTCMBOP#xIhc&I7%@Ro_J4|$MO*AQ!8{X3P@Lxuo2Iao&Q?cky;Q@FMSP;DM z1M_4}1Z7^wf`{{rTT-w(5%?r(X41kb7QEdDpi}QN$?!v!Z^DEpg_#l<`+-^6usERQ zDNTVs%awBu&b&B;P3ucd{#jvM2YDc;cU2>VNV^ZFFmB!rxJ<2vH-8hG2B02lK14S` zZTQoDmpM8<0XREk=|FM5nm-7s4E-na9`L z1O~~bhIr)l$sdI+^Jx%3y@MUVS)nN-oFru7mL^?k^nexcK!uJ8Ic_RB$jxYzUvv@2 zj+5YK2mPOxD}UOrD>?oaC77_2D)yd2@mAQmz_iJY58(dGot#?3a+gtCMLa4!Dc^r_pDR8DDJ*Fb}q2AT{xTXQ0ZzIYA=c^IRJ?{y{X@|-Kx9#*Ix8* zMkcTs?>G%#-?&0Hr8M&N24+Yh6mr)1_=)@GSxBU<=OH-)z+FSTM~Cb2)D_7+w!{g) zg~KC#m0X6;h#dF!rPLq%=<%I3rxGC*{x&ep!}nXPhR>c(_4rx|?ph1HfTc*S9iCCk z*)wdYPF#KuYDY=}QCH}=`Ji8eqR=#|%QTdVo|VaXE0&OVTk?M8%Eeb4@64BZvn`nN z+MJ>pZQ4ifpzMZz+ zLK~<;VR;HQR1t=cnK}?M(6-E>&+Pdtrza)yiXuGal75f8H~WZ`P0IV+kFSo8J|W{2 zZ%p6?jz7mYJ-+#WO&w}M1Xp|XPVzXG`~1R@0Ws!ct$GD4_#QbohCwJ=GOQ5t)xu-9 zgOVE$Rp>Mo`TI+~qR^%5iZ}T^ze>)enoheQvj~6rYOSb-G3A@?a$)R|drsn*8FCFr z1L62v{B(KpQ(p3Op9^Eoa|WYt<8UP-Po${3%`4 zNPNcu(?d>uFQ={^y@6LCoGbL?U`*aTrbwbyF9b~8H!1%TxNQpqCul)xPN-g>xssm^ zw#=bN3|JZJV+K62ZU=2OLLyjCO@wXb_pCh?k;izssxRE*0Wo-q7rm}R8X-%hk?TQ! z^3JdL0QFd$P2*^B?0t%ydu3;7T-4|ft#0PZdSiUTl;=3AeIE3*XU3jmf~?J<9jzzX zCMfdN8#cz@qYE{_!Ubf6%Zl#RZbY`rm7z|ARJXtFhhAioUT1Y`qyOgP;gIR3&;$C8 zB|f@eZUAWu@rxSCKyF3cr;;PZ=a1Q+io{3M<3_ zcJwO6i}EECGIVB|iZF!#=6?Nl@vBgbro?mS2SafY7UsF)u=C8#b#nefnIhzY%GU+3 zTGD)wEoqA+pUV7*I=1a)9e`E^e5ivT@?y2J$Q1T*yj+#4$m47am}a%Hwdts0SRrt| zaU+ca!zxT7!0i?YBR4A(eD(FR_`frA&o8zex(;>TcsjpSgw*UH_a zkmM|bIa@N24hYjg?gg(e>%H&@ZM$!?mEFO0*hsDQBuye{R#%{LG?ZAro8BbBCgK{O zF?elZSku9h)$%J5tHA}{0YH4EpG~g`nKeNS@fbwKR_*LexuEM!MUobO%>@G0G4fz>v+v%q>A2MViMk z=j=?Y&-{J`n~C>S7N(M(r!Y|8yY{F>KlR4@2+F3x$7IJndMb3NP+^@iW@z3Krqfh} zrR!9RBKD;q3zCqQIkYorLaahtQ&G5-o%Ot|=I-4@UWKH#$nwm&{|;7;-~o*j1X4e& z;dk5pyWdW4XyqdYv^fdu&`(>t-J>E>5oEYyGc>KK7>i7CsxpLu;u7T8>s7!5eRlSB z=~)&mk`xh=9crzOyWFpfyDr1Rd|As5p44`0NRF*6EoyZA#oOwx{?!-#Kk`HW>#cD| zEx6t!4ds;wXlzTIr^KbcKM(#W%$eCg$m5`}bfzLWPgPZCf2X!vyo=?4TZ`KrVqX!N z8|XiG1`_E7Y1c+~eGQeu0vyQ{a#dPlu_Oys5!oAe>{b<7!pl8QVJ}x}r4Ygw2_ehN z`l;ltad_IPDzmbL0du}IlCcXpdi(a><=m=xxr(aJewTPV@z`fsumu;Hx+E3zyD3)M zyNgXd^Wcg-GxkFSu-&^aUYy1(bCW}O=vK2@ehnZPqzu#Sc>v+tWS>RI8L);t`xR6B zW$t34iTFJqM+FT07yaIn5v(t*GpO%a!*=`RQb*(||9K)wMysR1{`Aq2IkHO{b^p+yBN(wt= z7_XJB0xEz)-Ewj6-4iwph^6!cfiiXg=ZUog(!Ub#q0ORz^4*{|yXUHObn+&+^Ek%y zVxG`>K(isQc|NO1B6#Xa+FIkBqIA&KG&0=vv?H{?0yzR~Q3pQ;mnn?$mTEw>c_l6l z*^oQYrjc)skRa!<2xZAJMeo9bB3&3Lv$&`7>}7O4l;N@pKYK2m;X-~!iN#(P*OVFS znT<#aBzkxD*A7cxZ`v#Gh($G~#Qni)6Cz5Eu)ePzy7st$#S$;)?kM70Yq+CTX*t|Q zUY|$p!%nv}v5cF$^U4lOoV5Tr=N0sqRA)3R`j45bYTtq*) zv7?V4Y!G+lDS1RGY6W~7m{(s?60|X7RP-h3_Y5>6E~0<6ErHe8lEJO>H3po+YW#Yq zb~H+(x!?tfY=NZZT|z)`R%mqrsB$kPb5{?d-YS~pyeh$BjEQ_-VIZD$=!7Q!tPy|G zw>Y(on(DF%j)k4Bx(2+tz><)SA!6X2B44o=zFhY3{9T-c(P$)Z@mTJGtpkw~j2flH z5nq|H{!B80bS&Cv^9KlJ;e0kX7cNfZXZvjPjXW-!S>E}7Ma$%dROtZhonZ@cSWx)Z zk!jQKu!z>3$CRQQ7`g!F>@+rziAFi)>^l;zdSWm3;O8s?Vp1MSdOg36c6IU1o}0WU zef#Di<%cE&=$zE~OEtJ?T2%nb!Gsz=^cT=fx1N9Xr zgaNO%@c`ag>=Y5+Q+Za=I2;l+s1?-$5mSL__PCuW8n6aLhfB1EinY26+AGB-`DGz3 zb)8UzWqs?DgFw|SDy9q=N|E~(X^)#b^liUub?4s&W&5zUQ2R;-hWv^H1+vt zzN^lZP!zj*0mSHePZlhttXtv$ju0B5?h2U0fakye>75swN1&UB&<9IKuy2W*>ieWY zn1)B#X+$f3bAkHFDl=!xQldsz+Y@#(eHrr)HH(UTrz%ifU@L%jzeXL=WRh5A1c41f zsPelSKZ(5&XCN#}(+eGR>Y-L$6p2y_n-3e;1WJ*So(OSKe# zXI?;-K2l^c#)KV-CPdsIyy|oF>GbelJeXxI2^hl=T>i6Sp)Qo8>JA9djmp>*wSlvg zDcVQN$tTN~8D}H2PFKzJaQ|K>mDxMITM(r+q{#i;^Pd%|4q2unhSQ)btS=TX@CG;W~ZCIV36g({zr zWn-2o`?ZFdYo1>_vH2ihZsc4aYc-QMJ0s8(ICrhr_jv!LAj(#T5OFG|d2eAr=7w*L z1fmga+;M{?hxA0mcihp*(e5iQZ7O#e1qhcOh%o>aFcCl|aJ+=Oh>lx`J=cdxCOm`} z$^=a1>aIQ4Pd?DeWYl4ikspm3shY2`L9GVa?)IyDP5&w4Fe$PvIGV?7={VZy(7kQu zacKIGjQU(eHap><1;!`XDXJ2!ao?=R5R@|1VnVo~OvVMYM}}Rg7+uky94~1SuGU{; z*GEpxyK3wh??p-nj$zW21{e8RsQH)M29EW7aeE?CMP)KOjV?C1zL`(;kDCT4q{&-b zBGgIxIeN|$%dZ+mYXk9Q#WLhKhtcoZDI+*(uxBg#Uq5>rHR>8K>l&Y7A|2=A5tl)F z7@MrT`=iIV`IOi*<{dPRic`{0rPAhuC0?$IDnZ%L?e zmJB;tfN7L|&!dU~-t4bHLdeF@>g!CWU$@GAneY;=dU@lRNOy$^pwwkl@SwVvdjBa* z5Ca&=dSjBZ6Vz;VQbs&i7leK#9dZ{MV_aM!M3oJlRZQv1xqC8s6#`+br8714fxq0U zZ9{j&ZT|6FJM~Nq2#Ax3M;&@8GuJxx1QlH4Gp3*!IB3Sx$YO}3yp`8;aaOUBp~nvC zb{{RNu8o1l3t;>aedsK4FkT7sk9aK37Zngg zFvKa?SkXLJF*)@~Qm<(XxrQ0o#k_=uJ|C&aB)+k!&nkGUh zk`}H?wIG8`Zy~xadUDlwoOA8NY|$PTtUXgz;J+)I$j$gH)_~56`}dDu}+@{9^5BrJHxN1 za6Vjq1qM1+s-^ht5Q28^+sZA}m_P*MuBw$q;^iuKD3ZKH(l3{)JmkoEv60Llm56p~ zDatIPac$3JTpD95pumn4j_crp`ew183e6-N_cm6Fo{} z-pXtOza7JrIjN&&sw)vyV>`>LpW5JEY3pWUNop(P(5f?ugx9g~4Y+k+n?8H3)8Ztl zof;a%1WfuX&u+#6kuH}spWkI;G{y`V7bF4(idTSW&2Gei9}!~Q@T-O z?$n1I=-vkYDj+pG6*RGzyYG(YV?dvn-4ixrO9}Ez2q5s1D!`q`4TiS7wxkh7(*yEA zWEVjU9#D`N_i9Bq9HuPfI17lOucW&~Q*`Fk_1ztzfSxWviwA0_yR^Wid6dCyRGMlAEJnMfw-lw&J6j@ARS51+t(081wMD6B@r7BP0@1*Kdpg-{Q zJjkk_tnQbsG3pd=Cr+_#jIQe9FSw*QRb726piefZ^ca;j$~sMx0a4xv*c982tO<1) zu(HRzXMrR~U+KmqHrT303 z1EN#(m?%5)DQ?vW7qO(L-_80oFsLMjDxg2?3`K6~yAIQYbZ7BGl_y0IqFq~AiF>$v z^b$#{npW>r9`g2H()HGTAbG8xJoIu$tnYCH3`7YAlda#dQWsnj@du5uDBsaSUzi;H|8XH#K9&4t1~i< zCbOdGv7?ZUy=!y^@)L(M(JgOib3|=skMgs>Jpj&yG3f}7b#A?m<(EbsFx&2Z3re~= zLiL3_d`d*^jn_;g%K03IS!MgQx>X#V2$O4la05w_(9J`_mxG+U3t9J6zTeW+!R=_= zC_km}+F@}`us1$>wT@*o1ajT9TwY5`fy4wLSaZ0ft+7ZE_vACTE z@@=J7Jwb&ohwebbom3as5jbk0O(Ttx9rjG<0Z*({{uEGbr@-%-4P{UnjhaI*JWqrU zee-APKa(*CEyJC$TR#@k@Y>!lDg1Ss6@!K+wgMjxh+=&j(mm!-*u^h> z9O`1(XK)fPL3Y+CrAI@9se}N^$nSB68>LG%GWb96RGu|Z7}QeqcHqxVj9dC9>|%Ji zk!3o*$#d_Y0J-&>Tf5RIBFW|y(Y-4$px1Jr@3G|+_fDXX({yYSo3W)!m7{77shmR6 zbo5~~>6AqdJ%XD?XVPB^%W_$P-!u7Jp#r8MSJwa&VKL^V!kx?M=<=)na4Vy-$Uj4A z1;o1A9L)z15~)`r&^!-{rKejcT$nIShB#Buf&xgpWYFXwfwMmlae-|Zh70@UO77hP}eJU*Bk zsXxhp^;{qG)z;C`@qY0N1U*kCaf1OKf3c1K&|0bJ?C;fb+c%kT89x6#>02?AXZGsk zxMm!smk8JXV8>E~wqE+thKI8UdJu~!fHlT~X3tn=5b=40TeV>UmJswBRMy z7eeZ?{hcY@6m;WPB1K_SIidKfl~H)_Y0Hx8qb>_ar)q5{M-g|f{7)_uU1Za>c@(Bi zW9n`&@7*XlI_&ExTAOAkdDcZ;uh)>harZ5+$_>B07(JrkGUx)5>Q;I3S{$L#j zudV;daqiqXfz5gFiJq02YTWMi+KlnFlC|Rz3AS2XY;8v5?vbDmJ$6mg=Y5;Tl(Q8? zGwM3UP7`^grIO4lV?}RZuONm{=9g){$-+p7{wcAiz}2&I^iqcaJYg`B4;lG|^H(7V z9#@&(^!8|ZCP7)S42VdOO9c9A`KZgqLRjU5DV{4oC9It_rm9qM@5G~wni$nQrxO?v z3R$37O=dk0NsHP*uUXlxz2T>|QPoLV^x~k;#F@)NDs3wom*hM2)y7sCsCb?kZhO*1 zY>g1_DBlbe)T*ljxX*hzs8Wp`Q{ zmf{7u>wE7m#r*~9&@4eV zWww|E#2HUo z2z64}4Ljb535cnp3I1Gj>V#^7?iFssJnh)S%w7OSt^D85-tInRxu5n5IW(X&Q z;I#L91N+`nhDyq2B2Crj*}_Y`#%YQ>;cUR+fyAq z_bf4b-IRt7xDO!LOX#CQxS`4htme@q<77XY<^NpTWU+6aOda^7h2$S=Q%3bvjlstl zC?zcgB*-&?Yd_l;Qi6;4?8Vs1-ZS>p;)X!D#@gV+<0nLYMlNO+m9^7cl)}D_q(zSA z%%La1Tph_BZpMaOl0>UJmp#0PE*ifpTG2>+w;*=2W=!xD)29;W!DT&LtB}GJ>n<&~ zC%06maszA~Y;t|q96>6X8Gx`rDx|i&jNhA;*eURDUAx@^Irc%MzbDsUDAiK**5>zK zXHPeZ)Z?;OWhyMno>ppg@K^_Wfi^Y~1 z<@#Kx;w*3kN6bzJ?OM2iq*v?+H!00(scny;^PVg?D>RZ+Df?~?tv&F7c@T{b&Eq=K z!yvfs5jwxsWUgB8nD*JKd#MoAx1N>+Z_%HLqNS)@4;v3Oe4hP!2d}c&J?Wq*!gqS^ zR~9Nv(Uoq}iRZ#Ue4$n`qwMLhWrE$LI`6m)Ss5R!&)j_1shZ%d;bQ(uH^<_lXrlsi zh)-MczI?e$_T~QAqRQe>?frvUR@>iSqCO73pc+30Uc3UU(`xGXYJ3}qU;6|hYelXJ0G!1)xG5^zJxV3;H>EQqYx)=hB3=7RiNH@d@*h;|O z0~9C7QCbk!_za<;f+S~!5_k@+sAwc&=CJ0y7#V-x_V?^eJy>i`^+07dTqUDcH{y!= z+KlUtD#7 zIi&)tu9HIp*rvFn2}$EFGVN*q{Hg`8NKcQ}oJaWG$BN!=fyn+~*X$`Y#@I+Gzl^|m z+GG}lLS_9w5E{Q&B>xB+Tel@`h0CXY3ZOV5rYwjk$Av-5lwGw}%FI>7Nal1&c~oSQ zUu3U8i;a;_UxXHeE zU(C{!{FJ)9de)uT7kDN{yORz!(Ty#kiCf;vEZ3_voi1wAIcPC`0%957B5%jO!)hY1 z2qvBv7U2*Gbl)qa}oDJ%wC28=;k9aE13fSn&cp?n!xXt9o-nNR{_>5g)Wjo$uqOg5PH0u6 zUG&=QmlYD86$Cb{9(I$z*Z%eA*!xm6*lt+*i=YfLm!Jga3NZT&_(}tWyX?ft5Nd=G ziO%;BO023K4?OqN<=a8&ef_Fwe*JABQtO?xP_>7~^afX`Aul$Gf*Sk7n`2Ek)W-N! zmAd&~7yOILdRLkA*E*Dc2LfzBy8j{H8BW1AJVMxGLDCH>m?2Q$vS%L*!MJ%y zBe4`-GzmkTGZIyOW~`Si{?DDkcRpj^YX`p9%oQvIgU3zVKX)z1T31bssfQA;INW2Y z8$2IME}D7|61E;Id3k@d@SP|ot*4iN;h2ZOe0P8HG&hy zc%#$!a^HbXyTh9UCH(vz%WvBMTEAW6wJ>Q2e+N1w#2rnTY?l~7G&2k&Fo3~1QoZQ0 z`&}U66YWi#m%z@ktD`8|;q%L^pR$i`xp8<8b_$nXd0E7VK8{cgQnKya{vmYy=1JPP z%r)B63-nj`4oXi>tCQlw-%q_dVY@R7?HGQ2Z~mR*O?osfFe=A1!PmY4)450Hyarsk z@G3|Y=}ddY zu6`)()}(m!o46BkW5D3bg-R_Tlz1PCya8fFvGzXbfJ3aSOaXg;9g}9a+OdW)616{V zME@@3JxWJ29I=;^eMsB%jPzQAoFWvuq&l-_mTCGZgOayxju%1HaxZzsb~9}Q`Q~<_ zS5|jVCyBL4T~O7}>^wm%`WPr(Nbs{;TK;d*miV{kLKx?(zs~`iiL^+WF4#nPqU@{y zFdC7V(ak>W24w;eiOz0Q-W!t_{XRVT_@&Gzt9xKeekO2X7xmTa?fRdzeKz(ToS7OI z0x_h8hTz*L9UOPe-KYHLS0wzrjn5Nkv8fKz@a+=+3mNBtv$~Au(zof&6d0}EFqrMp z|BYZ>LIc31@-6|+nyjnO60a-(}>Wb2O=`dnE-iPbO0y1hG};8mKU}fg5@*| zzafm3(8bCcZCZtuJCt3jqEF0oltKj%a)U#XW6481LIHagnLLm`mne5Qqe1#PJ>b51 zh0l^w{$g+1cOIcwJinJS_2_PEJlZbtA4yAAJ3-#s|ySmXBmq4;rPLf=PNeFEzaSbE4=W*j7X; zx1ClU|53>Ix=@u*Rf*p+=(>o?RVVnG2f|Y+CGOa0yTt!L>Vrgy0t>Jvg?)O2Q!)G2 z#YuU_f zqX7GbR~Ria*u2-g62Je(Pk#Bf!=0>ml}{YjBaP+_?|OHaKSHUVnb&jiMBU@vJ1x(` z+jM3R&Y1nCOUR*9W01E6XvL%3MUa<)s_t@Jh!O`qz<)vKBP0RBEu%}C zX)ab{r#H-yNAt8W4*vot25HE|O}o8VUpBvgmTxEeWKGsQLpp!Bp`tF15B*W0A1uAB z;pI0){(o7LFo29a<759)Ev)@LZ03#G^zq2M&oc6iYR`{*Aj`KETooDVfYNRSA7ed!PKV_$m#;2j_{Jq(;M8;BBKKKoqn@bu~m1J-{_L@ayPCa#Y*g4mE|{HM7e(}T(r%gAgfs& zlctO%QONWKswq(RsmXKfx$a4)oH#`3c07l?=Z}rcZ(hCgIs9HrG+&K;GMxHak~Jz@ zfV?$gOB$BO3%>q+?HaW?Dl;yk4lonPesar^4$F~=J}r~A10S5shmv;dxf4fC3MGDz3^A2(0Am(Zd#`qb?w4Vg4!LJ$O#P)L%vV zpx^!se|T~QbWM-}Dzp0FZ{nxU4-SFZ^g7gpsENyvltlwfwIzNyrn~$y-#$Tc;ApypP;_E-~I@uYV3SHh9(rbb5Y{#G*73ZK% zWYL5c&zEI(OLLJ674B0#k**p}nze#u1&Z+q|@WP}(hYl?qRrCeJ z<}D6(|MJeif11r3>?TeA?tY70konSpq09<@p5MfH)6TTVk#Q@b>!7IZb7+Z|#lL+O z;Uba?;AST#r+V0E{B%m)oepytI~UXcG;pd`VU&J`xiW1wo{Hcs1@E0>>o<)nAYnT+ z{bmSQ^aPAS&0GS!NYF`tTWu>8Ii+fm<>?cKag=rKo$bjJR!+^X4aaWvb#|fQvLRcv z;rLOGTR+)ME&xCawWNk$*!a9b(I{Fk%c3Oz43;F2{FrYio?tbH+om;pxwPnHbEWk({^lED z^uOb1v_!OHFK}q{4m~n*JeKb*U|mk`A{`!=Dgw4|CN$)5Z{EPFH2jlsFm*HFa>5=T zL?Jg8KNt=Qe1N5>B9)27L!4H@A_t_Bak}j`^v%Qj~E#*W~eirhzbwB5wbHdGZy2b94O0X6)IP=DO$VfzwoD> zev7W-3fSG&5Oem4cQ^|b%MD`zy)Y?|p#$2E`R;KZKTQLk5>fQPhcBXhoRJphP=q%b z$eEr*1MXlTEhk^zV2_!j%q!tEyHTh`exWFF6)7sG)x_i9TMgy^DG@Cwjwt`+)hLtK zmZu?Gl8lnbfqac;ZvXUI3dI~cFNmSj<9mw*jKg6dDU%>_`CNhJXh8($@84*zfk_%u z1iR}&{@6krj=a426mz(<9PQnEx~z=YNF={vAahieEg`3$e9rc_La-#WPO@D8P(Bt- zAWn6Rt`5%5{O*0u>X_YyTzky3_87Tl)HT3v#J17zcSiHoQ}3N8kusJNp!`Nl_y>S1&;Db z#LFR~+9VD7kcNA|N1fQY0qMrfA*`m>UmJTM72P8}Rar>=bQZsyqpfzT!hs(M^74F5 z`QpNqEP!^2%cZqFgP%Xus`$tbJZH6ZLWT4c(Ct+?s=oHY|Efa8mXP?{e=xD3=4!W) zXr{wVdj>slqHdr$%4y5XVX(nbrClAD9{pjOr}!-Sd7sW$lFnGt<1%*7<$z8%QJ%zs=n(z(MaezVyYY&1?{0BQg8lU7;^Nt>WuQ(m3KNpK_YKkw zzpn$p*#c|O{Sc1=)VA4R_@8i!H%c!q4sMDtj+nIgV5ip0)61~iF|TZRym5ZKX})uK z2vj89QG9dU5LORD2x$44N3q_t;L_`9gJ1YC-FQH9k2Kd3^n!GuZJlacVS0}gt*V6% z2>|T9_tZ(Ek8)1|DIt1cc9{nUN2sQtu$4P?#yrRq3i`mTB!Bgsb&_-jXi}&`cb~KdE-s@2yl?#c z?}5t##90OQEYvCXFwp6@l?cKR&DCC@k>H$?9x(RiAYMG(3CHuBLq45>q2V?biS zlJ_86Rg9Bg`%F0KnF(y7^MPp=jXy()>n3JtM>g+ldgJ%PPt&s*wZrFwsY`4UZ^=c7B5godicQ&*qByP2&x%R6qKrZk??l8uFi_OCt ztJGL(-RM_OwGbWTN!?Wxyz4`Qw-mfXopcV1#Za^zVPu-k`x?!Vx$w3WFb<$0cVHCi zm|K34ky~fv<&bRVaey2A0wjq>L@brb-^X(lg%C%H-|(#)3HS9bgoXGu9LiCl4uv~- zzfn=TGrjF~0UWEH!#;W+o%8D1JF*=o#p7u~h)gAU6=8k8e+&@IeH(&KSeGb=e8hn< zTIf$P^Uec|`Bwx;qFo>*n9adTqtUe$N00#&3@=VFfK_YT0Y4;HK_FR zSQ$9Cpz(eaF@pIp8b2MKM!#m#;Xu7G@=Xhok*a?R5k6cBMTme9;$TrKka;{{iAXwk zz6>S43$K}(<@I3nnwsE1qCc^F2E)HN820N)QByYWBdLoKR#;ggetO_U9AOQr^DFV$ zbg`i$zT;%c(tMTu2N6lwvRFdB{!inZ>h{_no^>!{m zKxyN*_4HixHj*CPIct?@Q$CB|3fXL=wV5z)qrce60U;a;nVEx{KbW#+C=so#y^Uhf zS&VX7Vje);Ne|9BR;@?z5h=fEppD)zCg|uubMr}(ACxx@_Jf%0x_EL!$lv{7^QI$B z>whlNHMab!jJ+^>dBV!oc<`Nyig@3s+BWMiyOU3)webJ!%SsAimTl#5@blr=^Z3$p zM>d*BFphuBw?`qv!8zv{)$rLh@qbWItxbpUyre*eX2`W59S5UB#AhBH+%7ba0=@re zNNq#kOko=0Bm_LUgJK`!Gb$A(WG{0w)1qa z9D)f4W3gzVcin75(hMN))niYb8VQ=ABpv9MR&qjsu|;j4@ndU?1Qj*Hj`NI)b$IPkkDbmRTT^sqv`Z0~c{r01+o1J9iX*p1jXvM@^il|N=dF5_)*AMp!% zEfs@c!aH9lf}Z9KlV^7l;Pjn=ipA_m9U(&5ZM3PB%plqR1kG(A_UFZ0w=@>%>{Dsv&Ut> zORN7&G{-c~ww4%?PUX)i@Ad&7#@%O$&F1%aW< zKrCDf=#q$V6$fKV!GHBhZves6POSjNyKW`~U3PA{F5eCHzIA;kH^u7wPOUtXozcox z+(?q?VKE1x+idIl>;D3ycL@ZqWrm|s`I#^`{eqQ&{yRi=N79`ksUoR%kkq5!L4rBTO=6s!LHEVqW!ER!M!<%OS1 zlCSAGHV*%#qw32y{DS}Ds6G-PPW%X;&yt^gM(>#S_6|`jiK-;+eYYBT-JN-wzw38B z?MOz($jp1;^W|Pds|6YtX`j)2;mx@km?RVE!<|7`tuS4?6vKHdKn*fVO^6!Lc39W8 zm(w?ThYYk+y1ILGc49DEgcIYyCm-FP7&7^1%pY+Rm2jC6*q`$C<(eT*t_A&=Gi@`S z4qxpvS~^5CZv+)kXBPb=CEwxri<@ORv8Q=f4|P%>cI$sCLSgVC_w@5?4~YeSaYAfJ z&`B0?Kqm&$F7rKdV)_f`LT0y-pb$r?LoIJzCxsM%u$ntUEiZe8oiwWwHi$D*vvtM) z3`c_J5=vg;&nvqSKkVU_OF;&!<3N(M&MPw=foxp6lov_+^R$3^(D9spI`!=5Jfl{h z8#Q*sjW&z_y-WiqH}C~>ijty7;GPK6A%>X{j+{>XWaM*{P6)75bS;vb6Hd9!Gy7<< zZ1xm`S0yMFJ{n|T`KQgb*l@G?m-k02rzi6iSd5?dy-7zcP7hCX4*T5vXb1C9#44GU zGfN+!@Nsj7n`fOYzT@nrDlygbzacd2{C5O&jT|ikNWPY{6WR;Jm`gVoyq3HKd%I}mWX&Sn z_7P>?a${g1;v`h{klo9`%;H}m14|`FyWUg_SR6Zy5zJ3Rop%#Vnml0Uk;L__8(1ak zqpS;!VFSE&tb-S)Qi47_YD@vb9MYea};F=%Np(mspg-jI#WmRhBShGFD z?oAH6x;}YTrlKU=o54Z&+t+qBcw{X7Uo;|{K^(MeYrM|aE1tfN?+f@A3qKM=Q1y+pwBZ> z=Z0A(gcUTH6(bD66kQjAf!_E7PT<@uO4&=^2uYzhF`2z-j=87Sp_Oe?1GUDeUr&l= zWLbc+b7tfteve%~U%U!eFFzx0uz)rBz0z|Sdrl`lIb=#|c7Xl&gSqJV($V$UU_%A12Fy$sX zmz55F4)b$!|E=IB`%HnwIKCz-*gf7j9tT4Q(K&k(y(@prUjDIdT--2p!A8SRp(Z#m zrXR#)2EKw~1C%ex*rBs>NyIy(GWY_KFDj5PDoX7UlAp74D;(=kho7cq8>D&*aT*+< zCl!$EJQqnwPCkLwps(n2gr7*Qcs|Ur(XX_k^c^Ql4(8QAaS`l{cKXh&s@&Z6gTvKJ z_#%IyWCUSbfjwcMuN7EMhk7&Kak$hV3S8D4lWvIW=8x+F5QV&EeRD3rzHwlR=jS}b z-NA^3#+7Tv44-q)gQtefC6xKSv+09;C5APAh7!^IEF5cA=VChUGH^+3?+Vc3==7Et z8nS9s6iS%fN2b`7qK-MvuKaI+;66n#^(@6Xhno=Z>)e0^cRO&$;gW(pgcm5}W5;k` zp#iYTlu=f(Ks3TLakpa&-)nFv(27TL5Qlym8m8PnZ@|j9i5(-mD<5Vj*{$W}PtIuo zTXyDh1>2^9sedx|yZ8B2vpr@)&vh?jq{;HEmUwPzeJEaJ*u=uCDKBu}^V0uZ?KGSB zax2h@d8(G3SFU;Z?jvrf$=%_1u>0@hk5wH+oSVESVXZ^vI{CTx`&Pz9EFIZ(wrg#a zsq<8R-+O9Uz`Bw=;9F7}72L+zlwlRL)=*WS{M0vS;m`idkBa9q>pVXwHi5(eeA8Z+ z8U(>?cfen4Aa?_@02_i(oCkJVw$?LUF(>IlsGTi|)ZfRkdTmhuoYy^1OqhxYN@s+F z{Lscy_rHQ~*@(3i=Puf(^GR|@Gv^~WmknzTx1a~u3l{js7gK&-bY>+0S&A=6(QKO` zB%*jQhS*BsYlki$v}#b11TJd^!p(UHmL=UFica`?&#f%^#}mzGe}ck}D`-mp@lHeV z63XVr+0L5$(f8~whLswj;ReouSDHKqVfug$bqfg)RGz%GlzjNVWRFryfDUlNqQegU zS_t-~$9GHZO|!Ox(MTt%^Eg-JXRYfdRh9H%zr~IAPSbd_F10y*j+TA7R_~~tifVqu zu82fR>$b{ZIDws&}ckbqC)8Aj+@!}`z$}!KK}?VVGGOb?woU8jsxlR$wFpmuGBVx7)hMjUyaPrEW-4QaGYG7LZ< zB=hLA_-ae_V~$H_!w!~>BbK5$P6uc410s)>&po5h{T`GjJ8E+|KQym244!FR!0MR% zxY5s`4RC(AV3;&(D9kH*0tDlbip>;93f;r!p9Z!>xI zr1EZY4*H4rjaa#@oB?}3(2dZlYBD+i1hA3hbjorGCv{MepppFF*UL3WjU$#%>d%gY zRPog)BD=Bs9~aAW0y8mH~{T&|~Yy}vK(03A!V@Hdy z$rw{-@d+I2e;t!*CT>`Jwd~KToz6HDr)WQK>Cs$N*xzpSpyuPwC->BJwMNLSP$`G8 z)9R+IxRVG`C$WJFm?G;R_{6KY^aXMEl3clE<^6#C{QLkBqA2ee{ntbgekVL9R3Y2= zg~>%faM}0AyW=P6OUq1Yk&m=K(}G@XYBlPP;q4ND9GR>cc!u1ID$Nn&ZI9&K6)%9>aK#gxtIK!h+Ru59;%(PTjmV zTh9Kv?6wjQriwy{?XRiNTZM#Asi@=iKKYc#V@CX%8Ple6d;{g0rBT7%z!RW~DsHMm zN{QbvrPA~MRb%q#U3SY4b6tqk#5lu#LbMweJOTxAgwWE_+n18V?{_vxJ_()ENTU4L z2|R+R#)&>^<>6Wnm_M?Oi_nF%?^e^N0I*xT;rQ2yATB+6qx4RGy>vc3u$F1nr@&2` z_AJWn;7=)_&a3qLP7;5Bb~+`JTL3^tCnl3c?U09KA&~+IZ%ao%6Ib2j%hho4DXRD- zb&mJvNAxZ`PC{fCg>{$X>fP(z_F8Z;m!uWjObJs1^dAmd8Nn-{M6Jm>wOyii$kHahRVtTrURm8JB5$Edl#*noZf9N`k?r48eo`V>CE6Dv3((P-4+Gs8l41p) zO4E&DPy?YZXpbnf*KN8Aq@uroB>Nvi7v8&r+g3y*+IDd(YA3@h*V-QLds>_y2jOmF z%IC1XKbV1TVyCGpU$3uDDaCLeQlSQzigTI*&-5ftwAECH)cGvy_e9g^CrVwFqKa!w zsWR(Ry~7S_kMz4155V%VbNQu*{FJZTUz}V2m^Kc03VXd5_v-CeHg?S>>H|4;t$VXM z8i#NQka(FMKEioL3yp7eOS}oR_xBshb=}I~y~=`Y5H+Y8yZ!CkZ+JyJ2y;iKNfR8` zx{@2R(9NPwGB?D@|EHT7=m54WX2X`dUKQepYTHg#wi-%;s?JN56K-NQbHw^`{&(jw zC$ojH1%)EmisEoE-2aX=8(q6N>$DJEy#W72+YONeOKLI_>8=-2<(uK(#fbOsKgd~H z$Cr>?Ir@1=3QY>`un&E`oEzY=)q$|`E#!h}@xEq0U)hdeNy@XsX?S4{$JgTC8dn$@ zd`g^RMdv1Kw#H&q|H+F`O7x&HV#m+S@HPU8j82r&O6M(I^{3P_HDRQgi;F`z!GdX= z7{Te6PQz!9CQBe}Kn^Ao*3fAh3B&=qfctPm(W8U@U-z#%a~v<#as)rQd2oRMTJpPg z^c^Xm_q%q6CfxOvd)Sv5p1nV_eoO}{02WkPrX4fZZ)C9DpBQJh`~2t=8#Ng^u8Wz+ zD$k2&4e${H0;a^N099#GToAWH%5un)kAH8D;_58i?YCJ)Pq3!?`{y^)#MK^A?&Yj^ z$P$`2yi{vgpRu%a`b~PBT&jopQ?D0|S>P^h?1xuYKks68aJn^`39G)9?%WNVpbbde#xtZChh?B>1-t=qNtD)8Nm1TBM{9w~)KPu~3 zP>r(5{dKHMSRm3UGn1O=px5r~ea<$GjiXSm&c73&2|+-g3d){smdc z|JobKx-NXqF$*5==j6Wl-K-Aw?C!>p)foPUl+iVH$bB6tb`S zFV@;drXHRGa2^<@Y6Dd|soU{1=Mp91DQNz$Y9N6+bi7M|t&`r(h4ahEsc47#bZ=Yb zbLL^4+n^VQKU}6IxZ%&r%M*ZHem!s(vs{;nRko()dI1tZIJJUh>;ML#%Rf=`_m|W^ zEev7+2liUWrSwR$7|)I>F=mgRbvBvPAiIcF>mp*OPV4Dx_^!vv^f{`;<`RfYN!9}2 zWBUa(Gs2t>mtgBw`y|zrA}ysS-iv4RX=edz zG7sZTxGi3)B&DkSH`nPJ)kdY#*0Qp)d$5%F6X6BrL?0wFI!S7bIm2=oWRlIt&8@V8 z&MVfZki@uSr@H8g%Uc6`r*wdbjAI?-1FufS&H9_UMl?;*c|U0#0K&XiOT=l$V8qDaG)Ir<9zjma=n&Q@_4Z4+~K14(P}hnfja$sXe=< zTK0Aj*ScyAMWF|La`>aiRPQ4*>&ZJ^8cRWF18 zF0Nc(nx*SV8SF;gff?>ujic_T5g+t;yMvCP{mIvRJ{XL4^!N9hN{F zkbWS`qzP{8Gy!1S?RMRwoo+v5gl`qMaJ(fr#DN3Gk4eW31hxEKiuaMeDCbK-Kf zI%fy4-G>)Ys&vF1JGbJI#%*GT`^BZ_O2ly&b?-gF_?2dckdG?gfWhNxM+HaOCkStj zbpN9C{Xe}}Y%mhp!LJ97OL{=$NOz#L+DF`3AU&neKPAMH5WYRk3VT=xi%3L@#&t? zVi5BtN--`ReGOZBbBfq3t)UEbLi?{F0s>*Th5)c@N*@Ow)>lA)nep+euH02Zkfwts zuiHk;tvTe+K$61Pb)-(smY-Z#o)D+6X*>W(@*x5-gkBeW)Ji4FZP&SV1vwagJjp0V zcdowl&%X43Ju{|Fuo@>~_EQARO5z=_DWc8fu+YQ_dA&#I)wy6l$=nQ7;nPKrr4QKI zAKSm>1PCyu)4HHW3IADW4CQueNPKDAU@52T>R?j>ML<;hZczTnwVWvg3zj`Vm-F4j z$V$6*for0^P)3M3U}7WQ+4Kq@R}`}zn?P19($WX9xhJI#A1I4axnpwoiUf>sjpWbj z;$2go%=LU0X|ZGgT_y~YG@!`U0i&hJ5=uBVc~{sJR&wKV^FVZF!IFHOf$u&ATpuU} z>D!a5|6wjh1d`T@<*gotADkqq9qu@*?s9y_Z?K-^nhIV{(8(ppbex~iz`L2FLc{)W z+2{1eRM>cuZm2huECtpdaYL6@ft_s>frPl;hZS!vaTpo zy%ldw{F5JM8lmGn5MB1uvMJpHoR#{I{1f4qUqR5pSF5>F5hS0c_RZ_8FOKc@bk#`y z1kzNw91Wk;$_~u^*6#R ziTp&C=HyA-Gx3S33Ja%Czi$^8KBccDk$TD>wG~R#*K6i2nqgw(%A>-UaK97+REIe~ z+S+o`39^tv;yGWKo}cMEw{}T9YfSv=n%eZHb#p9MnQN}H*h?s?F>Kpz!wyqjNGSAZ z^+3?;x|%6ylE{*qy2QFq`EHYa*L|J12_qf)tFIVTFe=5c*G_Vve(Rv)L8xWmXX?= z`7TG*v*Y`it|0Fr?Ceg_{a{}X-M_!M0Nul@^k=ODP=JSXohzofQZh^r74vx3?j8uS z6Xc}LEj`c}`RVYX>E#qgt(}-phZ|#)0`Y%5H2stEabw7vX;y*RvQu z5yox!K{b#6*GzV<8%IOU&M}kf&NP1Zlj4wkCcN0h=Fu+gwv4=IQeC;0D&I3BHe-Ix z5N+i`Xu9$5IJA874(oR=`9R^E;&V2e^2Dv zYxStY&U)DEC7Rk#5s|T};(V7hPUP+a(1}AEDoERQAJbo4DIJg^zG`==F@+A`b(pCC z>|k-DGuU`Hlr?1OF$y0;R*^T~WCnySDalb5zlF{-(7ePxP705Vb4dhgIv{UZl|c}u zm*e70aA5T;`l=pG54>3uoGzf>u5>0Qb1UvQy1V=mRdlMmvHo6Y>&fm02Y!GSHOFAA z`l0yzvZ_yG4>36Oo)P7Oy}r$@+;Rr2-WO$lv<%!26R%jsuUNG@=irA#-e9J7Pv_nH zWip~Zj{J&aYIEk+ByoY!XB%cSi2%ok8t{b)f6Q`_H|uatFmRlBiuKcpk{krPG+Zm5 z0*=kNcsCY+YgM9&KWrH;!%pQS;+vIqc}UFxldlpwwhg;%dUJ=ImoM4#0MB%*V-WZ{ z*N0DCgLCK8IT7H_xLiqs#Y^C$7VwdR%vKqIHN{hUlu>*G_fE4_-Q%;mMKM<+NbT6ff0gRb!aVQ-1IciFkSnQx*D zG?`|d(=!vlNh`<2J^Xix)l^0JU=w8}Fv|0#sd!5aP7 zUpOq5KmJWT>l)i&EhX5Z{xs66roCXP# zF*r)k*J0!fUD;|6C;L*lFPnrt9i6$URqjq^tTXPQ3V~QWvCJ{2{MvBY!$lq}mdsP8W=Ik95q?CiN6po%nm$lC%h&n&t>BRVbh#V72+PNV&#sD(U*3z+>`Y4_qy6Y{jl!f1 zqM%uDM+oeaSp3Zea3XWMCi)W6nMn!J)GTbK8q;BzKFvp>qw*%wK9N-*>PX<$(#>sc zp&yU_Dh#%5|K zZpo3o;%9eopnp=EMSSUt*8!zvHY`Xyp0Br{b-DNH$rbzGhrgR}B)?z|i(Ewk+F@N9 z2}lw0kMXP{syUhh2(-&Q&mRwqy0EVh=*cZEr8er=75=XBv&_0SAEYnEtHb#lC~j}7OJ-#?Mp0%F#uj#L=9SVUX5nfeLd zkr^a_dOGhVx>s2MIu1HEiN6hgvyq&`2BhXOi(E_)4JCKT``m9oro9zei7U*U1vb#5dXrT7oF>MhnDX zQ%CnDueujJlkMl!6JybkW%#J4p3tKqokLL)1ACJFI^*%4+0!_aqs9~y2`ZM`B@%RM z@a_m*N}vwP8Gv6ztGbG43G!j9r-1HK)@OAOQi4lNKywR7p-R3^gy_e|;et0kdEPKr z8B^d6J{7w`)OD}6*R^V=;$Z&$_?$<8uH{IxHgJ3x&zaH$JrI_pLn0=afZ_x)-O(T1 z_Q`Q3TI8JE3sH)kUq4fVZi8rIejRSAL75G-0R) U%*WP;hf!jYbUU--;l5wKn0~ z!U!5$IFGHc+x;L$%GiadG@{zhZhyV!N(Mb$TJ9HVg+3dFb|Ic*&`x5KVhz8dx9cN} z>$5U`A@cYK2wkS`wn3lPf&C9j=yde!6X@s8gZuC~xb5oHonpm>mS-bZ!=lhXGzWDS z@+YsYwW%K&%AW}QDW1};>lj*$SXh3JkFYcb7y)qx`HqfzgTj0um($11c+n&aj;q}YsmEwSe z=qwKrwR_TUEx*@u`6@M-)gDopwOuQ;a5<@`n^!{?`%ZQhHsb&6WrYTEeD`-1%1i^h z!t0f{FP0u^XLwRKeZ*hl$`a={Rky?y9RSxdV-91jPEG>QSE@BxF(C#Mkv==vVfKDcx=r@$Glysy|)>jKBcHJUMM+Mk;%c9J7z8>v)8_$1!X{XjNX1 zHGGA`{?D(U@|=&opD>?rb?N|Bb8OEvnN}Ml>5wA4@UQhL&8vXqQ?lHAl4oz=z+JbH zFHCck05#B#`FwgKHN0n>luX?o@x47ePakZ_5=g2Mg3RpTAdb1Ma^Q|-up6u-;oawK zp!g*d8u5pou_2)K{-_?FsR!_(ESz#mZ)f&B8 zy6EeY);o5RgbaEEjz|v!&|DcVMFNce(gtrEcY4G1F@PT(;P-sl{IU37d2-B?wHT_) zb$kwG_jlRX=Lz<0Q#s^7<)6E%UzR{dhk{gKVL&;oGp3>bH|(xoNA=vXYL1CZLuB=< zy=1P{+rI1zX`EbX(>Do{g?p4za~Uro$B8WYcQ98S-mZ=NPCJ_39QoB6*cC@M^D#0u z6M%P?BtQ^IYA$Xr?(?Q7C@W7MCIzzUd}=-vI_K3%t+AHC)c^*xuhVD)Xtkgf$$cC> z4|MFT-|{zSmElme+L}DI8_(gk=$c=?MNCjZPAXl5E`IU)ryPw#sY>RN`D3o{i$jY) zK34YaG^{Dg?K1@tJ|B7+e5Y)>ggO|w`CE#D&H#zw)k`;hR{km)ROIeH=PfC@D7#!C z)dfH8B}(gMXI8!CsWQ>P=0l>Ja7Db3e3qH{X}I!K2`h}iM`+M?+5Xh_!QD0^WM-k& zhPNUM^Ijuf3hr0&{fQ9EM_U0{V)1y8r5HKAXxAISd)4ZQsqN#~q6(3)7jC2;9S4cg zp^AY$`5`RW8hQsMXbIP)d4Xl29E5oV2_ zKKc3$xGqNR!^-`$RP4R)*bxq4miUI*Fg zJfE1yLbe-wQ_bD_ulGfMh(4FAj}xQ@j?#z;$0_8|U;HBpi}smJ-M{zC&NJx@otC>Z zPa+kZ3Cndj-?gdD>m9D{2QN{+u6|zg5VkF~%sH0WT5dUpm44~0!EuU@J zxtGh*^(TDlm*{}1vYxD;W~6!$1ik0qDk?h-Df;6M|8` z`uyv|5`&A@*B*-=Dkz_UoU;y*UIQ?_4>vR;U)?0t~PgZ z;VCgRC58DUmJjA9KZrSkyIgHw{y~0)lJ)I25O?Z1I&E_jruBg1yYiknV4_^r)V4`s zVU|nP{_qwM&hOufG>Atr(W1-EBg?CB{6QfU)$4Gq#y}Bi=T!ZqC#Ps!h0Vp8sQJxoabg0@yPL+{EaHf1g#vL!n&w zkDD3?U~ zqv(t0T0?FcS~teN(;2a$1;pk7FjN# z8mgn+(VSb&{o#SZ_vur~tEZ>K@|OH{c`DBlpATK4A|CSYk&l+JXs79*K{D9IvT~e_+xy1r%H<-=Q2GDcN=}e>G2=(;kR5Aw9 z5^zW)`3EoSds+zA$z)rdGaXh|)(M1UF2CNwo6Op8xVV&5@$|m(thpg5S}~ohM%8Q7 z9{&vfy?S10FHkXf=qE?cnW0J1haQ8@ptN?sLBE0J#*)hY5?+fACNhq6Fyh6``jC8m z=1gBe`7Bo}`SkpKi`Rg6h3@rGU8`=$UHX#Q*khh|a#3G`u2ol16)$m@i>14bSzc`q zfL>Ci_ju%<6Yp-vL<_(Ot;b%q`(aCOgwgprq~=1P#5nV8KE;*XxCVOgZ78(uNdu!# zBIjwkv;NvqZ1Rb%;hFuYp#3DHbT$%Wjx5v&haCoZ@bImS_)!#Iu7h1)z3w>wX$|>R zSPtYKe`Q-S{`=ULXMXPBC>7ig$S>%rHdJtxI(DOS{;)@!zasVer;S(7KFm6qLhM)k z6>4IQtl^XBFLUllBvO`{dY4x(;mydcQLvV+b&kfOE9sHPXztrklmx>8e-T=)t^7ub z$Gy$w)B^7c@9}T#yDi>N`O{}}wjUx+J5?NJw)VQAbVBBU$^MPVuTOqlalNV>U#!bC za>Xn|^|A7IW%KNgzA_;?4-e{zCok1toDC2=%$8Iqzki#kvSm>u(oP7tZ|c&+gt)Cm z3gh;*%3d!hRpjC-foy7d$0T}4#jmFw*VmPi^lY*Wa4fP8eV3sQJ!wALYj3r^9dA9=)O zWfC~XuvuZZGM}yMU0l6|KJWVnQ2iK5UFT6ker07H;oMSt#D zwzlEBriqPy6m8I)Qql^P*jFOG+26ycjj>dz}3kN z2^V7&XikW{4dUbfJlrG`srG>;7f2jA3X(J;PsknorJ^HSUe5I@&TO| z#np$_%QRLK$y^_+4>rrdAhM52+OnziuZOB5K^{4TWDrtTQ#O^7?9+U)1@HO)0JPiy zlvc(S$pJ|OmiKX(#`GJM`>L`#*E^~26gMQGR9h(uUGuRY3u8n z4`n3yX=4{zlXnfnWnNYas`j%_rCe!K%x|F2fAso|Dd%J+N8%yyLgmMd&Iz2GK2c|y zf{yzo_~}dT&S`S=6-_{{YnqV+Kx|S~fdDD+EQx+q6wjC1IL%B#_9uc!{I1v-cvm`xdLd4XgP(-o15sZF83FD;w+C z(?Yk)&6FZymgI5cxd|p((Td1h4-$JWNEYRJ?CjRvRvBhv8-C3164;#aBm7!~x>JH?qHz81al&;4TJ zOyU6r2?{YTx36qOqwktM4c;N>4G!~@g~S#=J_Nm3J37%Wq64L; zF5K@9{O!mT2M&jVxikr?>3mQta_HO1(Yk~gC(pY%{Buw5xcqju4UPGp7JT`*H)YQV!Hr$8A}2D@aMb@^EP9|HWV=k!t_hKpA-nYuyBr=I z0AV<4|GCzx=Q4}`Q+q?#-R=QG?Qtg4`lK^3$EGT?Gm2384bta@P{MB$+ zRiuM~?=*<;;ZVxMop<)_hBw-{iHm%@ zTUd?qMZ!pq1PAwwE`gtR4XQ*Fn-os4jIJr0|Y*No2ahRoIp3~sL&wJB5TkpT2{It&cgjZ0? z%+!ygzaSca%nCzeW0-yB6yGmgYw3P@qx`G-=wIdcFNln9+XgKFlXw2@okm7u(l>27 zG$kGQ@DCUc_tb6h?j5^t289PJH}85#Oi~39EmeU_PK;ozBe>!u@!cm#?awzL;ALUU z&ppAB{j0(XQ-~|@HS5S0QMg{5DeKY1V2*z}pHDcpFa=j7kkx8&(j-jYQc|bsO1UM$X)= z6Axr!Tu7FC7Z=grH(E~i4#S%#{_H1Ak6W+n9#=+Wg-Y$eitx9!V-(;rNUp7?(~mKkhz+f#Gce|5&|%6IcBvvh~s6PzS;ZeDjQHxO&CRuJa z>o=i24{0w?3g}{p-9cwe3r#j85*{A6UZ-^}JOjf>(hoDQHm0IXIus96rnVHzdh;OF z9D`5VdYHn4w+qe}IE;Mt^BPgzDJZC0JtwOC%2i>wcJ%VAd8;ns1Qy?OiCCu3^JoPfu%5W=yVg0ladP&+s4;LlkI`t_q}|b{B%++V zKK>FUYDI$FT?1vKR+9_0WLfKXBaU9(sY~CS#vK!nL=bI=_O}F6C_CfrA_vJk2hS2H zQ5vBWmUJu4^7Wt)K4c-8f^IszE{!1gFHTG;=eah7+W9nAW$WnMDm{(4}$k`?-oWL z4Gq^&pq+fy3QRt+C*}DdRT=LVa>hCr{w~GkITR#>xXlBXK@h)=(^Y6EL|Ah=(QoN7 zaN#I%@H!%2f2`@oLSZQ1+uKGJMZ#p<9VBuf&zuj}L=chb$OV)h@CGG+&XPGyZOp{SP4L;l!TzcUd7js4Pjc*B=canU?qnebw z;&_y9v>g&dci(}q*@W!3j}Y$dBzjuFbha{Oz^^@7DlV|8^oH%)Wyaiog3xZ`k<$b8 z$BX_H$wdK#sRS!J{R(=~g(k&V=o>ERc6$7vrjRq}R2M}B)R6GUO6KJ0hmFvNiV8)e zAs=etPagz52g&kJ0*UZ`Z<11k;>?R{IhYXBbm*b^A?gtHy1ih#GagPqmY_;k!V^`U za>u!(m+;w_WrI)qCDIiW&9=WG?*m2NFuSs@EP_*3oO zq4L$1C}8&X+Bb9K+|@^&W$I&^0L!2KapRH^PUh`}Be~-~ddKOPR^ zmFROg{6EfC1v+S1=ji4HZtt0gcPGU~76y;MXAV(0&lb-psCoEOtofV^2~?v&Hs8s7E$3Tx=!76zn73OpOh#&>ON^B3UKTEP|oc!5zM}5#=NtKA>yf!WNR%Bjp^+s7a zL3XhYBd?fwigpH3(!G*_cIqQ%-@uy>1-Kz0zAnT1Kj=BnGF1(93+gs=GrjMy-Yl8) zv`aP;%u^Gpc=cL7xLDL$)I%BmSzMce0Vw-EF`FeROFrpu1Pq*w?z}!vaYN(oypv}` z?5WJ3(A(S@?-+w0*bX)rR9bP>ZK6=Fc|fL=iNbCNJqje~E(Z;sd5fGz z0b4YrFh-BRSro=yOP`Ci?A65CV_eSd3Ol+;O1&Qy|5mk->isU?Gfr`Hj z9)7uSF)eYyHUF#LBQck60iUi)GbtxMQJuAuzzs($6^5x-CyCA>Ond3}61F$_AD;1; z6K(K48uhcQh`^1$OM=i9C4xHn=75&I_l8eVJ<*b`KU@&(E&3X19a$HXaKH2+%F#N# z^j?bFUE6~=v}qy~(zG!rww%q)9Qgy9TCF-p{1jdtS!e@^7Sa@^H#Bn*r=y=gs5X8e zw*EPtr3j_p6zyne)r$Jz*c2Ty*IpmCXNXvD{cDfEPz^Wh<2ezT{3F7G0x{Q+n=&zg|SB2%qDtnAfwfwYB4iV0|g_x z7O7wnskAYi4+?{Q<~GA+R-~(7-C*fER_wm;rDX{TWQrekio#SZ6iBH%BdqM|W}vk~ z5Q?BAmQT*$`c+=WpP(Mbj+)e0SdaI_ZMi$=K8r$6S_9v`F?DgM8whKX8wKrlo+cU0 z@F{8E?V6^ zw~?QM`qXn2?$B#n`ZA&)+iljpbk7aa;$$GGLNOZT`7?ek3|0HBY5l>BroEb+vl$S) zYk^;2BpjgejLg&fBFg;Yoj7*9XhK0GrD>f!B~QFRw5?eHCe4P(M#e)mL8wA6;{1NO zG*Uzly0{rx(%b3~v5vOMcEg*Kw>IlEb`yhr7HRSY?rF*O^Q4DHhDg#C*o`%LGf@-e zq#u_)7kg~`f7zbqefU|~{s(06qg7@)&4>!QX9O&lm2beTazsek?#mMsqoJJ_>~$Uq zT(KdR?1-qByIv(n94_f9!$Qtv-hc;XZK8m!3~)>KZ6~*~5F?>b$)u#}3(2zNbXZLH zGH1rx<8J(i;eC7s+18-D_bqJZAN?E~h3m=GOH604Q^~uBPZ+S2#;TLdgG31Ni!NlD z3PxwsOxcoFW$vQu&aGY6GYg!o?w-wc6GjxT{r);|Pc$$Tr_Zh-op&M)Xk_)oD_3c^ zL*Cq(R{UY+?s`fLjOAjv&#DsdE)hUc3l#6S(*Tyb?QOQ1ix36I?G16=T~MZ8NZsp` z$$TbQX73asWklDX$ZZ={$9uUNrt0P<8rW$;VQ%@oYkP_%@=U&Mniq*u+mJa`bcve7vE4E73W(X&c_N@;R@|bbi7>%!wkCqaw2mu{*`L);OOkRj3y(HR-nz$uZ`zy}*xmo91bp*BH^iv+mz@ z7((KOi>)jAofaS5HcptSFI#XGN= zm1!BCIk3%{#2jO#QB@=Ex~<#4GImFj_Ad?UvU8=0SL8`C=EiX!8Uf2qX8J!qi^{!A zO0RB8NxT*v=){$=yM4vRX5x=f=Ah&RMKJ&eI0Oj{zk03wj#m>CMcz8dW~NF;RJ#X% zR-U1$x+C86{SsK}WpK1$3gf*BK#3fLZq;hrbr>l3e3~FamQkdgO(EHc3`4NGja?E2 z@DD=rN=m5;{yB~?gBE9lZUTf+_$&(aaGpsA%1Gvi(8t8^cnvBp>k^1SG39Yg+zBs-2@wS$C-o)W-tbC-&jFUipn#4%w z=JViYyF}P)-1RgTHQ5%e@xW# zaUbh~ezM^#^w1b{a6&-^|Eyg#g8T%%pUMITS$jcp&%l)|QO(Ym+}lWo{BW z@%JI5^<6nQpp_SfUfY~Ge70U^a1B8HJmr2O-b$4F+10_AY@HC#x7n-;HU{-qCLXHp z)Fb*EKY?3L$v2?AkGI=S$(KIa3ON|cX)?_+7X?0z&A*DhI`dmA)2ome-a1<$hDu?e z+#hNpx^Fz6^RjvJs(CVNdh(e4S8m45NpiCxD|#p-xTF&SexjUUkFovYEhm6Dw})g8 z1}By~5SjH_?ro@Kz^pnS=QnQx5#MJGl>5Kb2g4aelZb0wi#~OZ9wHQTh2|6k z*PizCT`=W_x(wdFMfoX(o9d67>}NTVjy}kFK6Te7N4!F@T>xAiU92@=g>UjXQT$~WTpqY(U-$XB?Z5441Qkx@Yr*`62<0cVxi3Ab8m|n^k#h2R{V?&BrZSw_!9b7g z&ePeyFM)xr8gcAL(~TGGy)s44*vM_LEnx_ zV8FxQbwx#nN zj(?CUfdRn-JfS>*9MjJAvBZ&~A7a`uz*6{O@|z6kK=R)pd)LS$;xKdu0Lm7fKwg1#?W4S73E?S=Fdm>&owr!pp2 z=dDA5`}<$j&hEaR-M$GPAHI!{0`gomQ^(c5K2@Ag)9{wI+AMQKz}bt>!OWDDaHfmW zb!0t#Qk1fMkU=im=gvKCRVbS=uC{DxKw8=xzfK!p?=%N3dSxSu0csGyu=~OkG?PSX z*STP+g6*GIO$H9zzB>165-fQLc%&F{!TYzq&I$i_U)u;~Qona@bRxbzs-u~|U#m9E zttOgD3xpZ;82aT^JSqG*bR;{sQA7Aqdws{r<$k_jx_0D(4j+}WrvcVgoGT2(QWf;i~Sm*(;qA0X(Puk1?6I5(*b4h%jBBDmEi17s*KV!kn+?J5a| zWD!e1{LE{A8|yZ6;l>NfCbewPK=*N7wOPx%`16YTZ50y5^Ka7qTm%5{cL@K-PU)|z;Ksc zM5ef6EIL~p+_o_!#$MRZ4Zz~Rq!%&72NV(#MtXzL*b@t&HaQ&4l}ZjzPvI)&8^9Hu zosZw6_N>kN3z83+@KD|w*bDLBEka=VI}Cx8$m9SYMW$rf{js;&+==@Op=M+^SY7y} z6)SM+K&kz`j@Ojj0s?_{%O$NFOc>M60id;!^KGL!#4&7OK;Hti@}@ji8Xy+}?TK6a zn&IaQWD1>z+cw-0YPCnoWL8*m!p2rl5d2O(MOgoz%$AIniZbmJ0n zx?AnPeRrn2La?55y1dAIgBpG0|2vLntlN$ovgeS`K`LVi~;P2Y%GnhgVZ`; zm8M=o6QkB+E2>J@{LA?87$?F%)eWZ+~kDpP4c>r!1ZYGUz^pLR}LOM@vZC2|!X+=5Wl{X~Gjf+uX z<`3x4#R)`#Ql#<$-c$1W3dZ*3EC)K^EIKEr-IWt47_+PEd)us&0|v0#u0Vf100_o^ z<<;pTH9J^>NI_G#*%Unubb^Kz06 z?0N8Bebtwi*Ygx}4m|w|0N@y#ua)opjh&-wKs1ind0J~&R}^VuSR!eSE6>8c4%%m& zVvK2L;;wp8u1roO99&`~!MuiWd})o>QK#34@ZRwwL&FZ0q}xA_F(ntsrJu@6wr1a( zfPUG%f-&e#zjG7q5;$; zErN9$2u0}u?VN!?Ue219N1sg2V#D`)JsCXBqQ6j_sm%F#-m;^wiV{NDitizt*}S+~Toqf? z^d>&NE0)%Ev-TUqKVH~5G!V+{en_u3fpGlTATTm=CVsT`j2>`zK71)di{HOLa`8AJ z6FOk??Pm;xqy-K7czjT#1*>mP_j>G3$H92T*)=^xS3L=Yx`BSDiP=p>w|_i^C)7AO zNCOoTb{V_dv~_`l9e*f1=YX?MWVY@my4jyt&GeA{Z$i{tmWiwdyF_7bVzy1Qz0Nkp zi?vGGk(J_sJX2JY4{|S^udX7vk~3~AV2<_N0(w%^&{R%hy$C-CJ10}!;)WA?TIugAY}YYHn=#ex|lamns( zs9`&K;F?3;%{9fm$qL_zG~<+siC5s3M-YJJOFZIr#ZM3{@HvK&B$uxPtr&rl^v!?) zDCv#&k|-FBq1NG0_yZ3MnSb(DEkTakU?6;2KoQsQQ<^g(+t6(i(-pc>nS}kZp{dXG zSCpZ_IzPQ@cZJYa&FovtW7lu;;lPlZ-Q<8Pf6u$8@fl?$ z-xX0BxETshX)b+3dg_@%tG~Q`nu3VP?j4vGu|y)6?vY|Iw50;71cY6|Z`Tu2!vqop=)e=^g}a)YGsDUi*33t|rUod(_+J7=|EF}&5J)Jd9(oM9fi8DNpwyx;JfSr;K>Q-O9 z^vQW`-Sle77(I&`^lxV(PAeBB4HAME-(MJBZC>k;FZQ0ER~&f7GK1VGzQ@JLDZf>v z;<7N|e^gfpkYOLwFa6faH&&q!Sz@jstMQ$MtUzC=C=YN>=4BC(3vSWn1}5UASa>`y zXJ28Xu)pT8+lY(vfFh_BV^YcsqN)}QxlL>+-EWnONzw?2=KR?qWqa(7V1r0C=7s0K z@NQZLw-d+VFZVIrD4$CSbCbo^r98AjNG9dVWQ7wFDB!xu((24{z1)TfWm#Cyye$uh zqQ**!uhi;6l3-(UFLyCzW@A;5pN&5!QxW!6Pwx-i?hcv8Y46ag%SN9276Mye^z6+- zw^AyntF%|}w(9xX2W4Owc5z}U*{~x_t{AE)GYyoKFgG`xAEEFYgIRq=8Wis^*l8_e z(MyLD5w>YsY{&VzGRJ@a@aUZG91?k6XX^|kh>K$vY1mW6sa0@B7fvwV72k~SHnoGG zDPQu|gD3HRMS(Ap9~@YAV=XhV(H@hk!(jt*X%#MusTjDZ5ISlDF2m=8Smg^aQG6Fa z<|@E98M(=3Kcr=K^>m4xG$lyArp)A92@Jp-ewHv%h6j?>IY_WULGQJxo7&f$Tg$#N zHhGZ{yZHOGy0Xq#J2HQKg9(uZCKI|QRcuuR8S-V%=_bF+{x@>>Wf`Tr_hSIguKw9k6PJR5ifWC_u<*p z@wi1P!kuG73zI~^7ani}Ma)z_!(e)swmg_r{?+&5ce{Upy#qu3<{YU z=Uw?dDaM%V2`+;J%e;Woy>I2SvXUWo!p+>-Pk;U5A#_0xgjIz z*QT53*WnicVCs2pT<^CSeJX7-_PTQqY=RYVk<)o|leweTE~h5Gpii++If%;_%wmi7V4~+pQ8V5y4sW8mqhL#_AdyIs zU7dDp2bpg})ciq_%$ISC;YEJJ`{`n=wuUsARLs&8Z2ajy+)n>`oQ$RAZ- z0zMg8?UDaD_a82Mu|*GXdY3j40zc9^^(5MN)OO$G_|7#H01pzJU-n)|8+%|vtV{Hd z!!7p;xbwUlBd+V%e?HEX<|VV9wliWqEW&@jZ4ND)IbNJ-erFxCWgcenFCD2Ulu-Ix zw|WcQ1}IG%j`O#tSS2Ucl?gEn&b23hxggkI$pI3HOq^q#9Mumky#ZK{xVQ^;wW)ae zXZ%u#7_nd#;?)75`;8@h16>tP5Mb>=+#X^_#(!Mj!MT($p7!Z#@bnzdryk{%f3;tE z>bw~2mdoq1*|7PAQ5_IR9FXY2YY-EB@z56vXP0{lys5o0bbG(YqBPgJe{A+9*Ltip zkQD_bZ6blKuguFZpblnij}>+>2jv=GK3p7Ikc5Qb=T6rAQj&zKKWYcC?XKC8J#V=46NwK#M~d_DVqt7pxV@G!CU{pAcR#Fq#oK z&kz8|J?<3;9J`KQUk2wUn8%mRXFd|*pnAt#EDSp|Mm_G{R=VzqSY?gKZ+oSE^z+n+ z{a+L~cWa^%#6I9Vd%1@sE*|ytlGyxXh zYOhqdFN@Hmfxi)}>3Itz-mB%PjU&i5%OCTa?2z{_%t?|P&Q(;W6eEL7r4zx;Wg)fQ z^e*1oEAQ6js)2#qhjQV}Ev_MQf0IEU9IH30la?41_(lr@pG^{|iPv*WWRnH;+()(B=W~tzeZCd$% zNB$i;T%-Qd`v30zZ}q<;{_hG8@c*WNYyN5~{{Qm7KB@n^(^QiCUfYQ_;NqilHk}}S Q0{{SkplgCF!#IZj9|Om`00000 From 7f614c0c5ee5dea957b515c2c3ed9aff2241be98 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 23 Feb 2017 11:58:18 +0100 Subject: [PATCH 118/144] Improving sample_data --- taiga/projects/management/commands/sample_data.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/taiga/projects/management/commands/sample_data.py b/taiga/projects/management/commands/sample_data.py index 14ff7663..2d886c5f 100644 --- a/taiga/projects/management/commands/sample_data.py +++ b/taiga/projects/management/commands/sample_data.py @@ -178,6 +178,9 @@ class Command(BaseCommand): if role.computable: computable_project_roles.add(role) + # Delete a random member so all the projects doesn't have the same team + Membership.objects.filter(project=project).exclude(user=project.owner).order_by("?").first().delete() + # added invitations for i in range(NUM_INVITATIONS): role = self.sd.db_object_from_queryset(project.roles.all()) From d1a9d5881312d14c72b2793fc8771af08359d9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 23 Feb 2017 12:15:22 +0100 Subject: [PATCH 119/144] Fixed privacy, is_looking_for_people and is_featured on sample data --- taiga/projects/management/commands/sample_data.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/taiga/projects/management/commands/sample_data.py b/taiga/projects/management/commands/sample_data.py index 2d886c5f..0026ac5b 100644 --- a/taiga/projects/management/commands/sample_data.py +++ b/taiga/projects/management/commands/sample_data.py @@ -157,7 +157,7 @@ class Command(BaseCommand): for x in projects_range: project = self.create_project( x, - is_private=(x in [2, 4] or self.sd.boolean()), + is_private=x in [2, 4], blocked_code = BLOCKED_BY_STAFF if x in(blocked_projects_range) else None ) @@ -584,11 +584,12 @@ class Command(BaseCommand): total_story_points=self.sd.int(600, 3000), total_milestones=self.sd.int(5,10), tags=self.sd.words(1, 10).split(" "), - is_looking_for_people=counter in LOOKING_FOR_PEOPLE_PROJECTS_POSITIONS, - looking_for_people_note=self.sd.short_sentence(), - is_featured=counter in FEATURED_PROJECTS_POSITIONS, blocked_code=blocked_code) + project.is_looking_for_people = counter in LOOKING_FOR_PEOPLE_PROJECTS_POSITIONS + if project.is_looking_for_people: + project.looking_for_people_note = self.sd.short_sentence() + project.is_featured = counter in FEATURED_PROJECTS_POSITIONS project.is_kanban_activated = True project.is_epics_activated = True project.save() From 7463eab3c9fa1bf37b65d2781801e6923fe6e464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 23 Feb 2017 19:29:12 +0100 Subject: [PATCH 120/144] Add missed __init__ files to prevent celery erros during the autodiscover tasks process --- taiga/importers/__init__.py | 0 taiga/projects/contact/__init__.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 taiga/importers/__init__.py create mode 100644 taiga/projects/contact/__init__.py diff --git a/taiga/importers/__init__.py b/taiga/importers/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/taiga/projects/contact/__init__.py b/taiga/projects/contact/__init__.py new file mode 100644 index 00000000..e69de29b From c5cb31521f53dc5d61cbeb4f50172279c6051769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 27 Feb 2017 16:14:51 +0100 Subject: [PATCH 121/144] Remove line braks --- settings/common.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/settings/common.py b/settings/common.py index 8aaa5b16..f5c02101 100644 --- a/settings/common.py +++ b/settings/common.py @@ -475,8 +475,6 @@ SOUTH_MIGRATION_MODULES = { } - - THN_AVATAR_SIZE = 80 # 80x80 pixels THN_AVATAR_BIG_SIZE = 300 # 300x300 pixels THN_LOGO_SMALL_SIZE = 80 # 80x80 pixels From 1879cb76ae18390864dc382ac589c76c485d56aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 27 Feb 2017 16:15:13 +0100 Subject: [PATCH 122/144] Fix celery settings --- settings/celery.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/settings/celery.py b/settings/celery.py index 5d876a18..8001a19c 100644 --- a/settings/celery.py +++ b/settings/celery.py @@ -21,6 +21,8 @@ from kombu import Exchange, Queue BROKER_URL = 'amqp://guest:guest@localhost:5672//' CELERY_RESULT_BACKEND = 'redis://localhost:6379/0' +CELERY_ACCEPT_CONTENT = ['pickle',] # Values are 'pickle', 'json', 'msgpack' and 'yaml' + CELERY_TIMEZONE = 'Europe/Madrid' CELERY_ENABLE_UTC = True From 41072313401c092d115eb8ae98f2327854b031e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 27 Feb 2017 16:15:25 +0100 Subject: [PATCH 123/144] Fix a typo --- taiga/importers/github/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taiga/importers/github/tasks.py b/taiga/importers/github/tasks.py index 11796d84..001ccfd3 100644 --- a/taiga/importers/github/tasks.py +++ b/taiga/importers/github/tasks.py @@ -31,7 +31,7 @@ logger = logging.getLogger('taiga.importers.github') @app.task(bind=True) def import_project(self, user_id, token, project_id, options): - user = User.object.get(id=user_id) + user = User.objects.get(id=user_id) importer = GithubImporter(user, token) try: project = importer.import_project(project_id, options) From 0244a39475a47ad7de385604aed1aacdcf48065a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 27 Feb 2017 16:48:49 +0100 Subject: [PATCH 124/144] Adding import finished emails, and fixed tasks from the importer --- taiga/importers/asana/tasks.py | 4 ++-- taiga/importers/github/tasks.py | 2 +- taiga/importers/jira/tasks.py | 4 ++-- taiga/importers/pivotal/tasks.py | 2 +- taiga/importers/services.py | 13 +++++++++---- .../emails/asana_import_success-body-html.jinja | 11 +++++++++++ .../emails/asana_import_success-body-text.jinja | 12 ++++++++++++ .../emails/asana_import_success-subject.jinja | 1 + .../emails/github_import_success-body-html.jinja | 11 +++++++++++ .../emails/github_import_success-body-text.jinja | 12 ++++++++++++ .../emails/github_import_success-subject.jinja | 1 + .../emails/importer_import_error-body-html.jinja | 12 ++++++++++++ .../emails/importer_import_error-body-text.jinja | 14 ++++++++++++++ .../emails/importer_import_error-subject.jinja | 1 + .../emails/jira_import_success-body-html.jinja | 11 +++++++++++ .../emails/jira_import_success-body-text.jinja | 12 ++++++++++++ .../emails/jira_import_success-subject.jinja | 1 + .../emails/trello_import_success-body-html.jinja | 11 +++++++++++ .../emails/trello_import_success-body-text.jinja | 12 ++++++++++++ .../emails/trello_import_success-subject.jinja | 1 + taiga/importers/trello/tasks.py | 4 ++-- 21 files changed, 140 insertions(+), 12 deletions(-) create mode 100644 taiga/importers/templates/emails/asana_import_success-body-html.jinja create mode 100644 taiga/importers/templates/emails/asana_import_success-body-text.jinja create mode 100644 taiga/importers/templates/emails/asana_import_success-subject.jinja create mode 100644 taiga/importers/templates/emails/github_import_success-body-html.jinja create mode 100644 taiga/importers/templates/emails/github_import_success-body-text.jinja create mode 100644 taiga/importers/templates/emails/github_import_success-subject.jinja create mode 100644 taiga/importers/templates/emails/importer_import_error-body-html.jinja create mode 100644 taiga/importers/templates/emails/importer_import_error-body-text.jinja create mode 100644 taiga/importers/templates/emails/importer_import_error-subject.jinja create mode 100644 taiga/importers/templates/emails/jira_import_success-body-html.jinja create mode 100644 taiga/importers/templates/emails/jira_import_success-body-text.jinja create mode 100644 taiga/importers/templates/emails/jira_import_success-subject.jinja create mode 100644 taiga/importers/templates/emails/trello_import_success-body-html.jinja create mode 100644 taiga/importers/templates/emails/trello_import_success-body-text.jinja create mode 100644 taiga/importers/templates/emails/trello_import_success-subject.jinja diff --git a/taiga/importers/asana/tasks.py b/taiga/importers/asana/tasks.py index 0f81f4de..b294c661 100644 --- a/taiga/importers/asana/tasks.py +++ b/taiga/importers/asana/tasks.py @@ -31,7 +31,7 @@ logger = logging.getLogger('taiga.importers.asana') @app.task(bind=True) def import_project(self, user_id, token, project_id, options): - user = User.object.get(id=user_id) + user = User.objects.get(id=user_id) importer = AsanaImporter(user, token) try: project = importer.import_project(project_id, options) @@ -44,7 +44,7 @@ def import_project(self, user_id, token, project_id, options): "project": project_id, "exception": e } - email = mail_builder.asana_import_error(admin, ctx) + email = mail_builder.importer_import_error(admin, ctx) email.send() logger.error('Error importing Asana project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: diff --git a/taiga/importers/github/tasks.py b/taiga/importers/github/tasks.py index 001ccfd3..6af268ee 100644 --- a/taiga/importers/github/tasks.py +++ b/taiga/importers/github/tasks.py @@ -44,7 +44,7 @@ def import_project(self, user_id, token, project_id, options): "project": project_id, "exception": e } - email = mail_builder.github_import_error(admin, ctx) + email = mail_builder.importer_import_error(admin, ctx) email.send() logger.error('Error importing GitHub project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: diff --git a/taiga/importers/jira/tasks.py b/taiga/importers/jira/tasks.py index 6e9e50db..3be81380 100644 --- a/taiga/importers/jira/tasks.py +++ b/taiga/importers/jira/tasks.py @@ -31,7 +31,7 @@ logger = logging.getLogger('taiga.importers.jira') @app.task(bind=True) def import_project(self, user_id, url, token, project_id, options, importer_type): - user = User.object.get(id=user_id) + user = User.objects.get(id=user_id) if importer_type == "agile": importer = JiraAgileImporter(user, url, token) @@ -49,7 +49,7 @@ def import_project(self, user_id, url, token, project_id, options, importer_type "project": project_id, "exception": e } - email = mail_builder.jira_import_error(admin, ctx) + email = mail_builder.importer_import_error(admin, ctx) email.send() logger.error('Error importing Jira project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: diff --git a/taiga/importers/pivotal/tasks.py b/taiga/importers/pivotal/tasks.py index fe6a3919..9435e54e 100644 --- a/taiga/importers/pivotal/tasks.py +++ b/taiga/importers/pivotal/tasks.py @@ -44,7 +44,7 @@ def import_project(self, user_id, token, project_id, options): "project": project_id, "exception": e } - email = mail_builder.pivotal_import_error(admin, ctx) + email = mail_builder.importer_import_error(admin, ctx) email.send() logger.error('Error importing PivotalTracker project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: diff --git a/taiga/importers/services.py b/taiga/importers/services.py index 4817c049..402120df 100644 --- a/taiga/importers/services.py +++ b/taiga/importers/services.py @@ -4,13 +4,18 @@ from taiga.users.models import User def resolve_users_bindings(users_bindings): new_users_bindings = {} for key,value in users_bindings.items(): + try: + user_key = int(key) + except ValueError: + user_key = key + if isinstance(value, str): try: - new_users_bindings[int(key)] = User.objects.get(email_iexact=value) + new_users_bindings[user_key] = User.objects.get(email_iexact=value) except User.MultipleObjectsReturned: - new_users_bindings[int(key)] = User.objects.get(email=value) + new_users_bindings[user_key] = User.objects.get(email=value) except User.DoesNotExists: - new_users_bindings[int(key)] = None + new_users_bindings[user_key] = None else: - new_users_bindings[int(key)] = User.objects.get(id=value) + new_users_bindings[user_key] = User.objects.get(id=value) return new_users_bindings diff --git a/taiga/importers/templates/emails/asana_import_success-body-html.jinja b/taiga/importers/templates/emails/asana_import_success-body-html.jinja new file mode 100644 index 00000000..d14d1cb2 --- /dev/null +++ b/taiga/importers/templates/emails/asana_import_success-body-html.jinja @@ -0,0 +1,11 @@ +{% extends "emails/base-body-html.jinja" %} + +{% block body %} + {% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %} +

    Asana Project imported

    +

    Hello {{ user }},

    +

    Your Asana project has been correctly imported.

    +     Go to {{ project }} +

    The Taiga Team

    + {% endtrans %} +{% endblock %} diff --git a/taiga/importers/templates/emails/asana_import_success-body-text.jinja b/taiga/importers/templates/emails/asana_import_success-body-text.jinja new file mode 100644 index 00000000..a66c54f3 --- /dev/null +++ b/taiga/importers/templates/emails/asana_import_success-body-text.jinja @@ -0,0 +1,12 @@ +{% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %} +Hello {{ user }}, + +Your Asana project has been correctly imported. + +You can see the project {{ project }} here: + +{{ url }} + +--- +The Taiga Team +{% endtrans %} diff --git a/taiga/importers/templates/emails/asana_import_success-subject.jinja b/taiga/importers/templates/emails/asana_import_success-subject.jinja new file mode 100644 index 00000000..57f7766a --- /dev/null +++ b/taiga/importers/templates/emails/asana_import_success-subject.jinja @@ -0,0 +1 @@ +{% trans project=project.name|safe %}[{{ project }}] Your Asana project has been imported{% endtrans %} diff --git a/taiga/importers/templates/emails/github_import_success-body-html.jinja b/taiga/importers/templates/emails/github_import_success-body-html.jinja new file mode 100644 index 00000000..ad2b7e8e --- /dev/null +++ b/taiga/importers/templates/emails/github_import_success-body-html.jinja @@ -0,0 +1,11 @@ +{% extends "emails/base-body-html.jinja" %} + +{% block body %} + {% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %} +

    Github Project imported

    +

    Hello {{ user }},

    +

    Your Github project has been correctly imported.

    + Go to {{ project }} +

    The Taiga Team

    + {% endtrans %} +{% endblock %} diff --git a/taiga/importers/templates/emails/github_import_success-body-text.jinja b/taiga/importers/templates/emails/github_import_success-body-text.jinja new file mode 100644 index 00000000..0b176e58 --- /dev/null +++ b/taiga/importers/templates/emails/github_import_success-body-text.jinja @@ -0,0 +1,12 @@ +{% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %} +Hello {{ user }}, + +Your Github project has been correctly imported. + +You can see the project {{ project }} here: + +{{ url }} + +--- +The Taiga Team +{% endtrans %} diff --git a/taiga/importers/templates/emails/github_import_success-subject.jinja b/taiga/importers/templates/emails/github_import_success-subject.jinja new file mode 100644 index 00000000..cb730163 --- /dev/null +++ b/taiga/importers/templates/emails/github_import_success-subject.jinja @@ -0,0 +1 @@ +{% trans project=project.name|safe %}[{{ project }}] Your Github project has been imported{% endtrans %} diff --git a/taiga/importers/templates/emails/importer_import_error-body-html.jinja b/taiga/importers/templates/emails/importer_import_error-body-html.jinja new file mode 100644 index 00000000..52afe388 --- /dev/null +++ b/taiga/importers/templates/emails/importer_import_error-body-html.jinja @@ -0,0 +1,12 @@ +{% extends "emails/base-body-html.jinja" %} + +{% block body %} + {% trans user=user.get_full_name(), error_message=error_message, support_email=sr("support.email") %} +

    {{ error_message }}

    +

    Hello {{ user }},

    +

    Your project has not been importer correctly.

    +

    The Taiga system administrators have been informed.
    Please, try it again or contact with the support team at + {{ support_email }}

    +

    The Taiga Team

    + {% endtrans %} +{% endblock %} diff --git a/taiga/importers/templates/emails/importer_import_error-body-text.jinja b/taiga/importers/templates/emails/importer_import_error-body-text.jinja new file mode 100644 index 00000000..7a9d782e --- /dev/null +++ b/taiga/importers/templates/emails/importer_import_error-body-text.jinja @@ -0,0 +1,14 @@ +{% trans user=user.get_full_name(), error_message=error_message, support_email=sr("support.email") %} +Hello {{ user }}, + +{{ error_message }} + +Your project has not been importer correctly. + +The Taiga system administrators have been informed. + +Please, try it again or contact with the support team at {{ support_email }} + +--- +The Taiga Team +{% endtrans %} diff --git a/taiga/importers/templates/emails/importer_import_error-subject.jinja b/taiga/importers/templates/emails/importer_import_error-subject.jinja new file mode 100644 index 00000000..329983d4 --- /dev/null +++ b/taiga/importers/templates/emails/importer_import_error-subject.jinja @@ -0,0 +1 @@ +{% trans error_subject=error_subject|safe %}[Taiga] {{ error_subject }}{% endtrans %} diff --git a/taiga/importers/templates/emails/jira_import_success-body-html.jinja b/taiga/importers/templates/emails/jira_import_success-body-html.jinja new file mode 100644 index 00000000..51da9de9 --- /dev/null +++ b/taiga/importers/templates/emails/jira_import_success-body-html.jinja @@ -0,0 +1,11 @@ +{% extends "emails/base-body-html.jinja" %} + +{% block body %} + {% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %} +

    Jira Project imported

    +

    Hello {{ user }},

    +

    Your Jira project has been correctly imported.

    + Go to {{ project }} +

    The Taiga Team

    + {% endtrans %} +{% endblock %} diff --git a/taiga/importers/templates/emails/jira_import_success-body-text.jinja b/taiga/importers/templates/emails/jira_import_success-body-text.jinja new file mode 100644 index 00000000..b2b04ffe --- /dev/null +++ b/taiga/importers/templates/emails/jira_import_success-body-text.jinja @@ -0,0 +1,12 @@ +{% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %} +Hello {{ user }}, + +Your Jira project has been correctly imported. + +You can see the project {{ project }} here: + +{{ url }} + +--- +The Taiga Team +{% endtrans %} diff --git a/taiga/importers/templates/emails/jira_import_success-subject.jinja b/taiga/importers/templates/emails/jira_import_success-subject.jinja new file mode 100644 index 00000000..406abc00 --- /dev/null +++ b/taiga/importers/templates/emails/jira_import_success-subject.jinja @@ -0,0 +1 @@ +{% trans project=project.name|safe %}[{{ project }}] Your Jira project has been imported{% endtrans %} diff --git a/taiga/importers/templates/emails/trello_import_success-body-html.jinja b/taiga/importers/templates/emails/trello_import_success-body-html.jinja new file mode 100644 index 00000000..d154666b --- /dev/null +++ b/taiga/importers/templates/emails/trello_import_success-body-html.jinja @@ -0,0 +1,11 @@ +{% extends "emails/base-body-html.jinja" %} + +{% block body %} + {% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %} +

    Trello Project imported

    +

    Hello {{ user }},

    +

    Your Trello project has been correctly imported.

    + Go to {{ project }} +

    The Taiga Team

    + {% endtrans %} +{% endblock %} diff --git a/taiga/importers/templates/emails/trello_import_success-body-text.jinja b/taiga/importers/templates/emails/trello_import_success-body-text.jinja new file mode 100644 index 00000000..9faf38b6 --- /dev/null +++ b/taiga/importers/templates/emails/trello_import_success-body-text.jinja @@ -0,0 +1,12 @@ +{% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %} +Hello {{ user }}, + +Your Trello project has been correctly imported. + +You can see the project {{ project }} here: + +{{ url }} + +--- +The Taiga Team +{% endtrans %} diff --git a/taiga/importers/templates/emails/trello_import_success-subject.jinja b/taiga/importers/templates/emails/trello_import_success-subject.jinja new file mode 100644 index 00000000..2e86948c --- /dev/null +++ b/taiga/importers/templates/emails/trello_import_success-subject.jinja @@ -0,0 +1 @@ +{% trans project=project.name|safe %}[{{ project }}] Your Trello project has been imported{% endtrans %} diff --git a/taiga/importers/trello/tasks.py b/taiga/importers/trello/tasks.py index 0d710f46..f93f7441 100644 --- a/taiga/importers/trello/tasks.py +++ b/taiga/importers/trello/tasks.py @@ -31,7 +31,7 @@ logger = logging.getLogger('taiga.importers.trello') @app.task(bind=True) def import_project(self, user_id, token, project_id, options): - user = User.object.get(id=user_id) + user = User.objects.get(id=user_id) importer = TrelloImporter(user, token) try: project = importer.import_project(project_id, options) @@ -44,7 +44,7 @@ def import_project(self, user_id, token, project_id, options): "project": project_id, "exception": e } - email = mail_builder.trello_import_error(admin, ctx) + email = mail_builder.importer_import_error(admin, ctx) email.send() logger.error('Error importing Trello project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: From 6bdbf7c10648b5cda6fc070d93ebc6c6594714ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 28 Feb 2017 08:02:00 +0100 Subject: [PATCH 125/144] Fixes on jira importer async version --- taiga/importers/jira/common.py | 12 ++++++++---- taiga/importers/jira/tasks.py | 3 ++- taiga/importers/trello/tasks.py | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/taiga/importers/jira/common.py b/taiga/importers/jira/common.py index 1448deeb..92d5a6df 100644 --- a/taiga/importers/jira/common.py +++ b/taiga/importers/jira/common.py @@ -155,12 +155,16 @@ class JiraImporterCommon: self._client = JiraClient(server=server, oauth=oauth) def resolve_user_bindings(self, options): - for option in list(options['users_bindings'].keys()): + def resolve_user(user_id): + if isinstance(user_id, User): + return user_id try: - user = User.objects.get(id=options['users_bindings'][option]) - options['users_bindings'][option] = user + user = User.objects.get(id=user_id) + return user except User.DoesNotExist: - del(options['users_bindings'][option]) + return None + + options['users_bindings'] = {k: resolve_user(v) for k,v in options['users_bindings'].items() if v is not None} def list_users(self): result = [] diff --git a/taiga/importers/jira/tasks.py b/taiga/importers/jira/tasks.py index 3be81380..01a4c30c 100644 --- a/taiga/importers/jira/tasks.py +++ b/taiga/importers/jira/tasks.py @@ -25,6 +25,7 @@ from taiga.base.mails import mail_builder from taiga.users.models import User from taiga.celery import app from .normal import JiraNormalImporter +from .agile import JiraAgileImporter logger = logging.getLogger('taiga.importers.jira') @@ -49,7 +50,7 @@ def import_project(self, user_id, url, token, project_id, options, importer_type "project": project_id, "exception": e } - email = mail_builder.importer_import_error(admin, ctx) + email = mail_builder.importer_import_error(user, ctx) email.send() logger.error('Error importing Jira project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: diff --git a/taiga/importers/trello/tasks.py b/taiga/importers/trello/tasks.py index f93f7441..770aecab 100644 --- a/taiga/importers/trello/tasks.py +++ b/taiga/importers/trello/tasks.py @@ -44,7 +44,7 @@ def import_project(self, user_id, token, project_id, options): "project": project_id, "exception": e } - email = mail_builder.importer_import_error(admin, ctx) + email = mail_builder.importer_import_error(user, ctx) email.send() logger.error('Error importing Trello project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: From 687eccf462c0e0a1e4970701aad45e504e69dd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 28 Feb 2017 08:06:28 +0100 Subject: [PATCH 126/144] Removing debug lines in jira importer --- taiga/importers/jira/common.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/taiga/importers/jira/common.py b/taiga/importers/jira/common.py index 92d5a6df..553025d5 100644 --- a/taiga/importers/jira/common.py +++ b/taiga/importers/jira/common.py @@ -394,8 +394,6 @@ class JiraImporterCommon: custom_attributes_values = {} for custom_field in self.custom_fields: - if issue['key'] == "PS-10": - import pprint; pprint.pprint(issue['fields']) data = issue['fields'].get(custom_field['jira_field_name'], None) if data and "transform" in custom_field: data = custom_field['transform'](issue, data) @@ -693,8 +691,6 @@ class JiraImporterCommon: "id": field_obj.id }] has_data = True - else: - import pprint; pprint.pprint(history_item) if not has_data: return None From 7019de8f0d3ad78b32ed6f4bdb52d0c1ce7ad369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 1 Mar 2017 17:12:38 +0100 Subject: [PATCH 127/144] Updated the badges to use shields.io --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c5d46e28..16f2e495 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ # Taiga Backend # -![Kaleidos Project](http://kaleidos.net/static/img/badge.png "Kaleidos Project") -[![Managed with Taiga.io](https://tree.taiga.io/support/images/taiga-badge-gh.png)](https://taiga.io "Managed with Taiga.io") -[![Build Status](https://travis-ci.org/taigaio/taiga-back.svg?branch=master)](https://travis-ci.org/taigaio/taiga-back "Build Status") -[![Coverage Status](https://coveralls.io/repos/taigaio/taiga-back/badge.svg?branch=master)](https://coveralls.io/r/taigaio/taiga-back?branch=master "Coverage Status") -[![Dependency Status](https://www.versioneye.com/user/projects/561bd091a193340f32001464/badge.svg?style=flat)](https://www.versioneye.com/user/projects/561bd091a193340f32001464) +![Kaleidos Project](http://kaleidos.net/static/img/badge.svg "Kaleidos Project") +[![Managed with Taiga.io](https://img.shields.io/badge/managed%20with-TAIGA.io-709f14.svg)](https://tree.taiga.io/project/taiga/ "Managed with Taiga.io") +[![Build Status](https://img.shields.io/travis/taigaio/taiga-back.svg)](https://travis-ci.org/taigaio/taiga-back "Build Status") +[![Coverage Status](https://img.shields.io/coveralls/taigaio/taiga-back/master.svg)](https://coveralls.io/r/taigaio/taiga-back?branch=master "Coverage Status") ## Contribute to Taiga ## From 8dfcbe4006417cb7787c7c75318de353890c4c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 28 Feb 2017 16:56:07 +0100 Subject: [PATCH 128/144] Added common throttle for all the API --- settings/common.py | 10 +- settings/testing.py | 6 +- taiga/base/api/settings.py | 1 + taiga/base/throttling.py | 131 +++++++++++++ tests/integration/test_throwttling.py | 33 ++-- tests/unit/test_common_throttle.py | 265 ++++++++++++++++++++++++++ 6 files changed, 423 insertions(+), 23 deletions(-) create mode 100644 tests/unit/test_common_throttle.py diff --git a/settings/common.py b/settings/common.py index f5c02101..ed6b3939 100644 --- a/settings/common.py +++ b/settings/common.py @@ -433,12 +433,13 @@ REST_FRAMEWORK = { "taiga.external_apps.auth_backends.Token", ), "DEFAULT_THROTTLE_CLASSES": ( - "taiga.base.throttling.AnonRateThrottle", - "taiga.base.throttling.UserRateThrottle" + "taiga.base.throttling.CommonThrottle", ), "DEFAULT_THROTTLE_RATES": { - "anon": None, - "user": None, + "anon-write": None, + "user-write": None, + "anon-read": None, + "user-read": None, "import-mode": None, "import-dump-mode": "1/minute", "create-memberships": None, @@ -446,6 +447,7 @@ REST_FRAMEWORK = { "register-success": None, "user-detail": None, }, + "DEFAULT_THROTTLE_WHITELIST": [], "FILTER_BACKEND": "taiga.base.filters.FilterBackend", "EXCEPTION_HANDLER": "taiga.base.exceptions.exception_handler", "PAGINATE_BY": 30, diff --git a/settings/testing.py b/settings/testing.py index 13e2b434..e3f565e2 100644 --- a/settings/testing.py +++ b/settings/testing.py @@ -29,8 +29,10 @@ INSTALLED_APPS = INSTALLED_APPS + [ ] REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"] = { - "anon": None, - "user": None, + "anon-write": None, + "anon-read": None, + "user-write": None, + "user-read": None, "import-mode": None, "import-dump-mode": None, "create-memberships": None, diff --git a/taiga/base/api/settings.py b/taiga/base/api/settings.py index 680e0390..afd1c33b 100644 --- a/taiga/base/api/settings.py +++ b/taiga/base/api/settings.py @@ -106,6 +106,7 @@ DEFAULTS = { "user": None, "anon": None, }, + "DEFAULT_THROTTLE_WHITELIST": [], # Pagination "PAGINATE_BY": None, diff --git a/taiga/base/throttling.py b/taiga/base/throttling.py index b5a4903d..329c7441 100644 --- a/taiga/base/throttling.py +++ b/taiga/base/throttling.py @@ -17,6 +17,7 @@ # along with this program. If not, see . from taiga.base.api import throttling +from django.conf import settings class GlobalThrottlingMixin: @@ -57,5 +58,135 @@ class UserRateThrottle(throttling.UserRateThrottle): scope = "user" +class CommonThrottle(throttling.SimpleRateThrottle): + cache_format = "throtte_%(scope)s_%(rate)s_%(ident)s" + + def __init__(self): + pass + + def has_to_finalize(self, request, response, view): + return False + + def allow_request(self, request, view): + scope = self.get_scope(request) + ident = self.get_ident(request) + rates = self.get_rates(scope) + if ident in settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST']: + return True + + if rates is None or rates == []: + return True + + now = self.timer() + + waits = [] + history_writes = [] + + for rate in rates: + rate_name = rate[0] + rate_num_requests = rate[1] + rate_duration = rate[2] + + key = self.get_cache_key(ident, scope, rate_name) + history = self.cache.get(key, []) + + while history and history[-1] <= now - rate_duration: + history.pop() + + if len(history) >= rate_num_requests: + waits.append(self.wait_time(history, rate, now)) + + history_writes.append({ + "key": key, + "history": history, + "rate_duration": rate_duration, + }) + + if waits: + self._wait = max(waits) + return False + + for history_write in history_writes: + history_write['history'].insert(0, now) + self.cache.set( + history_write['key'], + history_write['history'], + history_write['rate_duration'] + ) + return True + + def get_rates(self, scope): + try: + rates = self.THROTTLE_RATES[scope] + except KeyError: + msg = "No default throttle rate set for \"%s\" scope" % scope + raise ImproperlyConfigured(msg) + + if rates is None: + return [] + elif isinstance(rates, str): + return [self.parse_rate(rates)] + elif isinstance(rates, list): + return list(map(self.parse_rate, rates)) + else: + msg = "No valid throttle rate set for \"%s\" scope" % scope + raise ImproperlyConfigured(msg) + + def parse_rate(self, rate): + """ + Given the request rate string, return a two tuple of: + , + """ + if rate is None: + return None + num, period = rate.split("/") + num_requests = int(num) + duration = {"s": 1, "m": 60, "h": 3600, "d": 86400}[period[0]] + return (rate, num_requests, duration) + + def get_scope(self, request): + if request.user.is_authenticated(): + if request.method in ["POST", "PUT", "PATCH", "DELETE"]: + scope = "user-write" + else: + scope = "user-read" + else: + if request.method in ["POST", "PUT", "PATCH", "DELETE"]: + scope = "anon-write" + else: + scope = "anon-read" + return scope + + def get_ident(self, request): + if request.user.is_authenticated(): + ident = request.user.id + else: + ident = request.META.get("HTTP_X_FORWARDED_FOR") + if ident is None: + ident = request.META.get("REMOTE_ADDR") + return ident + + def get_cache_key(self, ident, scope, rate): + return self.cache_format % { "scope": scope, "ident": ident, "rate": rate } + + def wait_time(self, history, rate, now): + rate_num_requests = rate[1] + rate_duration = rate[2] + + if history: + remaining_duration = rate_duration - (now - history[-1]) + else: + remaining_duration = rate_duration + + available_requests = rate_num_requests - len(history) + 1 + if available_requests <= 0: + return remaining_duration + + return remaining_duration / float(available_requests) + + def wait(self): + return self._wait + + class SimpleRateThrottle(throttling.SimpleRateThrottle): pass diff --git a/tests/integration/test_throwttling.py b/tests/integration/test_throwttling.py index 8f9b7976..0f96bb10 100644 --- a/tests/integration/test_throwttling.py +++ b/tests/integration/test_throwttling.py @@ -29,20 +29,15 @@ from .. import factories as f pytestmark = pytest.mark.django_db -anon_rate_path = "taiga.base.throttling.AnonRateThrottle.get_rate" -user_rate_path = "taiga.base.throttling.UserRateThrottle.get_rate" import_rate_path = "taiga.export_import.throttling.ImportModeRateThrottle.get_rate" def test_anonimous_throttling_policy(client, settings): f.create_project() url = reverse("projects-list") + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = "2/min" - with mock.patch(anon_rate_path) as anon_rate, \ - mock.patch(user_rate_path) as user_rate, \ - mock.patch(import_rate_path) as import_rate: - anon_rate.return_value = "2/day" - user_rate.return_value = "4/day" + with mock.patch(import_rate_path) as import_rate: import_rate.return_value = "7/day" cache.clear() @@ -53,19 +48,19 @@ def test_anonimous_throttling_policy(client, settings): response = client.json.get(url) assert response.status_code == 429 + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + cache.clear() + def test_user_throttling_policy(client, settings): project = f.create_project() f.MembershipFactory.create(project=project, user=project.owner, is_admin=True) url = reverse("projects-detail", kwargs={"pk": project.pk}) + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = "4/min" client.login(project.owner) - with mock.patch(anon_rate_path) as anon_rate, \ - mock.patch(user_rate_path) as user_rate, \ - mock.patch(import_rate_path) as import_rate: - anon_rate.return_value = "2/day" - user_rate.return_value = "4/day" + with mock.patch(import_rate_path) as import_rate: import_rate.return_value = "7/day" cache.clear() @@ -81,6 +76,8 @@ def test_user_throttling_policy(client, settings): assert response.status_code == 429 client.logout() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = None + cache.clear() def test_import_mode_throttling_policy(client, settings): @@ -95,14 +92,12 @@ def test_import_mode_throttling_policy(client, settings): data = { "subject": "Test" } + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = "2/min" + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = "4/min" client.login(project.owner) - with mock.patch(anon_rate_path) as anon_rate, \ - mock.patch(user_rate_path) as user_rate, \ - mock.patch(import_rate_path) as import_rate: - anon_rate.return_value = "2/day" - user_rate.return_value = "4/day" + with mock.patch(import_rate_path) as import_rate: import_rate.return_value = "7/day" cache.clear() @@ -124,3 +119,7 @@ def test_import_mode_throttling_policy(client, settings): assert response.status_code == 429 client.logout() + + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = None + cache.clear() diff --git a/tests/unit/test_common_throttle.py b/tests/unit/test_common_throttle.py new file mode 100644 index 00000000..f5586f4d --- /dev/null +++ b/tests/unit/test_common_throttle.py @@ -0,0 +1,265 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.test import RequestFactory +from django.core.cache import cache +from django.contrib.auth.models import AnonymousUser + +from taiga.base.throttling import CommonThrottle +from taiga.users.models import User + + +def test_user_no_write_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-write'] = None + request = rf.post("/test") + request.user = User(id=1) + throttling = CommonThrottle() + for x in range(100): + assert throttling.allow_request(request, None) + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-write'] = None + +def test_user_simple_write_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-write'] = "1/min" + request = rf.post("/test") + request.user = User(id=1) + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-write'] = None + +def test_user_multi_write_first_small_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-write'] = ["1/min", "10/min"] + request = rf.post("/test") + request.user = User(id=1) + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-write'] = None + +def test_user_multi_write_first_big_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-write'] = ["10/min", "1/min"] + request = rf.post("/test") + request.user = User(id=1) + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-write'] = None + +def test_user_no_read_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = None + request = rf.get("/test") + request.user = User(id=1) + throttling = CommonThrottle() + for x in range(100): + assert throttling.allow_request(request, None) + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = None + +def test_user_simple_read_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = "1/min" + request = rf.get("/test") + request.user = User(id=1) + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = None + +def test_user_multi_read_first_small_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = ["1/min", "10/min"] + request = rf.get("/test") + request.user = User(id=1) + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = None + +def test_user_multi_read_first_big_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = ["10/min", "1/min"] + request = rf.get("/test") + request.user = User(id=1) + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = None + +def test_whitelisted_user_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = "1/min" + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = [1] + request = rf.get("/test") + request.user = User(id=1) + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = None + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = [] + +def test_not_whitelisted_user_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = "1/min" + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = [1] + request = rf.get("/test") + request.user = User(id=2) + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user-read'] = None + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = [] + +def test_anon_no_write_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-write'] = None + request = rf.post("/test") + request.user = AnonymousUser() + throttling = CommonThrottle() + for x in range(100): + assert throttling.allow_request(request, None) + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-write'] = None + +def test_anon_simple_write_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-write'] = "1/min" + request = rf.post("/test") + request.user = AnonymousUser() + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-write'] = None + +def test_anon_multi_write_first_small_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-write'] = ["1/min", "10/min"] + request = rf.post("/test") + request.user = AnonymousUser() + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-write'] = None + +def test_anon_multi_write_first_big_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-write'] = ["10/min", "1/min"] + request = rf.post("/test") + request.user = AnonymousUser() + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-write'] = None + +def test_anon_no_read_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + request = rf.get("/test") + request.user = AnonymousUser() + throttling = CommonThrottle() + for x in range(100): + assert throttling.allow_request(request, None) + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + +def test_anon_simple_read_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = "1/min" + request = rf.get("/test") + request.user = AnonymousUser() + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + +def test_anon_multi_read_first_small_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = ["1/min", "10/min"] + request = rf.get("/test") + request.user = AnonymousUser() + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + +def test_anon_multi_read_first_big_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = ["10/min", "1/min"] + request = rf.get("/test") + request.user = AnonymousUser() + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + +def test_whitelisted_anon_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = "1/min" + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = ["127.0.0.1"] + request = rf.get("/test") + request.user = AnonymousUser() + request.META["REMOTE_ADDR"] = "127.0.0.1" + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) + for x in range(100): + assert throttling.allow_request(request, None) + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = [] + +def test_not_whitelisted_anon_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = "1/min" + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = ["127.0.0.1"] + request = rf.get("/test") + request.user = AnonymousUser() + request.META["REMOTE_ADDR"] = "127.0.0.2" + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = [] From 8df7df763c42371f75b30a18963cb33161823cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 2 Mar 2017 07:47:31 +0100 Subject: [PATCH 129/144] Improvements in the throttling code --- taiga/base/throttling.py | 42 ++++++++++++++++-------------- tests/unit/test_common_throttle.py | 30 +++++++++++++++++++++ 2 files changed, 53 insertions(+), 19 deletions(-) diff --git a/taiga/base/throttling.py b/taiga/base/throttling.py index 329c7441..d4d3a361 100644 --- a/taiga/base/throttling.py +++ b/taiga/base/throttling.py @@ -18,6 +18,9 @@ from taiga.base.api import throttling from django.conf import settings +from ipware.ip import get_ip +from netaddr import all_matching_cidrs +from netaddr.core import AddrFormatError class GlobalThrottlingMixin: @@ -26,9 +29,7 @@ class GlobalThrottlingMixin: logged in or not. """ def get_cache_key(self, request, view): - ident = request.META.get("HTTP_X_FORWARDED_FOR") - if ident is None: - ident = request.META.get("REMOTE_ADDR") + ident = get_ip(request) return self.cache_format % { "scope": self.scope, @@ -67,11 +68,24 @@ class CommonThrottle(throttling.SimpleRateThrottle): def has_to_finalize(self, request, response, view): return False + def is_whitelisted(self, ident): + for whitelisted in settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST']: + if isinstance(whitelisted, int) and whitelisted == ident: + return True + elif isinstance(whitelisted, str): + try: + if all_matching_cidrs(ident, [whitelisted]) != []: + return True + except(AddrFormatError, ValueError): + pass + return False + def allow_request(self, request, view): scope = self.get_scope(request) ident = self.get_ident(request) rates = self.get_rates(scope) - if ident in settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST']: + + if self.is_whitelisted(ident): return True if rates is None or rates == []: @@ -145,25 +159,15 @@ class CommonThrottle(throttling.SimpleRateThrottle): return (rate, num_requests, duration) def get_scope(self, request): - if request.user.is_authenticated(): - if request.method in ["POST", "PUT", "PATCH", "DELETE"]: - scope = "user-write" - else: - scope = "user-read" - else: - if request.method in ["POST", "PUT", "PATCH", "DELETE"]: - scope = "anon-write" - else: - scope = "anon-read" + scope_prefix = "user" if request.user.is_authenticated() else "anon" + scope_sufix = "write" if request.method in ["POST", "PUT", "PATCH", "DELETE"] else "read" + scope = "{}-{}".format(scope_prefix, scope_sufix) return scope def get_ident(self, request): if request.user.is_authenticated(): - ident = request.user.id - else: - ident = request.META.get("HTTP_X_FORWARDED_FOR") - if ident is None: - ident = request.META.get("REMOTE_ADDR") + return request.user.id + ident = get_ip(request) return ident def get_cache_key(self, ident, scope, rate): diff --git a/tests/unit/test_common_throttle.py b/tests/unit/test_common_throttle.py index f5586f4d..03138557 100644 --- a/tests/unit/test_common_throttle.py +++ b/tests/unit/test_common_throttle.py @@ -263,3 +263,33 @@ def test_not_whitelisted_anon_throttling(settings, rf): cache.clear() settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = [] + +def test_whitelisted_subnet_anon_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = "1/min" + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = ["192.168.0.0/24"] + request = rf.get("/test") + request.user = AnonymousUser() + request.META["REMOTE_ADDR"] = "192.168.0.123" + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) + for x in range(100): + assert throttling.allow_request(request, None) + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = [] + +def test_not_whitelisted_subnet_anon_throttling(settings, rf): + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = "1/min" + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = ["192.168.0.0/24"] + request = rf.get("/test") + request.user = AnonymousUser() + request.META["REMOTE_ADDR"] = "192.168.1.123" + throttling = CommonThrottle() + assert throttling.allow_request(request, None) + assert throttling.allow_request(request, None) is False + for x in range(100): + assert throttling.allow_request(request, None) is False + cache.clear() + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['anon-read'] = None + settings.REST_FRAMEWORK['DEFAULT_THROTTLE_WHITELIST'] = [] From f37a6cf869014acd602d7aa154bb6e58b7fb46d8 Mon Sep 17 00:00:00 2001 From: CharleyPeng1 Date: Tue, 28 Feb 2017 15:48:32 +1100 Subject: [PATCH 130/144] Update README.md github does not seem to support _blank --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 16f2e495..f5fb30fe 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ Taiga is made for developers and designers. We care enormously about UI because There are two possible ways to contribute to our UI: - **Bugs**: If you find a bug regarding front-end, please report it as previously indicated in the Bug reports section or send a pull-request as indicated in the Code Patches section. -- **Enhancements**: If its a design or UX bug or enhancement we will love to receive your feedback. Please send us your enhancement, with the reason and, if possible, an example. Our design and UX team will review your enhancement and fix it as soon as possible. We recommend you to use our [mailing list](http://groups.google.co.uk/d/forum/taigaio){target="_blank"} so we can have a lot of different opinions and debate. +- **Enhancements**: If its a design or UX bug or enhancement we will love to receive your feedback. Please send us your enhancement, with the reason and, if possible, an example. Our design and UX team will review your enhancement and fix it as soon as possible. We recommend you to use our [mailing list](http://groups.google.co.uk/d/forum/taigaio) so we can have a lot of different opinions and debate. - **Language Localization**: We are eager to offer localized versions of Taiga. Some members of the community have already volunteered to work to provide a variety of languages. We are working to implement some changes to allow for this and expect to accept these requests in the near future. From 71e810b4462ee995a953b704972aaa8a7fdb5af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 2 Mar 2017 10:51:32 +0100 Subject: [PATCH 131/144] Update local.py.example --- settings/local.py.example | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/settings/local.py.example b/settings/local.py.example index cdbf0e77..fd76b29f 100644 --- a/settings/local.py.example +++ b/settings/local.py.example @@ -63,12 +63,23 @@ DATABASES = { ######################################### #REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"] = { -# "anon": "20/min", -# "user": "200/min", -# "import-mode": "20/sec", -# "import-dump-mode": "1/minute" +# "anon-write": "20/min", +# "user-write": None, +# "anon-read": None, +# "user-read": None, +# "import-mode": None, +# "import-dump-mode": "1/minute", +# "create-memberships": None, +# "login-fail": None, +# "register-success": None, +# "user-detail": None, #} +# This list should containt: +# - Tiga users IDs +# - Valid clients IP addresses (X-Forwarded-For header) +#REST_FRAMEWORK["DEFAULT_THROTTLE_WHITELIST"] = [] + ######################################### ## MAIL SYSTEM SETTINGS From fd658895cb41ccf52b97ccef610759deab52713b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 1 Mar 2017 13:27:58 +0100 Subject: [PATCH 132/144] Migration from celery3 to celery4 --- .gitignore | 1 + requirements.txt | 2 +- settings/celery.py | 23 ++++--- settings/celery_local.py.example | 4 ++ settings/local.py.example | 9 +-- settings/testing.py | 1 - taiga/celery.py | 14 ++-- taiga/deferred.py | 69 ------------------- tests/conftest.py | 2 + tests/integration/test_exporter_api.py | 7 +- tests/integration/test_importer_api.py | 14 +--- tests/integration/test_importers_asana_api.py | 4 +- .../integration/test_importers_github_api.py | 4 +- tests/integration/test_importers_jira_api.py | 5 +- .../integration/test_importers_trello_api.py | 4 +- tests/integration/test_projects.py | 3 +- tests/unit/test_deferred.py | 59 ---------------- 17 files changed, 46 insertions(+), 179 deletions(-) create mode 100644 settings/celery_local.py.example delete mode 100644 taiga/deferred.py delete mode 100644 tests/unit/test_deferred.py diff --git a/.gitignore b/.gitignore index 7cf4ac96..bfeb4264 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.log taiga/search settings/local.py +settings/celery_local.py database.sqlite logs media diff --git a/requirements.txt b/requirements.txt index 8f633141..3a4b1d8a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ requests-oauthlib==0.6.2 webcolors==1.5 django-sr==0.0.4 easy-thumbnails==2.3 -celery==3.1.24 +celery==4.0.2 redis==2.10.5 Unidecode==0.04.19 raven==5.32.0 diff --git a/settings/celery.py b/settings/celery.py index 8001a19c..b22c7167 100644 --- a/settings/celery.py +++ b/settings/celery.py @@ -16,21 +16,22 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from kombu import Exchange, Queue +from kombu import Queue -BROKER_URL = 'amqp://guest:guest@localhost:5672//' -CELERY_RESULT_BACKEND = 'redis://localhost:6379/0' +broker_url = 'amqp://guest:guest@localhost:5672//' +result_backend = 'redis://localhost:6379/0' -CELERY_ACCEPT_CONTENT = ['pickle',] # Values are 'pickle', 'json', 'msgpack' and 'yaml' +accept_content = ['pickle',] # Values are 'pickle', 'json', 'msgpack' and 'yaml' +task_serializer = "pickle" +result_serializer = "pickle" -CELERY_TIMEZONE = 'Europe/Madrid' -CELERY_ENABLE_UTC = True +timezone = 'Europe/Madrid' -CELERY_DEFAULT_QUEUE = 'tasks' -CELERY_QUEUES = ( +task_default_queue = 'tasks' +task_queues = ( Queue('tasks', routing_key='task.#'), Queue('transient', routing_key='transient.#', delivery_mode=1) ) -CELERY_DEFAULT_EXCHANGE = 'tasks' -CELERY_DEFAULT_EXCHANGE_TYPE = 'topic' -CELERY_DEFAULT_ROUTING_KEY = 'task.default' +task_default_exchange = 'tasks' +task_default_exchange_type = 'topic' +task_default_routing_key = 'task.default' diff --git a/settings/celery_local.py.example b/settings/celery_local.py.example new file mode 100644 index 00000000..a16e5ec3 --- /dev/null +++ b/settings/celery_local.py.example @@ -0,0 +1,4 @@ +from .celery import * + +# To use celery in memory +#task_always_eager = True diff --git a/settings/local.py.example b/settings/local.py.example index fd76b29f..626d4911 100644 --- a/settings/local.py.example +++ b/settings/local.py.example @@ -157,13 +157,10 @@ DATABASES = { ######################################### ## CELERY ######################################### - -#from .celery import * +# Set to True to enable celery and work in async mode or False +# to disable it and work in sync mode. You can find the celery +# settings in settings/celery.py and settings/celery-local.py #CELERY_ENABLED = True -# -# To use celery in memory -#CELERY_ENABLED = True -#CELERY_ALWAYS_EAGER = True ######################################### diff --git a/settings/testing.py b/settings/testing.py index e3f565e2..da641cf2 100644 --- a/settings/testing.py +++ b/settings/testing.py @@ -19,7 +19,6 @@ from .development import * CELERY_ENABLED = False -CELERY_ALWAYS_EAGER = True MEDIA_ROOT = "/tmp" diff --git a/taiga/celery.py b/taiga/celery.py index f080262f..26d23017 100644 --- a/taiga/celery.py +++ b/taiga/celery.py @@ -20,11 +20,15 @@ import os from celery import Celery -from django.conf import settings - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings') -app = Celery('taiga') +from django.conf import settings -app.config_from_object('django.conf:settings') -app.autodiscover_tasks(lambda: settings.INSTALLED_APPS, related_name="deferred") +try: + from settings import celery_local as celery_settings +except ImportError: + from settings import celery as celery_settings + +app = Celery('taiga') +app.config_from_object(celery_settings) +app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) diff --git a/taiga/deferred.py b/taiga/deferred.py deleted file mode 100644 index 0ac75e89..00000000 --- a/taiga/deferred.py +++ /dev/null @@ -1,69 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2014-2017 Andrey Antukh -# Copyright (C) 2014-2017 Jesús Espino -# Copyright (C) 2014-2017 David Barragán -# Copyright (C) 2014-2017 Alejandro Alonso -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -from django.conf import settings - -from .celery import app - - -def _send_task(task, args, kwargs, **options): - if settings.CELERY_ALWAYS_EAGER: - return app.tasks[task].apply(args, kwargs, **options) - return app.send_task(task, args, kwargs, **options) - - -def defer(task: str, *args, **kwargs): - """Defer the execution of a task. - - Defer the execution of a task and returns a future objects with the following methods among - others: - - `failed()` Returns `True` if the task failed. - - `ready()` Returns `True` if the task has been executed. - - `forget()` Forget about the result. - - `get()` Wait until the task is ready and return its result. - - `result` When the task has been executed the result is in this attribute. - More info at Celery docs on `AsyncResult` object. - - :param task: Name of the task to execute. - - :return: A future object. - """ - return _send_task(task, args, kwargs, routing_key="transient.deferred") - - -def call_async(task: str, *args, **kwargs): - """Run a task and ignore its result. - - This is just a star argument version of `apply_async`. - - :param task: Name of the task to execute. - :param args: Arguments for the task. - :param kwargs: Keyword arguments for the task. - """ - apply_async(task, args, kwargs) - - -def apply_async(task: str, args=None, kwargs=None, **options): - """Run a task and ignore its result. - - :param task: Name of the task to execute. - :param args: Tupple of arguments for the task. - :param kwargs: Dict of keyword arguments for the task. - :param options: Celery-specific options when running the task. See Celery docs on `apply_async` - """ - _send_task(task, args, kwargs, **options) diff --git a/tests/conftest.py b/tests/conftest.py index 5c9c7686..fd93acb1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -36,3 +36,5 @@ def pytest_runtest_setup(item): def pytest_configure(config): django.setup() + from taiga.celery import app + app.conf.task_always_eager = True diff --git a/tests/integration/test_exporter_api.py b/tests/integration/test_exporter_api.py index 40e6deb2..055bafe3 100644 --- a/tests/integration/test_exporter_api.py +++ b/tests/integration/test_exporter_api.py @@ -40,8 +40,6 @@ def test_invalid_project_export(client): def test_valid_project_export_with_celery_disabled(client, settings): - settings.CELERY_ENABLED = False - user = f.UserFactory.create() project = f.ProjectFactory.create(owner=user) f.MembershipFactory(project=project, user=user, is_admin=True) @@ -57,8 +55,6 @@ def test_valid_project_export_with_celery_disabled(client, settings): def test_valid_project_export_with_celery_disabled_and_gzip(client, settings): - settings.CELERY_ENABLED = False - user = f.UserFactory.create() project = f.ProjectFactory.create(owner=user) f.MembershipFactory(project=project, user=user, is_admin=True) @@ -93,6 +89,7 @@ def test_valid_project_export_with_celery_enabled(client, settings): args = (project.id, project.slug, response_data["export_id"], "plain") kwargs = {"countdown": settings.EXPORTS_TTL} delete_project_dump_mock.apply_async.assert_called_once_with(args, **kwargs) + settings.CELERY_ENABLED = False def test_valid_project_export_with_celery_enabled_and_gzip(client, settings): @@ -115,10 +112,10 @@ def test_valid_project_export_with_celery_enabled_and_gzip(client, settings): args = (project.id, project.slug, response_data["export_id"], "gzip") kwargs = {"countdown": settings.EXPORTS_TTL} delete_project_dump_mock.apply_async.assert_called_once_with(args, **kwargs) + settings.CELERY_ENABLED = False def test_valid_project_with_throttling(client, settings): - settings.CELERY_ENABLED = False settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["import-dump-mode"] = "1/minute" user = f.UserFactory.create() diff --git a/tests/integration/test_importer_api.py b/tests/integration/test_importer_api.py index 84dccbfd..9764e9a8 100644 --- a/tests/integration/test_importer_api.py +++ b/tests/integration/test_importer_api.py @@ -1147,7 +1147,6 @@ def test_invalid_dump_import(client): def test_valid_dump_import_without_enough_public_projects_slots(client, settings): - settings.CELERY_ENABLED = False user = f.UserFactory.create(max_public_projects=0) client.login(user) @@ -1170,7 +1169,6 @@ def test_valid_dump_import_without_enough_public_projects_slots(client, settings def test_valid_dump_import_without_enough_private_projects_slots(client, settings): - settings.CELERY_ENABLED = False user = f.UserFactory.create(max_private_projects=0) client.login(user) @@ -1193,7 +1191,6 @@ def test_valid_dump_import_without_enough_private_projects_slots(client, setting def test_valid_dump_import_without_enough_membership_private_project_slots_one_project(client, settings): - settings.CELERY_ENABLED = False user = f.UserFactory.create(max_memberships_private_projects=5) client.login(user) @@ -1241,7 +1238,6 @@ def test_valid_dump_import_without_enough_membership_private_project_slots_one_p def test_valid_dump_import_without_enough_membership_public_project_slots_one_project(client, settings): - settings.CELERY_ENABLED = False user = f.UserFactory.create(max_memberships_public_projects=5) client.login(user) @@ -1289,7 +1285,6 @@ def test_valid_dump_import_without_enough_membership_public_project_slots_one_pr def test_valid_dump_import_with_enough_membership_private_project_slots_multiple_projects(client, settings): - settings.CELERY_ENABLED = False user = f.UserFactory.create(max_memberships_private_projects=10) project = f.ProjectFactory.create(owner=user) @@ -1344,8 +1339,6 @@ def test_valid_dump_import_with_enough_membership_private_project_slots_multiple def test_valid_dump_import_with_enough_membership_public_project_slots_multiple_projects(client, settings): - settings.CELERY_ENABLED = False - user = f.UserFactory.create(max_memberships_public_projects=10) project = f.ProjectFactory.create(owner=user) f.MembershipFactory.create(project=project) @@ -1400,7 +1393,6 @@ def test_valid_dump_import_with_enough_membership_public_project_slots_multiple_ def test_valid_dump_import_with_the_limit_of_membership_whit_you_for_private_project(client, settings): - settings.CELERY_ENABLED = False user = f.UserFactory.create(max_memberships_private_projects=5) client.login(user) @@ -1443,7 +1435,6 @@ def test_valid_dump_import_with_the_limit_of_membership_whit_you_for_private_pro def test_valid_dump_import_with_the_limit_of_membership_whit_you_for_public_project(client, settings): - settings.CELERY_ENABLED = False user = f.UserFactory.create(max_memberships_public_projects=5) client.login(user) @@ -1486,8 +1477,6 @@ def test_valid_dump_import_with_the_limit_of_membership_whit_you_for_public_proj def test_valid_dump_import_with_celery_disabled(client, settings): - settings.CELERY_ENABLED = False - user = f.UserFactory.create() client.login(user) @@ -1508,7 +1497,6 @@ def test_valid_dump_import_with_celery_disabled(client, settings): def test_invalid_dump_import_with_celery_disabled(client, settings): - settings.CELERY_ENABLED = False user = f.UserFactory.create(max_memberships_public_projects=5) client.login(user) @@ -1568,6 +1556,7 @@ def test_valid_dump_import_with_celery_enabled(client, settings): assert response.status_code == 202 assert "import_id" in response.data assert Project.objects.filter(slug="valid-project").count() == 1 + settings.CELERY_ENABLED = False def test_invalid_dump_import_with_celery_enabled(client, settings): @@ -1611,6 +1600,7 @@ def test_invalid_dump_import_with_celery_enabled(client, settings): assert response.status_code == 202 assert "import_id" in response.data assert Project.objects.filter(slug="invalid-project").count() == 0 + settings.CELERY_ENABLED = False def test_dump_import_throttling(client, settings): diff --git a/tests/integration/test_importers_asana_api.py b/tests/integration/test_importers_asana_api.py index 44a400c2..66ddfd4c 100644 --- a/tests/integration/test_importers_asana_api.py +++ b/tests/integration/test_importers_asana_api.py @@ -207,6 +207,7 @@ def test_import_asana_project_without_project_id(client, settings): response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) assert response.status_code == 400 + settings.CELERY_ENABLED = False def test_import_asana_project_with_celery_enabled(client, settings): @@ -226,11 +227,10 @@ def test_import_asana_project_with_celery_enabled(client, settings): assert response.status_code == 202 assert "task_id" in response.data + settings.CELERY_ENABLED = False def test_import_asana_project_with_celery_disabled(client, settings): - settings.CELERY_ENABLED = False - user = f.UserFactory.create() project = f.ProjectFactory.create(slug="imported-project") client.login(user) diff --git a/tests/integration/test_importers_github_api.py b/tests/integration/test_importers_github_api.py index a21494fe..94fac6b1 100644 --- a/tests/integration/test_importers_github_api.py +++ b/tests/integration/test_importers_github_api.py @@ -195,6 +195,7 @@ def test_import_github_project_without_project_id(client, settings): response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) assert response.status_code == 400 + settings.CELERY_ENABLED = False def test_import_github_project_with_celery_enabled(client, settings): @@ -214,11 +215,10 @@ def test_import_github_project_with_celery_enabled(client, settings): assert response.status_code == 202 assert "task_id" in response.data + settings.CELERY_ENABLED = False def test_import_github_project_with_celery_disabled(client, settings): - settings.CELERY_ENABLED = False - user = f.UserFactory.create() project = f.ProjectFactory.create(slug="imported-project") client.login(user) diff --git a/tests/integration/test_importers_jira_api.py b/tests/integration/test_importers_jira_api.py index d4b3dc24..d2c014fb 100644 --- a/tests/integration/test_importers_jira_api.py +++ b/tests/integration/test_importers_jira_api.py @@ -203,6 +203,7 @@ def test_import_jira_project_without_project_id(client, settings): response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "url": "http://jiraserver"})) assert response.status_code == 400 + settings.CELERY_ENABLED = False def test_import_jira_project_without_url(client, settings): @@ -217,6 +218,7 @@ def test_import_jira_project_without_url(client, settings): response = client.post(url, content_type="application/json", data=json.dumps({"token": "access.secret", "project_id": 1})) assert response.status_code == 400 + settings.CELERY_ENABLED = False def test_import_jira_project_with_celery_enabled(client, settings): @@ -236,11 +238,10 @@ def test_import_jira_project_with_celery_enabled(client, settings): assert response.status_code == 202 assert "task_id" in response.data + settings.CELERY_ENABLED = False def test_import_jira_project_with_celery_disabled(client, settings): - settings.CELERY_ENABLED = False - user = f.UserFactory.create() project = f.ProjectFactory.create(slug="imported-project") client.login(user) diff --git a/tests/integration/test_importers_trello_api.py b/tests/integration/test_importers_trello_api.py index 4d940505..9497e28e 100644 --- a/tests/integration/test_importers_trello_api.py +++ b/tests/integration/test_importers_trello_api.py @@ -203,6 +203,7 @@ def test_import_trello_project_without_project_id(client, settings): response = client.post(url, content_type="application/json", data=json.dumps({"token": "token"})) assert response.status_code == 400 + settings.CELERY_ENABLED = False def test_import_trello_project_with_celery_enabled(client, settings): @@ -222,11 +223,10 @@ def test_import_trello_project_with_celery_enabled(client, settings): assert response.status_code == 202 assert "task_id" in response.data + settings.CELERY_ENABLED = False def test_import_trello_project_with_celery_disabled(client, settings): - settings.CELERY_ENABLED = False - user = f.UserFactory.create() project = f.ProjectFactory.create(slug="imported-project") client.login(user) diff --git a/tests/integration/test_projects.py b/tests/integration/test_projects.py index 07eb9caa..8fbe6e03 100644 --- a/tests/integration/test_projects.py +++ b/tests/integration/test_projects.py @@ -1861,11 +1861,10 @@ def test_delete_project_with_celery_enabled(client, settings): assert project.memberships.count() == 0 assert project.blocked_code == BLOCKED_BY_DELETING delete_project_mock.delay.assert_called_once_with(project.id) + settings.CELERY_ENABLED = False def test_delete_project_with_celery_disabled(client, settings): - settings.CELERY_ENABLED = False - user = f.UserFactory.create() project = f.ProjectFactory.create(owner=user) role = f.RoleFactory.create(project=project, permissions=["view_project"]) diff --git a/tests/unit/test_deferred.py b/tests/unit/test_deferred.py deleted file mode 100644 index 69295e2b..00000000 --- a/tests/unit/test_deferred.py +++ /dev/null @@ -1,59 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2014-2017 Andrey Antukh -# Copyright (C) 2014-2017 Jesús Espino -# Copyright (C) 2014-2017 David Barragán -# Copyright (C) 2014-2017 Alejandro Alonso -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -from unittest import mock - -from taiga import celery -from taiga.deferred import defer, call_async, apply_async - - -def test_defer(): - # settings.CELERY_ALWAYS_EAGER = True - name = "task name" - args = (1, 2) - kwargs = {"kw": "keyword argument"} - - with mock.patch("taiga.deferred.app") as app: - defer(name, *args, **kwargs) - app.tasks[name].apply.assert_called_once_with(args, kwargs, - routing_key="transient.deferred") - - -def test_apply_async(): - name = "task name" - args = (1, 2) - kwargs = {"kw": "keyword argument"} - - with mock.patch("taiga.deferred.app") as app: - apply_async(name, args, kwargs) - app.tasks[name].apply.assert_called_once_with(args, kwargs) - - -def test_call_async(): - name = "task name" - args = (1, 2) - kwargs = {"kw": "keyword argument"} - - with mock.patch("taiga.deferred.app") as app: - call_async(name, *args, **kwargs) - app.tasks[name].apply.assert_called_once_with(args, kwargs) - - -def test_task_invocation(): - celery.app.task(name="_test_task")(lambda: 1) - assert defer("_test_task").get() == 1 From 523ee8bbe8847dd33315ecaf8916ade88ed14de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 2 Mar 2017 16:01:13 +0100 Subject: [PATCH 133/144] Fixed bug with throttling code --- taiga/base/throttling.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/taiga/base/throttling.py b/taiga/base/throttling.py index d4d3a361..086f9660 100644 --- a/taiga/base/throttling.py +++ b/taiga/base/throttling.py @@ -16,8 +16,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from taiga.base.api import throttling from django.conf import settings +from django.core.exceptions import ImproperlyConfigured + +from taiga.base.api import throttling from ipware.ip import get_ip from netaddr import all_matching_cidrs from netaddr.core import AddrFormatError From c90460f283d110f2e80778aa1096bfaefb6b6e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 2 Mar 2017 16:01:28 +0100 Subject: [PATCH 134/144] Updated requirements.txt and requirements-devel.txt --- requirements-devel.txt | 8 ++++---- requirements.txt | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements-devel.txt b/requirements-devel.txt index b491f29a..ac4f42fe 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -1,13 +1,13 @@ -r requirements.txt factory_boy==2.8.1 -py==1.4.31 -pytest==3.0.5 +py==1.4.32 +pytest==3.0.6 pytest-django==3.1.2 pytest-pythonpath==0.7.1 -coverage==4.2 +coverage==4.3.4 coveralls==1.1 django-slowdown==0.0.1 -transifex-client==0.12.2 +transifex-client==0.12.4 diff --git a/requirements.txt b/requirements.txt index 3a4b1d8a..517d0b99 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,39 +1,39 @@ -Django==1.10.4 +Django==1.10.6 #djangorestframework==2.3.13 # It's not necessary since Taiga 1.7 django-picklefield==0.3.2 django-sampledatahelper==0.4.1 gunicorn==19.6.0 -psycopg2==2.6.2 +psycopg2==2.7 Pillow==3.4.2 pytz==2016.10 six==1.10.0 amqp==2.1.4 -djmail==0.13.1 -django-jinja==2.2.1 -jinja2==2.8 -pygments==2.1.3 +djmail==1.0.0 +django-jinja==2.2.2 +jinja2==2.9.5 +pygments==2.2.0 django-sites==0.9 -Markdown==2.6.7 +Markdown==2.6.8 fn==0.4.3 diff-match-patch==20121119 -requests==2.12.4 -requests-oauthlib==0.6.2 -webcolors==1.5 +requests==2.13.0 +requests-oauthlib==0.8.0 +webcolors==1.7 django-sr==0.0.4 easy-thumbnails==2.3 celery==4.0.2 redis==2.10.5 -Unidecode==0.04.19 -raven==5.32.0 +Unidecode==0.4.20 +raven==6.0.0 bleach==1.5.0 django-ipware==1.1.6 premailer==3.0.1 cssutils==1.0.1 # Compatible with python 3.5 -lxml==3.7.0 +lxml==3.7.3 git+https://github.com/Xof/django-pglocks.git pyjwkest==1.3.2 python-dateutil==2.6.0 -netaddr==0.7.18 +netaddr==0.7.19 serpy==0.1.1 psd-tools==1.4 CairoSVG==2.0.1 From 16caedce81732232fd4beaf46656ff605d057d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 3 Mar 2017 08:13:12 +0100 Subject: [PATCH 135/144] Adding licenses to files and fixing some pyflakes errors --- taiga/importers/asana/api.py | 2 -- taiga/importers/asana/importer.py | 19 +++++++++++++++++- taiga/importers/asana/tasks.py | 2 +- taiga/importers/exceptions.py | 18 +++++++++++++++++ taiga/importers/github/api.py | 2 -- taiga/importers/github/importer.py | 20 ++++++++++++++++++- taiga/importers/github/tasks.py | 2 +- taiga/importers/jira/agile.py | 18 +++++++++++++++++ taiga/importers/jira/common.py | 20 ++++++++++++++++++- taiga/importers/jira/normal.py | 18 +++++++++++++++++ .../management/commands/import_from_asana.py | 5 +---- .../management/commands/import_from_github.py | 10 +++------- .../management/commands/import_from_jira.py | 5 +---- .../commands/import_from_pivotal.py | 4 ---- .../management/commands/import_from_trello.py | 4 ---- taiga/importers/permissions.py | 5 +---- taiga/importers/pivotal/api.py | 1 - taiga/importers/pivotal/importer.py | 18 +++++++++++++++++ taiga/importers/pivotal/tasks.py | 2 +- taiga/importers/services.py | 18 +++++++++++++++++ taiga/importers/trello/api.py | 1 - 21 files changed, 155 insertions(+), 39 deletions(-) diff --git a/taiga/importers/asana/api.py b/taiga/importers/asana/api.py index e8b130e2..3c19b896 100644 --- a/taiga/importers/asana/api.py +++ b/taiga/importers/asana/api.py @@ -20,10 +20,8 @@ from taiga.base.api import viewsets from taiga.base import response from taiga.base import exceptions as exc from taiga.base.decorators import list_route -from taiga.users.models import AuthData, User from taiga.users.services import get_user_photo_url from taiga.users.gravatar import get_user_gravatar_id -from taiga.projects.serializers import ProjectSerializer from taiga.importers import permissions, exceptions from taiga.importers.services import resolve_users_bindings diff --git a/taiga/importers/asana/importer.py b/taiga/importers/asana/importer.py index 2899ace9..fe26d930 100644 --- a/taiga/importers/asana/importer.py +++ b/taiga/importers/asana/importer.py @@ -1,6 +1,23 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + import requests import asana -import json from django.core.files.base import ContentFile from django.contrib.contenttypes.models import ContentType diff --git a/taiga/importers/asana/tasks.py b/taiga/importers/asana/tasks.py index b294c661..bd707b0d 100644 --- a/taiga/importers/asana/tasks.py +++ b/taiga/importers/asana/tasks.py @@ -44,7 +44,7 @@ def import_project(self, user_id, token, project_id, options): "project": project_id, "exception": e } - email = mail_builder.importer_import_error(admin, ctx) + email = mail_builder.importer_import_error(user, ctx) email.send() logger.error('Error importing Asana project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: diff --git a/taiga/importers/exceptions.py b/taiga/importers/exceptions.py index ebb8de86..0646095d 100644 --- a/taiga/importers/exceptions.py +++ b/taiga/importers/exceptions.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + class InvalidRequest(Exception): pass diff --git a/taiga/importers/github/api.py b/taiga/importers/github/api.py index 6def5d03..56a0d061 100644 --- a/taiga/importers/github/api.py +++ b/taiga/importers/github/api.py @@ -20,10 +20,8 @@ from taiga.base.api import viewsets from taiga.base import response from taiga.base import exceptions as exc from taiga.base.decorators import list_route -from taiga.users.models import AuthData, User from taiga.users.services import get_user_photo_url from taiga.users.gravatar import get_user_gravatar_id -from taiga.projects.serializers import ProjectSerializer from taiga.importers import permissions from taiga.importers import exceptions diff --git a/taiga/importers/github/importer.py b/taiga/importers/github/importer.py index 18c5cbce..9d5d4df7 100644 --- a/taiga/importers/github/importer.py +++ b/taiga/importers/github/importer.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + import requests from urllib.parse import parse_qsl from django.core.files.base import ContentFile @@ -19,7 +37,7 @@ from taiga.timeline.rebuilder import rebuild_timeline from taiga.timeline.models import Timeline from taiga.users.models import User, AuthData -from taiga.importers.exceptions import InvalidAuthResult +from taiga.importers.exceptions import InvalidAuthResult, FailedRequest class GithubClient: diff --git a/taiga/importers/github/tasks.py b/taiga/importers/github/tasks.py index 6af268ee..b3102621 100644 --- a/taiga/importers/github/tasks.py +++ b/taiga/importers/github/tasks.py @@ -44,7 +44,7 @@ def import_project(self, user_id, token, project_id, options): "project": project_id, "exception": e } - email = mail_builder.importer_import_error(admin, ctx) + email = mail_builder.importer_import_error(user, ctx) email.send() logger.error('Error importing GitHub project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: diff --git a/taiga/importers/jira/agile.py b/taiga/importers/jira/agile.py index 0f4d70cf..bca5cada 100644 --- a/taiga/importers/jira/agile.py +++ b/taiga/importers/jira/agile.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + import datetime from django.template.defaultfilters import slugify diff --git a/taiga/importers/jira/common.py b/taiga/importers/jira/common.py index 553025d5..f1ffa691 100644 --- a/taiga/importers/jira/common.py +++ b/taiga/importers/jira/common.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + import requests from urllib.parse import parse_qsl from oauthlib.oauth1 import SIGNATURE_RSA @@ -7,7 +25,7 @@ from django.core.files.base import ContentFile from django.contrib.contenttypes.models import ContentType from taiga.users.models import User -from taiga.projects.models import Project, ProjectTemplate, Membership, Points +from taiga.projects.models import Points from taiga.projects.userstories.models import UserStory from taiga.projects.tasks.models import Task from taiga.projects.issues.models import Issue diff --git a/taiga/importers/jira/normal.py b/taiga/importers/jira/normal.py index 45584545..2854ec26 100644 --- a/taiga/importers/jira/normal.py +++ b/taiga/importers/jira/normal.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + from collections import OrderedDict from django.template.defaultfilters import slugify diff --git a/taiga/importers/management/commands/import_from_asana.py b/taiga/importers/management/commands/import_from_asana.py index 677dc870..8c82771a 100644 --- a/taiga/importers/management/commands/import_from_asana.py +++ b/taiga/importers/management/commands/import_from_asana.py @@ -21,11 +21,8 @@ from django.conf import settings from django.db.models import Q from taiga.importers.asana.importer import AsanaImporter -from taiga.users.models import User, AuthData -from taiga.projects.services import projects as service +from taiga.users.models import User -import unittest.mock -import timeit import json diff --git a/taiga/importers/management/commands/import_from_github.py b/taiga/importers/management/commands/import_from_github.py index 3c1f3884..330017f8 100644 --- a/taiga/importers/management/commands/import_from_github.py +++ b/taiga/importers/management/commands/import_from_github.py @@ -21,11 +21,7 @@ from django.conf import settings from django.db.models import Q from taiga.importers.github.importer import GithubImporter -from taiga.users.models import User, AuthData -from taiga.projects.services import projects as service - -import unittest.mock -import timeit +from taiga.users.models import User class Command(BaseCommand): @@ -57,8 +53,8 @@ class Command(BaseCommand): print("Go to here and come with your code (in the redirected url): {}".format(url)) code = input("Code: ") access_data = GithubImporter.get_access_token( - settings.IMPORTERS.get('github', {}).get('client_id', None) - settings.IMPORTERS.get('github', {}).get('client_secret', None) + settings.IMPORTERS.get('github', {}).get('client_id', None), + settings.IMPORTERS.get('github', {}).get('client_secret', None), code ) token = access_data diff --git a/taiga/importers/management/commands/import_from_jira.py b/taiga/importers/management/commands/import_from_jira.py index 50997593..04dc0b87 100644 --- a/taiga/importers/management/commands/import_from_jira.py +++ b/taiga/importers/management/commands/import_from_jira.py @@ -23,10 +23,7 @@ from django.conf import settings from taiga.importers.jira.agile import JiraAgileImporter from taiga.importers.jira.normal import JiraNormalImporter from taiga.users.models import User -from taiga.projects.services import projects as service -import unittest.mock -import timeit import json @@ -69,7 +66,7 @@ class Command(BaseCommand): True ) print(url) - code = input("Go to the url and get back the code") + input("Go to the url, allow the user and get back and press enter") token = JiraNormalImporter.get_access_token( server, settings.IMPORTERS.get('jira', {}).get('consumer_key', None), diff --git a/taiga/importers/management/commands/import_from_pivotal.py b/taiga/importers/management/commands/import_from_pivotal.py index 5a51e95b..0af57eb5 100644 --- a/taiga/importers/management/commands/import_from_pivotal.py +++ b/taiga/importers/management/commands/import_from_pivotal.py @@ -21,10 +21,6 @@ from django.db.models import Q from taiga.importers.pivotal import PivotalImporter from taiga.users.models import User -from taiga.projects.services import projects as service - -import unittest.mock -import timeit class Command(BaseCommand): diff --git a/taiga/importers/management/commands/import_from_trello.py b/taiga/importers/management/commands/import_from_trello.py index 903a601f..31ab0c9a 100644 --- a/taiga/importers/management/commands/import_from_trello.py +++ b/taiga/importers/management/commands/import_from_trello.py @@ -21,10 +21,6 @@ from django.db.models import Q from taiga.importers.trello.importer import TrelloImporter from taiga.users.models import User -from taiga.projects.services import projects as service - -import unittest.mock -import timeit class Command(BaseCommand): diff --git a/taiga/importers/permissions.py b/taiga/importers/permissions.py index beca1b69..9268c2ef 100644 --- a/taiga/importers/permissions.py +++ b/taiga/importers/permissions.py @@ -16,10 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from taiga.base.api.permissions import TaigaResourcePermission, AllowAny, IsAuthenticated -from taiga.base.api.permissions import IsSuperUser, HasProjectPerm, IsProjectAdmin - -from taiga.permissions.permissions import CommentAndOrUpdatePerm +from taiga.base.api.permissions import TaigaResourcePermission, IsAuthenticated class ImporterPermission(TaigaResourcePermission): diff --git a/taiga/importers/pivotal/api.py b/taiga/importers/pivotal/api.py index 0838edbb..967ea508 100644 --- a/taiga/importers/pivotal/api.py +++ b/taiga/importers/pivotal/api.py @@ -23,7 +23,6 @@ from taiga.base.decorators import list_route from taiga.users.models import AuthData, User from taiga.users.services import get_user_photo_url from taiga.users.gravatar import get_user_gravatar_id -from taiga.projects.serializers import ProjectSerializer from taiga.importers import permissions from .importer import PivotalImporter diff --git a/taiga/importers/pivotal/importer.py b/taiga/importers/pivotal/importer.py index 6f1456ca..c49da4ab 100644 --- a/taiga/importers/pivotal/importer.py +++ b/taiga/importers/pivotal/importer.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + from django.core.files.base import ContentFile from django.contrib.contenttypes.models import ContentType import requests diff --git a/taiga/importers/pivotal/tasks.py b/taiga/importers/pivotal/tasks.py index 9435e54e..2cb87902 100644 --- a/taiga/importers/pivotal/tasks.py +++ b/taiga/importers/pivotal/tasks.py @@ -44,7 +44,7 @@ def import_project(self, user_id, token, project_id, options): "project": project_id, "exception": e } - email = mail_builder.importer_import_error(admin, ctx) + email = mail_builder.importer_import_error(user, ctx) email.send() logger.error('Error importing PivotalTracker project %s (by %s)', project_id, user, exc_info=sys.exc_info()) else: diff --git a/taiga/importers/services.py b/taiga/importers/services.py index 402120df..d2a0e50c 100644 --- a/taiga/importers/services.py +++ b/taiga/importers/services.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2017 Andrey Antukh +# Copyright (C) 2014-2017 Jesús Espino +# Copyright (C) 2014-2017 David Barragán +# Copyright (C) 2014-2017 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + from taiga.users.models import User diff --git a/taiga/importers/trello/api.py b/taiga/importers/trello/api.py index 21da8a1b..8cda25b7 100644 --- a/taiga/importers/trello/api.py +++ b/taiga/importers/trello/api.py @@ -25,7 +25,6 @@ from taiga.base.decorators import list_route from taiga.users.models import AuthData, User from taiga.users.services import get_user_photo_url from taiga.users.gravatar import get_user_gravatar_id -from taiga.projects.serializers import ProjectSerializer from .importer import TrelloImporter from taiga.importers import permissions From 08424b97fe85f794fc492c35db0d043125568214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Fri, 3 Mar 2017 14:18:44 +0100 Subject: [PATCH 136/144] [i18n] Update locales --- taiga/locale/ca/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/de/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/en/LC_MESSAGES/django.po | 171 +++++++++++++++-- taiga/locale/es/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/fi/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/fr/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/it/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/ja/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/ko/LC_MESSAGES/django.po | 208 +++++++++++++++++---- taiga/locale/nb/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/nl/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/pl/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/pt_BR/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/ru/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/sv/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/tr/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/zh-Hans/LC_MESSAGES/django.po | 175 +++++++++++++++-- taiga/locale/zh-Hant/LC_MESSAGES/django.po | 175 +++++++++++++++-- 18 files changed, 2841 insertions(+), 338 deletions(-) diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index 5031baec..52d47a47 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ca/)\n" @@ -658,6 +658,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -673,6 +674,7 @@ msgid "" msgstr "" #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -691,6 +693,7 @@ msgid "" msgstr "" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -976,25 +979,25 @@ msgstr "L'element referenciat no existeix" msgid "The status doesn't exist" msgstr "L'estatus no existeix." -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1002,11 +1005,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1023,12 +1026,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1036,6 +1039,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/de/LC_MESSAGES/django.po b/taiga/locale/de/LC_MESSAGES/django.po index ea178737..872acc0d 100644 --- a/taiga/locale/de/LC_MESSAGES/django.po +++ b/taiga/locale/de/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/de/)\n" @@ -763,6 +763,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -789,6 +790,7 @@ msgstr "" " " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -821,6 +823,7 @@ msgstr "" "Das Taiga Team\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1127,25 +1130,25 @@ msgstr "Das referenzierte Element existiert nicht" msgid "The status doesn't exist" msgstr "Der Status existiert nicht" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1153,11 +1156,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1174,12 +1177,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1187,6 +1190,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/en/LC_MESSAGES/django.po b/taiga/locale/en/LC_MESSAGES/django.po index cdb9a649..a54a721c 100644 --- a/taiga/locale/en/LC_MESSAGES/django.po +++ b/taiga/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" "PO-Revision-Date: 2015-03-25 20:09+0100\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Taiga Dev Team \n" @@ -647,6 +647,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -662,6 +663,7 @@ msgid "" msgstr "" #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -680,6 +682,7 @@ msgid "" msgstr "" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "" @@ -949,25 +952,25 @@ msgstr "" msgid "The status doesn't exist" msgstr "" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -975,11 +978,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -996,12 +999,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1009,6 +1012,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/es/LC_MESSAGES/django.po b/taiga/locale/es/LC_MESSAGES/django.po index 27d01a0e..8b81d9ae 100644 --- a/taiga/locale/es/LC_MESSAGES/django.po +++ b/taiga/locale/es/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-20 16:40+0000\n" -"Last-Translator: David Barragán \n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"Last-Translator: Taiga Dev Team \n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/es/)\n" "MIME-Version: 1.0\n" @@ -770,6 +770,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -794,6 +795,7 @@ msgstr "" "

    El Equipo de Taiga

    " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -826,6 +828,7 @@ msgstr "" "El Equipo de Taiga\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1151,25 +1154,25 @@ msgstr "El elemento referenciado no existe" msgid "The status doesn't exist" msgstr "El estado no existe" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "El parámetro project es necesario" -#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 -#: taiga/importers/asana/api.py:141 +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 msgid "Invalid Asana API request" msgstr "Solicitud de API de Asana no válida" -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 +#: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 +#: taiga/importers/asana/api.py:141 msgid "Failed to make the request to Asana API" msgstr "No se pudo realizar la solicitud a la API de Asana" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "El parámetro code es necesario" @@ -1177,11 +1180,11 @@ msgstr "El parámetro code es necesario" msgid "Error importing Asana project" msgstr "Error importando el proyecto de Asana" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "Datos de autenticación inválidos" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "El servicio de terceros está fallando" @@ -1198,12 +1201,12 @@ msgstr "El parámetro url es necesario" msgid "Invalid project_type {}" msgstr "project_type {} inválido" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "El token de atuenticación es inválido o ha expirado" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "Error importando el proyecto deJira" @@ -1211,6 +1214,142 @@ msgstr "Error importando el proyecto deJira" msgid "Error importing PivotalTracker project" msgstr "Error inportando el proyecto de PivotalTracker" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/fi/LC_MESSAGES/django.po b/taiga/locale/fi/LC_MESSAGES/django.po index bedd821d..0eebb940 100644 --- a/taiga/locale/fi/LC_MESSAGES/django.po +++ b/taiga/locale/fi/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fi/)\n" @@ -710,6 +710,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -735,6 +736,7 @@ msgstr "" " " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -766,6 +768,7 @@ msgstr "" "Taiga Tiimi\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1071,25 +1074,25 @@ msgstr "Viitattu elementtiä ei löydy" msgid "The status doesn't exist" msgstr "Tilaa ei löydy" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1097,11 +1100,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1118,12 +1121,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1131,6 +1134,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/fr/LC_MESSAGES/django.po b/taiga/locale/fr/LC_MESSAGES/django.po index 262b2d5c..b1311f14 100644 --- a/taiga/locale/fr/LC_MESSAGES/django.po +++ b/taiga/locale/fr/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fr/)\n" @@ -745,6 +745,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -770,6 +771,7 @@ msgstr "" " " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -801,6 +803,7 @@ msgstr "" "L'équipe Taiga\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1103,25 +1106,25 @@ msgstr "L'élément référencé n'existe pas" msgid "The status doesn't exist" msgstr "L'état n'existe pas" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1129,11 +1132,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1150,12 +1153,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1163,6 +1166,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/it/LC_MESSAGES/django.po b/taiga/locale/it/LC_MESSAGES/django.po index 98d7e7f0..f072e327 100644 --- a/taiga/locale/it/LC_MESSAGES/django.po +++ b/taiga/locale/it/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/it/)\n" @@ -790,6 +790,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -819,6 +820,7 @@ msgstr "" "

    Il Team di Taiga

    " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -863,6 +865,7 @@ msgstr "" "Il Team di Taiga\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1207,25 +1210,25 @@ msgstr "L'elemento di riferimento non esiste" msgid "The status doesn't exist" msgstr "Lo stato non esiste" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1233,11 +1236,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1254,12 +1257,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1267,6 +1270,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po index e9fb7663..77bfea70 100644 --- a/taiga/locale/ja/LC_MESSAGES/django.po +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Japanese (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ja/)\n" @@ -756,6 +756,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -781,6 +782,7 @@ msgstr "" " " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -813,6 +815,7 @@ msgstr "" "Taigaチーム\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1141,25 +1144,25 @@ msgstr "参照された要素は存在しません。" msgid "The status doesn't exist" msgstr "ステータスは存在しません。" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1167,11 +1170,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1188,12 +1191,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1201,6 +1204,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/ko/LC_MESSAGES/django.po b/taiga/locale/ko/LC_MESSAGES/django.po index aed2fe9b..a7d8805f 100644 --- a/taiga/locale/ko/LC_MESSAGES/django.po +++ b/taiga/locale/ko/LC_MESSAGES/django.po @@ -1,8 +1,9 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: +# Jonghyuk Baik , 2017 # 안민규 (luasenvy) , 2017 # mcsong , 2015 # mcsong , 2015 @@ -10,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Korean (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ko/)\n" @@ -757,6 +758,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -782,6 +784,7 @@ msgstr "" " " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -813,6 +816,7 @@ msgstr "" "타이가 팀\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[타이가] %(error_subject)s" @@ -1136,84 +1140,220 @@ msgstr "참조된 엘리먼트가 존재하지 않습니다." msgid "The status doesn't exist" msgstr "상태가 존재하지 않습니다." -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" -msgstr "" +msgstr "프로젝트 값이 필요합니다." + +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "Asana API 요청이 올바르지 않습니다." #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" -msgstr "" +msgstr "Asana API에 요청하는 중 실패하였습니다." -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" -msgstr "" +msgstr "Code 값이 필요합니다." #: taiga/importers/asana/tasks.py:42 taiga/importers/asana/tasks.py:43 msgid "Error importing Asana project" -msgstr "" +msgstr "Asana 프로젝트를 가져오는 중 에러가 발생하였습니다." + +#: taiga/importers/github/api.py:135 +msgid "Invalid auth data" +msgstr "인증 정보가 유효하지 않습니다." #: taiga/importers/github/api.py:137 -msgid "Invalid auth data" -msgstr "" - -#: taiga/importers/github/api.py:139 msgid "Third party service failing" -msgstr "" +msgstr "서드 파티 서비스에 실패하였습니다." #: taiga/importers/github/tasks.py:42 taiga/importers/github/tasks.py:43 msgid "Error importing GitHub project" -msgstr "" +msgstr "GitHub프로젝트를 가져오는 중 에러가 발생하였습니다." #: taiga/importers/jira/api.py:59 taiga/importers/jira/api.py:86 #: taiga/importers/jira/api.py:106 taiga/importers/jira/api.py:179 msgid "The url param is needed" -msgstr "" +msgstr "url값이 필요합니다." #: taiga/importers/jira/api.py:155 msgid "Invalid project_type {}" -msgstr "" +msgstr "유효하지 않은 프로젝트_유형 {}" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" -msgstr "" +msgstr "인증 토큰이 유효하지 않거나 만료되었습니다." -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" -msgstr "" +msgstr "Jira 프로젝트를 가져오는 중 에러가 발생하였습니다." #: taiga/importers/pivotal/tasks.py:42 taiga/importers/pivotal/tasks.py:43 msgid "Error importing PivotalTracker project" +msgstr "PivotalTracker 프로젝트를 가져오는 중 에러가 발생하였습니다." + +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" msgstr "" #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" -msgstr "" +msgstr "유효하지 않은 요청: %s 의 %s" #: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 #, python-format msgid "Unauthorized: %s at %s" -msgstr "" +msgstr "인증되지 않음: %s 의 %s" #: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 #, python-format msgid "Resource Unavailable: %s at %s" -msgstr "" +msgstr "자원 사용 불가: %s 의 %s" #: taiga/importers/trello/tasks.py:42 taiga/importers/trello/tasks.py:43 msgid "Error importing Trello project" -msgstr "" +msgstr "Trello 프로젝트를 가져오는 중 에러가 발생하였습니다." #: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 msgid "View project" diff --git a/taiga/locale/nb/LC_MESSAGES/django.po b/taiga/locale/nb/LC_MESSAGES/django.po index 58bd5a35..db41a339 100644 --- a/taiga/locale/nb/LC_MESSAGES/django.po +++ b/taiga/locale/nb/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/nb/)\n" @@ -668,6 +668,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -683,6 +684,7 @@ msgid "" msgstr "" #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -701,6 +703,7 @@ msgid "" msgstr "" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "" @@ -986,25 +989,25 @@ msgstr "Det refererte elementet finnes ikke" msgid "The status doesn't exist" msgstr "Statusen eksisterer ikke" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1012,11 +1015,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1033,12 +1036,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1046,6 +1049,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/nl/LC_MESSAGES/django.po b/taiga/locale/nl/LC_MESSAGES/django.po index 51ac720a..5ad65cbd 100644 --- a/taiga/locale/nl/LC_MESSAGES/django.po +++ b/taiga/locale/nl/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/nl/)\n" @@ -698,6 +698,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -713,6 +714,7 @@ msgid "" msgstr "" #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -731,6 +733,7 @@ msgid "" msgstr "" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1016,25 +1019,25 @@ msgstr "Het element waarnaar verwezen wordt bestaat niet" msgid "The status doesn't exist" msgstr "De status bestaat niet" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1042,11 +1045,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1063,12 +1066,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1076,6 +1079,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/pl/LC_MESSAGES/django.po b/taiga/locale/pl/LC_MESSAGES/django.po index 37dd69ba..4ab11d71 100644 --- a/taiga/locale/pl/LC_MESSAGES/django.po +++ b/taiga/locale/pl/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/pl/)\n" @@ -724,6 +724,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -749,6 +750,7 @@ msgstr "" " " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -781,6 +783,7 @@ msgstr "" "Zespół Taiga\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1085,25 +1088,25 @@ msgstr "Element referencyjny nie istnieje" msgid "The status doesn't exist" msgstr "Status nie istnieje" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1111,11 +1114,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1132,12 +1135,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1145,6 +1148,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/pt_BR/LC_MESSAGES/django.po b/taiga/locale/pt_BR/LC_MESSAGES/django.po index 84abac6a..21313bbe 100644 --- a/taiga/locale/pt_BR/LC_MESSAGES/django.po +++ b/taiga/locale/pt_BR/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/pt_BR/)\n" @@ -756,6 +756,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -781,6 +782,7 @@ msgstr "" " " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -812,6 +814,7 @@ msgstr "" "O Time Taiga\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1116,25 +1119,25 @@ msgstr "O elemento referenciado não existe" msgid "The status doesn't exist" msgstr "O estatus não existe" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1142,11 +1145,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1163,12 +1166,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1176,6 +1179,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/ru/LC_MESSAGES/django.po b/taiga/locale/ru/LC_MESSAGES/django.po index 07838035..311c6093 100644 --- a/taiga/locale/ru/LC_MESSAGES/django.po +++ b/taiga/locale/ru/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ru/)\n" @@ -749,6 +749,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -773,6 +774,7 @@ msgstr "" "

    Команда Taiga

    " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -804,6 +806,7 @@ msgstr "" "Команда Taiga\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1111,25 +1114,25 @@ msgstr "Указанный элемент не существует" msgid "The status doesn't exist" msgstr "Статус не существует" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1137,11 +1140,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1158,12 +1161,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1171,6 +1174,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/sv/LC_MESSAGES/django.po b/taiga/locale/sv/LC_MESSAGES/django.po index e9eecfb6..4efc5d84 100644 --- a/taiga/locale/sv/LC_MESSAGES/django.po +++ b/taiga/locale/sv/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Swedish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/sv/)\n" @@ -665,6 +665,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -680,6 +681,7 @@ msgid "" msgstr "" #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -698,6 +700,7 @@ msgid "" msgstr "" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -967,25 +970,25 @@ msgstr "Referenselementet existerar inte" msgid "The status doesn't exist" msgstr "Statusen existerar inte" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -993,11 +996,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1014,12 +1017,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1027,6 +1030,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/tr/LC_MESSAGES/django.po b/taiga/locale/tr/LC_MESSAGES/django.po index 87cd1276..f1e29163 100644 --- a/taiga/locale/tr/LC_MESSAGES/django.po +++ b/taiga/locale/tr/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Turkish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/tr/)\n" @@ -719,6 +719,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -743,6 +744,7 @@ msgstr "" "

    The Taiga Team

    " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -775,6 +777,7 @@ msgstr "" "Taiga Takımı\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1076,25 +1079,25 @@ msgstr "Referans gösterilmiş varlık mevcut değil" msgid "The status doesn't exist" msgstr "Durum mevcut değil" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1102,11 +1105,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1123,12 +1126,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1136,6 +1139,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/zh-Hans/LC_MESSAGES/django.po b/taiga/locale/zh-Hans/LC_MESSAGES/django.po index d032baac..16c32607 100644 --- a/taiga/locale/zh-Hans/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hans/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Simplified (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hans/)\n" @@ -750,6 +750,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -774,6 +775,7 @@ msgstr "" " " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -805,6 +807,7 @@ msgstr "" "Taiga团队\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1127,25 +1130,25 @@ msgstr "引用的元素不存在" msgid "The status doesn't exist" msgstr "状态不存在" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1153,11 +1156,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1174,12 +1177,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1187,6 +1190,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" diff --git a/taiga/locale/zh-Hant/LC_MESSAGES/django.po b/taiga/locale/zh-Hant/LC_MESSAGES/django.po index ed4fab5c..86b22933 100644 --- a/taiga/locale/zh-Hant/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hant/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # taiga-back.taiga. -# Copyright (C) 2014-2016 Taiga Dev Team +# Copyright (C) 2014-2017 Taiga Dev Team # This file is distributed under the same license as the taiga-back package. # # Translators: @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 12:30+0100\n" -"PO-Revision-Date: 2017-02-15 11:08+0000\n" +"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"PO-Revision-Date: 2017-03-03 13:17+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hant/)\n" @@ -707,6 +707,7 @@ msgid "[%(project)s] %(error_subject)s" msgstr "[%(project)s] %(error_subject)s" #: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#: taiga/importers/templates/emails/importer_import_error-body-html.jinja:4 #, python-format msgid "" "\n" @@ -730,6 +731,7 @@ msgstr "" "

    Taiga 團隊

    " #: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-body-text.jinja:1 #, python-format msgid "" "\n" @@ -761,6 +763,7 @@ msgstr "" "Taiga團隊\n" #: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#: taiga/importers/templates/emails/importer_import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "[Taiga] %(error_subject)s" @@ -1061,25 +1064,25 @@ msgstr "參考元素不存在" msgid "The status doesn't exist" msgstr "狀態不存在" -#: taiga/importers/asana/api.py:45 taiga/importers/asana/api.py:87 -#: taiga/importers/github/api.py:46 taiga/importers/github/api.py:76 +#: taiga/importers/asana/api.py:43 taiga/importers/asana/api.py:85 +#: taiga/importers/github/api.py:44 taiga/importers/github/api.py:74 #: taiga/importers/jira/api.py:57 taiga/importers/jira/api.py:103 -#: taiga/importers/pivotal/api.py:44 taiga/importers/pivotal/api.py:81 -#: taiga/importers/trello/api.py:47 taiga/importers/trello/api.py:84 +#: taiga/importers/pivotal/api.py:43 taiga/importers/pivotal/api.py:80 +#: taiga/importers/trello/api.py:46 taiga/importers/trello/api.py:83 msgid "The project param is needed" msgstr "" +#: taiga/importers/asana/api.py:50 taiga/importers/asana/api.py:73 +#: taiga/importers/asana/api.py:139 +msgid "Invalid Asana API request" +msgstr "" + #: taiga/importers/asana/api.py:52 taiga/importers/asana/api.py:75 #: taiga/importers/asana/api.py:141 -msgid "Invalid Asana API request" -msgstr "" - -#: taiga/importers/asana/api.py:54 taiga/importers/asana/api.py:77 -#: taiga/importers/asana/api.py:143 msgid "Failed to make the request to Asana API" msgstr "" -#: taiga/importers/asana/api.py:131 taiga/importers/github/api.py:125 +#: taiga/importers/asana/api.py:129 taiga/importers/github/api.py:123 msgid "Code param needed" msgstr "" @@ -1087,11 +1090,11 @@ msgstr "" msgid "Error importing Asana project" msgstr "" -#: taiga/importers/github/api.py:137 +#: taiga/importers/github/api.py:135 msgid "Invalid auth data" msgstr "" -#: taiga/importers/github/api.py:139 +#: taiga/importers/github/api.py:137 msgid "Third party service failing" msgstr "" @@ -1108,12 +1111,12 @@ msgstr "" msgid "Invalid project_type {}" msgstr "" -#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:139 -#: taiga/importers/trello/api.py:144 +#: taiga/importers/jira/api.py:225 taiga/importers/pivotal/api.py:138 +#: taiga/importers/trello/api.py:143 msgid "Invalid or expired auth token" msgstr "" -#: taiga/importers/jira/tasks.py:47 taiga/importers/jira/tasks.py:48 +#: taiga/importers/jira/tasks.py:48 taiga/importers/jira/tasks.py:49 msgid "Error importing Jira project" msgstr "" @@ -1121,6 +1124,142 @@ msgstr "" msgid "Error importing PivotalTracker project" msgstr "" +#: taiga/importers/templates/emails/asana_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Asana Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Asana project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Asana project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Asana project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Github Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Github project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Github project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/github_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Github project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Jira Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Jira project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Jira project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Jira project has been imported" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Trello Project imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your Trello project has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

    \n" +" " +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your Trello project has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your Trello project has been imported" +msgstr "" + #: taiga/importers/trello/importer.py:77 #, python-format msgid "Invalid Request: %s at %s" From eb38517977581b4ffbf51183b33ae217722a235d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 6 Mar 2017 16:23:15 +0100 Subject: [PATCH 137/144] Adding new gogs signature method --- CHANGELOG.md | 1 + taiga/hooks/gogs/api.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d38f260e..74a4ead0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Contacts API allow full text search (by the username, full name or email). - Filter milestones, user stories and tasks by estimated_start and estimated_finish dates. - Add project_extra_info to epics, tasks, milestones, issues and wiki pages endpoints. +- Gogs integration: Adding new Gogs signature method. - Lots of small and not so small bugfixes. diff --git a/taiga/hooks/gogs/api.py b/taiga/hooks/gogs/api.py index 794145c7..eb3ada63 100644 --- a/taiga/hooks/gogs/api.py +++ b/taiga/hooks/gogs/api.py @@ -19,6 +19,9 @@ from taiga.hooks.api import BaseWebhookApiViewSet from . import event_hooks +import hmac +import hashlib + class GogsViewSet(BaseWebhookApiViewSet): event_hook_classes = { @@ -26,8 +29,6 @@ class GogsViewSet(BaseWebhookApiViewSet): } def _validate_signature(self, project, request): - payload = self._get_payload(request) - if not hasattr(project, "modules_config"): return False @@ -38,7 +39,15 @@ class GogsViewSet(BaseWebhookApiViewSet): if secret is None: return False - return payload.get('secret', None) == secret + signature = request.META.get("HTTP_X_GOGS_SIGNATURE", None) + if not signature: # Old format signature support (before 0.11 version) + payload = self._get_payload(request) + return payload.get('secret', None) == secret + + secret = project.modules_config.config.get("gogs", {}).get("secret", "") + secret = bytes(secret.encode("utf-8")) + mac = hmac.new(secret, msg=request.body, digestmod=hashlib.sha256) + return hmac.compare_digest(mac.hexdigest(), signature) def _get_event_name(self, request): return "push" From 3bc3ab83e0fe4018ce80cbf09eb2a94618264128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 6 Mar 2017 17:00:32 +0100 Subject: [PATCH 138/144] Update CHANGELOG --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74a4ead0..12de9155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog # -## 3.1.0 unnamed (unreleased) +## 3.1.0 Perovskia Atriplicifolia (2017-03-10) ### Features - Contact with the project: if the projects have this module enabled Taiga users can contact them. @@ -19,7 +19,6 @@ - Jira 7 - Github - Asana - - Pivotal Tracker ### Misc - API: From 8279856e8b79c1a8fc8615466a37a39b9b86a550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 6 Mar 2017 17:08:14 +0100 Subject: [PATCH 139/144] Ignore sprint and epic order field in changes --- .../history/templates/emails/includes/fields_diff-html.jinja | 2 ++ .../history/templates/emails/includes/fields_diff-text.jinja | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja index 1f7fa5ce..9d3473e7 100644 --- a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja +++ b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja @@ -5,8 +5,10 @@ "blocked_note_html", "content", "content_html", + "epics_order", "backlog_order", "kanban_order", + "sprint_order", "taskboard_order", "us_order", "custom_attributes", diff --git a/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja b/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja index dd2975aa..eabb019c 100644 --- a/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja +++ b/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja @@ -3,8 +3,10 @@ "description_html", "content_diff", "content_html", + "epics_order", "backlog_order", "kanban_order", + "sprint_order", "taskboard_order", "us_order", "blocked_note_diff", @@ -68,7 +70,7 @@ {# CUSTOM ATTRIBUTES #} {% if values.new %} {% for attr in values['new']%} - + - {{ attr.name }}: * {{ attr.value }} {% endfor %} From 6d9c2b660c87cd7c200b513d7572467fab087e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 6 Mar 2017 18:06:45 +0100 Subject: [PATCH 140/144] [i18n] Update locales --- .../github_import_success-body-html.jinja | 4 +- .../github_import_success-body-text.jinja | 2 +- .../github_import_success-subject.jinja | 2 +- taiga/locale/ca/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/de/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/en/LC_MESSAGES/django.po | 78 ++++----- taiga/locale/es/LC_MESSAGES/django.po | 165 +++++++++++++----- taiga/locale/fi/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/fr/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/it/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/ja/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/ko/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/nb/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/nl/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/pl/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/pt_BR/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/ru/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/sv/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/tr/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/zh-Hans/LC_MESSAGES/django.po | 80 ++++----- taiga/locale/zh-Hant/LC_MESSAGES/django.po | 80 ++++----- 21 files changed, 803 insertions(+), 728 deletions(-) diff --git a/taiga/importers/templates/emails/github_import_success-body-html.jinja b/taiga/importers/templates/emails/github_import_success-body-html.jinja index ad2b7e8e..6f2d31d3 100644 --- a/taiga/importers/templates/emails/github_import_success-body-html.jinja +++ b/taiga/importers/templates/emails/github_import_success-body-html.jinja @@ -2,9 +2,9 @@ {% block body %} {% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %} -

    Github Project imported

    +

    GitHub Project imported

    Hello {{ user }},

    -

    Your Github project has been correctly imported.

    +

    Your GitHub project has been correctly imported.

    Go to {{ project }}

    The Taiga Team

    {% endtrans %} diff --git a/taiga/importers/templates/emails/github_import_success-body-text.jinja b/taiga/importers/templates/emails/github_import_success-body-text.jinja index 0b176e58..c1229238 100644 --- a/taiga/importers/templates/emails/github_import_success-body-text.jinja +++ b/taiga/importers/templates/emails/github_import_success-body-text.jinja @@ -1,7 +1,7 @@ {% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %} Hello {{ user }}, -Your Github project has been correctly imported. +Your GitHub project has been correctly imported. You can see the project {{ project }} here: diff --git a/taiga/importers/templates/emails/github_import_success-subject.jinja b/taiga/importers/templates/emails/github_import_success-subject.jinja index cb730163..dbc2d890 100644 --- a/taiga/importers/templates/emails/github_import_success-subject.jinja +++ b/taiga/importers/templates/emails/github_import_success-subject.jinja @@ -1 +1 @@ -{% trans project=project.name|safe %}[{{ project }}] Your Github project has been imported{% endtrans %} +{% trans project=project.name|safe %}[{{ project }}] Your GitHub project has been imported{% endtrans %} diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index 52d47a47..53e717ca 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ca/)\n" @@ -1077,9 +1077,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1092,7 +1092,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1104,7 +1104,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1735,102 +1735,102 @@ msgstr "Crea" msgid "Delete" msgstr "Borra" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s punts de rol" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "De" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "a" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Afegir nou arxiu" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Arxiu actualitzat" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "Obsolet" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "No obsolet" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Arxiu borrat" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "Afegit" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "Borrat" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Sense assignar" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-borrat-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "a:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "desde:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Afegit" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Canviat" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Borrat" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "afegit:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "borrat:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "Desde:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "A:" diff --git a/taiga/locale/de/LC_MESSAGES/django.po b/taiga/locale/de/LC_MESSAGES/django.po index 872acc0d..37a0b75d 100644 --- a/taiga/locale/de/LC_MESSAGES/django.po +++ b/taiga/locale/de/LC_MESSAGES/django.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/de/)\n" @@ -1228,9 +1228,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1243,7 +1243,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1255,7 +1255,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1888,102 +1888,102 @@ msgstr "Erzeugen" msgid "Delete" msgstr "Löschen" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s Rollenpunkte " -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "Von" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "An" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Neuen Anhang hinzugefügt" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Anhang aktualisiert" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "verworfen" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "nicht verworfen" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Gelöschter Anhang" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "hinzugefügt" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "entfernt" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Nicht zugewiesen" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-gelöscht-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "An:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "Von:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Hinzugefügt" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Geändert" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Gelöscht" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "hinzugefügt:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "entfernt:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "Von:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "An:" diff --git a/taiga/locale/en/LC_MESSAGES/django.po b/taiga/locale/en/LC_MESSAGES/django.po index a54a721c..f369a528 100644 --- a/taiga/locale/en/LC_MESSAGES/django.po +++ b/taiga/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" "PO-Revision-Date: 2015-03-25 20:09+0100\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Taiga Dev Team \n" @@ -1050,9 +1050,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1065,7 +1065,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1077,7 +1077,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1708,102 +1708,102 @@ msgstr "" msgid "Delete" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "" diff --git a/taiga/locale/es/LC_MESSAGES/django.po b/taiga/locale/es/LC_MESSAGES/django.po index 8b81d9ae..9e180f5c 100644 --- a/taiga/locale/es/LC_MESSAGES/django.po +++ b/taiga/locale/es/LC_MESSAGES/django.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" -"Last-Translator: Taiga Dev Team \n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 17:04+0000\n" +"Last-Translator: David Barragán \n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/es/)\n" "MIME-Version: 1.0\n" @@ -1226,6 +1226,14 @@ msgid "" "

    The Taiga Team

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

    Proyecto de Asana importado

    \n" +"

    Hola %(user)s,

    \n" +"

    Tu proyecto de Asana se ha importado correctamente.

    \n" +" Ir a %(project)s\n" +"

    El equipo de Taiga

    \n" +" " #: taiga/importers/templates/emails/asana_import_success-body-text.jinja:1 #, python-format @@ -1242,24 +1250,42 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"Hola %(user)s,\n" +"\n" +"Tu proyecto de Asana se ha importado correctamente.\n" +"\n" +"Puedes ver el proyecto %(project)s aquí:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"El equipo de Taiga\n" #: taiga/importers/templates/emails/asana_import_success-subject.jinja:1 #, python-format msgid "[%(project)s] Your Asana project has been imported" -msgstr "" +msgstr "[%(project)s] Tu proyecto de Asana se ha importado" #: taiga/importers/templates/emails/github_import_success-body-html.jinja:4 #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

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

    Proyecto de GitHub importado

    \n" +"

    Hola %(user)s,

    \n" +"

    Tu proyecto de GitHub se ha importado correctamente.

    \n" +" Ir a %(project)s\n" +"

    El equipo de Taiga

    " #: taiga/importers/templates/emails/github_import_success-body-text.jinja:1 #, python-format @@ -1267,7 +1293,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1276,11 +1302,22 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"Hola %(user)s,\n" +"\n" +"Tu proyecto de GitHub se ha importado correctamente.\n" +"\n" +"Puedes ver el proyecto %(project)s aquí:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"El equipo de Taiga\n" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" -msgstr "" +msgid "[%(project)s] Your GitHub project has been imported" +msgstr "[%(project)s] Tu proyecto de GitHub se ha importado" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 #, python-format @@ -1294,6 +1331,14 @@ msgid "" "

    The Taiga Team

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

    Proyecto de Jira importado

    \n" +"

    Hola %(user)s,

    \n" +"

    Tu proyecto de Jira se ha importado correctamente.

    \n" +" Ir a %(project)s\n" +"

    El equipo de Taiga

    \n" +" " #: taiga/importers/templates/emails/jira_import_success-body-text.jinja:1 #, python-format @@ -1310,11 +1355,22 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"Hola %(user)s,\n" +"\n" +"Tu proyecto de Jira se ha importado correctamente.\n" +"\n" +"Puedes ver el proyecto %(project)s aquí:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"El equipo de Taiga\n" #: taiga/importers/templates/emails/jira_import_success-subject.jinja:1 #, python-format msgid "[%(project)s] Your Jira project has been imported" -msgstr "" +msgstr "[%(project)s] Tu proyecto de Jira se ha importado" #: taiga/importers/templates/emails/trello_import_success-body-html.jinja:4 #, python-format @@ -1328,6 +1384,14 @@ msgid "" "

    The Taiga Team

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

    Proyecto de Trello importado

    \n" +"

    Hola %(user)s,

    \n" +"

    Tu proyecto de Trello se ha importado correctamente.

    \n" +" Ir a %(project)s\n" +"

    El equipo de Taiga

    \n" +" " #: taiga/importers/templates/emails/trello_import_success-body-text.jinja:1 #, python-format @@ -1344,11 +1408,22 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"Hola %(user)s,\n" +"\n" +"Tu proyecto de Trello se ha importado correctamente.\n" +"\n" +"Puedes ver el proyecto %(project)s aquí:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"El equipo de Taiga\n" #: taiga/importers/templates/emails/trello_import_success-subject.jinja:1 #, python-format msgid "[%(project)s] Your Trello project has been imported" -msgstr "" +msgstr "[%(project)s] Tu proyecto de Trello se ha importado" #: taiga/importers/trello/importer.py:77 #, python-format @@ -1936,102 +2011,102 @@ msgstr "Crear" msgid "Delete" msgstr "Borrar" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "pntos del rol %(role)s" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "de" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "a" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Nuevo adjunto añadido" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Adjunto actualizado" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "obsoleto" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "no obsoleto" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Adjunto borrado" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "añadido" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "borrado" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "No asignado" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-borrado-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "a:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "de:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Añadido" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Cambiado" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Borrado" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "añadido:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "borrado:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "De:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "A:" diff --git a/taiga/locale/fi/LC_MESSAGES/django.po b/taiga/locale/fi/LC_MESSAGES/django.po index 0eebb940..7f96e14e 100644 --- a/taiga/locale/fi/LC_MESSAGES/django.po +++ b/taiga/locale/fi/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fi/)\n" @@ -1172,9 +1172,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1187,7 +1187,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1199,7 +1199,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1830,102 +1830,102 @@ msgstr "Luo" msgid "Delete" msgstr "Poista" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s roolipistettä" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "keneltä" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "kenelle" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Liitä tiedosto" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Päivitä tiedosto" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "poistettu" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "ei poistettu" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Poista liite" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "lisätty" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "poistettu" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Tekijä puuttuu" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-poistettu-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "kenelle:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "keneltä:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Lisätty" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Muutettu" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Poistettu" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "lisätty:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "poistettu:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "Keneltä:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "Kenelle:" diff --git a/taiga/locale/fr/LC_MESSAGES/django.po b/taiga/locale/fr/LC_MESSAGES/django.po index b1311f14..3f24353e 100644 --- a/taiga/locale/fr/LC_MESSAGES/django.po +++ b/taiga/locale/fr/LC_MESSAGES/django.po @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fr/)\n" @@ -1204,9 +1204,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1219,7 +1219,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1231,7 +1231,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1864,102 +1864,102 @@ msgstr "Créer" msgid "Delete" msgstr "Supprimer" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s points de rôle" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "de" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "à" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Ajouter une pièce jointe" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Pièces jointes mises à jour" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "obsolète" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "non obsolète" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Pièce jointe supprimée" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "ajouté" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "supprimé" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Non assigné" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-supprimé-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "à :" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "de :" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Ajouté" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Modifié" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Supprimé" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "ajouté :" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "supprimé :" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "De :" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "A :" diff --git a/taiga/locale/it/LC_MESSAGES/django.po b/taiga/locale/it/LC_MESSAGES/django.po index f072e327..7cfa7aa2 100644 --- a/taiga/locale/it/LC_MESSAGES/django.po +++ b/taiga/locale/it/LC_MESSAGES/django.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:55+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/it/)\n" @@ -1308,9 +1308,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1323,7 +1323,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1335,7 +1335,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1968,102 +1968,102 @@ msgstr "Creato" msgid "Delete" msgstr "Eliminato" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s punti del ruolo" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "da" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "a" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Aggiunto un nuovo allegato" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Allegato aggiornato" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "non approvato" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "accettato" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Allegato eliminato" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "aggiunto" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "rimosso" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Non assegnato" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-eliminato-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "a:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "da:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Aggiunto" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Modificato" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Eliminato" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "aggiunto:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "rimosso:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "Da:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "A:" diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po index 77bfea70..1e802723 100644 --- a/taiga/locale/ja/LC_MESSAGES/django.po +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Japanese (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ja/)\n" @@ -1242,9 +1242,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1257,7 +1257,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1269,7 +1269,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1902,102 +1902,102 @@ msgstr "作成する" msgid "Delete" msgstr "削除する" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "from" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "to" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "非推奨" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "非推奨ではない" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "to:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "from:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "差出人" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "宛先" diff --git a/taiga/locale/ko/LC_MESSAGES/django.po b/taiga/locale/ko/LC_MESSAGES/django.po index a7d8805f..45478f06 100644 --- a/taiga/locale/ko/LC_MESSAGES/django.po +++ b/taiga/locale/ko/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:55+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Korean (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ko/)\n" @@ -1238,9 +1238,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1253,7 +1253,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1265,7 +1265,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1918,102 +1918,102 @@ msgstr "생성" msgid "Delete" msgstr "삭제" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s 역할 포인트" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "보낸이" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "받는이" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "새로운 첨부파일이 추가되었습니다." -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "첨부파일이 수정되었습니다." -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "지원하지 않음" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "아직 지원중임" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "첨부파일이 삭제되었습니다." -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "추가되었습니다." -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "삭제되었습니다." -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "할당되지 않았습니다." -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-삭제되었습니다-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "받는이:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "보낸이:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "추가되었습니다." -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "수정되었습니다." -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "삭제되었습니다." -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "추가되었습니다:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "삭제되었습니다:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "보낸이:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "받는이:" diff --git a/taiga/locale/nb/LC_MESSAGES/django.po b/taiga/locale/nb/LC_MESSAGES/django.po index db41a339..73d6c11c 100644 --- a/taiga/locale/nb/LC_MESSAGES/django.po +++ b/taiga/locale/nb/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/nb/)\n" @@ -1087,9 +1087,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1102,7 +1102,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1114,7 +1114,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1747,102 +1747,102 @@ msgstr "Opprett" msgid "Delete" msgstr "Slett" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s rollepoeng" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "fra" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "til" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "La til nytt vedlegg" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Oppdatert vedlegg" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "foreldet" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "ikke foreldet" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Slettede vedlegg" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "lagt til" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "fjernet" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Ikke tildelt" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-slettet-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "til:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "fra:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Lagt til" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Endret" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Slettet" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "lagt til: " -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "fjernet: " -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "Fra: " -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "Til: " diff --git a/taiga/locale/nl/LC_MESSAGES/django.po b/taiga/locale/nl/LC_MESSAGES/django.po index 5ad65cbd..127d2dda 100644 --- a/taiga/locale/nl/LC_MESSAGES/django.po +++ b/taiga/locale/nl/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/nl/)\n" @@ -1117,9 +1117,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1132,7 +1132,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1144,7 +1144,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1775,102 +1775,102 @@ msgstr "Creëer" msgid "Delete" msgstr "Verwijder" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s rol punten" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "van" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "naar" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Nieuwe bijlage toegevoegd" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Bijlage bijgewerkt" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "verouderd" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "niet verouderd" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Bijlage verwijderd" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "toegevoegd" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "verwijderd" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Niet toegewezen" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-verwijderd-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "naar:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "van:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Toegevoegd" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Veranderd" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Verwijderd" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "toegevoegd:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "verwijderd:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "Van:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "Naar:" diff --git a/taiga/locale/pl/LC_MESSAGES/django.po b/taiga/locale/pl/LC_MESSAGES/django.po index 4ab11d71..c6e786e3 100644 --- a/taiga/locale/pl/LC_MESSAGES/django.po +++ b/taiga/locale/pl/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/pl/)\n" @@ -1186,9 +1186,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1201,7 +1201,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1213,7 +1213,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1844,102 +1844,102 @@ msgstr "Utwórz" msgid "Delete" msgstr "Usuń" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s punkty roli" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "od" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "do" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Dodano nowy załącznik" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Zaktualizowany załącznik" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "przestarzałe" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "nie przestarzałe" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Usuń załącznik" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "dodane" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "usuniete" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Nieprzypisane" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-usunięte-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "do:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "od:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Dodane" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Zmienione" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Usunięte" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "dodane:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "usunięte:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "Od:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "Do:" diff --git a/taiga/locale/pt_BR/LC_MESSAGES/django.po b/taiga/locale/pt_BR/LC_MESSAGES/django.po index 21313bbe..26001611 100644 --- a/taiga/locale/pt_BR/LC_MESSAGES/django.po +++ b/taiga/locale/pt_BR/LC_MESSAGES/django.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/pt_BR/)\n" @@ -1217,9 +1217,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1232,7 +1232,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1244,7 +1244,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1877,102 +1877,102 @@ msgstr "Criar" msgid "Delete" msgstr "Apagar" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s pontos de função" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "de" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "para" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Adicionar novos anexos" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Atualizar anexo" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "obsoleto" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "não-obsoleto" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Anexo apagado" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "adicionado" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "removido" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Não-atribuído" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-apagado-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "para:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "de:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Adicionado" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Alterado" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Apagado" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "acrescentado:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "removido:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "De:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "Para:" diff --git a/taiga/locale/ru/LC_MESSAGES/django.po b/taiga/locale/ru/LC_MESSAGES/django.po index 311c6093..c33ba19b 100644 --- a/taiga/locale/ru/LC_MESSAGES/django.po +++ b/taiga/locale/ru/LC_MESSAGES/django.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:55+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ru/)\n" @@ -1212,9 +1212,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1227,7 +1227,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1239,7 +1239,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1872,102 +1872,102 @@ msgstr "Создать" msgid "Delete" msgstr "Удалить" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "очки для роли %(role)s" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "от" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "кому" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Добавлено новое вложение" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Вложение обновлено" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "устаревшее" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "не устаревшее" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Удалённое вложение" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "добавлено" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "удалено" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Не назначено" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-удалено-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "кому:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "от:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Добавлено" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Изменено" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Удалено" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "добавлено:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "удалено:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "От:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "Кому:" diff --git a/taiga/locale/sv/LC_MESSAGES/django.po b/taiga/locale/sv/LC_MESSAGES/django.po index 4efc5d84..f8e24851 100644 --- a/taiga/locale/sv/LC_MESSAGES/django.po +++ b/taiga/locale/sv/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Swedish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/sv/)\n" @@ -1068,9 +1068,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1083,7 +1083,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1095,7 +1095,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1726,102 +1726,102 @@ msgstr "Skapa" msgid "Delete" msgstr "Ta bort" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s rollpoäng" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "från" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "till " -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Lagt till ny bilaga" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Uppdaterad bilaga" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "borttagen" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "inte borttagen" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Bilaga borttagen" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "lagt till" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "borttaget" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Ej tilldelad" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-raderad-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "till:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "från:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Lagt till" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Ändrad" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Raderad" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "lagt till:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "borttaget:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "Från:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "Till:" diff --git a/taiga/locale/tr/LC_MESSAGES/django.po b/taiga/locale/tr/LC_MESSAGES/django.po index f1e29163..0152eef1 100644 --- a/taiga/locale/tr/LC_MESSAGES/django.po +++ b/taiga/locale/tr/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Turkish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/tr/)\n" @@ -1177,9 +1177,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1192,7 +1192,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1204,7 +1204,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1835,102 +1835,102 @@ msgstr "Oluştur" msgid "Delete" msgstr "Sil" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s role puanları" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "den" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "kime" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "Yeni ek ekle" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "Güncellenmiş ek" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "kaldırıldı" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "kaldırılmadı" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "Silinmiş ek" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "eklendi" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "silindi" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "Atanmamış" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-silinmiş-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "kime:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "kimden:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "Eklenmiş" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "Değiştirilmiş" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "Silinmiş" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "eklenmiş:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "silinmiş:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "Kimden:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "Kime:" diff --git a/taiga/locale/zh-Hans/LC_MESSAGES/django.po b/taiga/locale/zh-Hans/LC_MESSAGES/django.po index 16c32607..54dcfdaf 100644 --- a/taiga/locale/zh-Hans/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hans/LC_MESSAGES/django.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:55+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Simplified (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hans/)\n" @@ -1228,9 +1228,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1243,7 +1243,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1255,7 +1255,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1886,102 +1886,102 @@ msgstr "创建" msgid "Delete" msgstr "删除" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s 角色权重" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "来自" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "至" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "添加新的附件" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "更新附件" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "已废弃" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "未废弃" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "删除附件：" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "已加入" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "移除" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "未指派" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-删除-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "发送给:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "来自:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "已添加" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "已变更" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "已删除" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "已添加:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "已移除:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "来自:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "发送给:" diff --git a/taiga/locale/zh-Hant/LC_MESSAGES/django.po b/taiga/locale/zh-Hant/LC_MESSAGES/django.po index 86b22933..8575f0da 100644 --- a/taiga/locale/zh-Hant/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hant/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 14:17+0100\n" -"PO-Revision-Date: 2017-03-03 13:17+0000\n" +"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hant/)\n" @@ -1162,9 +1162,9 @@ msgstr "" #, python-format msgid "" "\n" -"

    Github Project imported

    \n" +"

    GitHub Project imported

    \n" "

    Hello %(user)s,

    \n" -"

    Your Github project has been correctly imported.

    \n" +"

    Your GitHub project has been correctly imported.

    \n" " Go to %(project)s\n" "

    The Taiga Team

    \n" @@ -1177,7 +1177,7 @@ msgid "" "\n" "Hello %(user)s,\n" "\n" -"Your Github project has been correctly imported.\n" +"Your GitHub project has been correctly imported.\n" "\n" "You can see the project %(project)s here:\n" "\n" @@ -1189,7 +1189,7 @@ msgstr "" #: taiga/importers/templates/emails/github_import_success-subject.jinja:1 #, python-format -msgid "[%(project)s] Your Github project has been imported" +msgid "[%(project)s] Your GitHub project has been imported" msgstr "" #: taiga/importers/templates/emails/jira_import_success-body-html.jinja:4 @@ -1820,102 +1820,102 @@ msgstr "創建" msgid "Delete" msgstr "刪除　" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:25 #, python-format msgid "%(role)s role points" msgstr "%(role)s 角色點數" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:28 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:133 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:136 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:159 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:213 msgid "from" msgstr "來自" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:144 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:147 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:165 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:190 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:219 msgid "to" msgstr "給" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:46 msgid "Added new attachment" msgstr "新增附件" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:64 msgid "Updated attachment" msgstr "更新附件" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 msgid "deprecated" msgstr "棄用" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:72 msgid "not deprecated" msgstr "不棄用" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:88 msgid "Deleted attachment" msgstr "刪除附件" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:107 msgid "added" msgstr "新增" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:112 msgid "removed" msgstr "移除　" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:137 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:148 #: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 msgid "Unassigned" msgstr "無指定" -#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:232 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:89 msgid "-deleted-" msgstr "-刪除-" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "to:" msgstr "給:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:23 msgid "from:" msgstr "from:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:29 msgid "Added" msgstr "新增的" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:36 msgid "Changed" msgstr "改變的" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:43 msgid "Deleted" msgstr "刪除的:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:57 msgid "added:" msgstr "新增的:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:60 msgid "removed:" msgstr "移除的:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:65 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:82 msgid "From:" msgstr "來自:" -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 -#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:66 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:83 msgid "To:" msgstr "給:" From fb9e3ebb9155916f0ae9f1a182614584a36eac98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 7 Mar 2017 14:39:04 +0100 Subject: [PATCH 141/144] Fix issue #4990: Now working import users with custom email --- taiga/importers/asana/importer.py | 16 +++------------- taiga/importers/github/importer.py | 16 +++------------- taiga/importers/jira/agile.py | 13 +++---------- taiga/importers/jira/normal.py | 12 +++--------- taiga/importers/services.py | 17 +++++++++++++++-- taiga/importers/trello/importer.py | 12 +++--------- 6 files changed, 30 insertions(+), 56 deletions(-) diff --git a/taiga/importers/asana/importer.py b/taiga/importers/asana/importer.py index fe26d930..039754e0 100644 --- a/taiga/importers/asana/importer.py +++ b/taiga/importers/asana/importer.py @@ -21,7 +21,7 @@ import asana from django.core.files.base import ContentFile from django.contrib.contenttypes.models import ContentType -from taiga.projects.models import Project, ProjectTemplate, Membership +from taiga.projects.models import Project, ProjectTemplate from taiga.projects.userstories.models import UserStory from taiga.projects.tasks.models import Task from taiga.projects.attachments.models import Attachment @@ -32,6 +32,7 @@ from taiga.users.models import User from taiga.timeline.rebuilder import rebuild_timeline from taiga.timeline.models import Timeline from taiga.importers import exceptions +from taiga.importers import services as import_service class AsanaClient(asana.Client): @@ -159,18 +160,7 @@ class AsanaImporter: is_private=options.get('is_private', False) ) - for user in self._client.users.find_by_workspace(project['workspace']['id']): - taiga_user = users_bindings.get(user['id'], None) - if taiga_user is None or taiga_user == self._user: - continue - - Membership.objects.create( - user=taiga_user, - project=taiga_project, - role=taiga_project.get_roles().get(slug="asana"), - is_admin=False, - invited_by=self._user, - ) + import_service.create_memberships(options.get('users_bindings', {}), project, self._user, "asana") UserStoryCustomAttribute.objects.create( name="Due date", diff --git a/taiga/importers/github/importer.py b/taiga/importers/github/importer.py index 9d5d4df7..dea516cb 100644 --- a/taiga/importers/github/importer.py +++ b/taiga/importers/github/importer.py @@ -20,7 +20,7 @@ import requests from urllib.parse import parse_qsl from django.core.files.base import ContentFile -from taiga.projects.models import Project, ProjectTemplate, Membership +from taiga.projects.models import Project, ProjectTemplate from taiga.projects.references.models import recalc_reference_counter from taiga.projects.userstories.models import UserStory from taiga.projects.issues.models import Issue @@ -38,6 +38,7 @@ from taiga.timeline.models import Timeline from taiga.users.models import User, AuthData from taiga.importers.exceptions import InvalidAuthResult, FailedRequest +from taiga.importers import services as import_service class GithubClient: @@ -209,18 +210,7 @@ class GithubImporter: data = requests.get(repo['organization']['avatar_url']) project.logo.save("logo.png", ContentFile(data.content), save=True) - for user in self._client.get("/repos/{}/collaborators".format(repo['full_name'])): - taiga_user = users_bindings.get(user['id'], None) - if taiga_user is None or taiga_user == self._user: - continue - - Membership.objects.create( - user=taiga_user, - project=project, - role=project.get_roles().get(slug="github"), - is_admin=False, - invited_by=self._user, - ) + import_service.create_memberships(options.get('users_bindings', {}), project, self._user, "github") for milestone in self._client.get("/repos/{}/milestones".format(repo['full_name'])): taiga_milestone = Milestone.objects.create( diff --git a/taiga/importers/jira/agile.py b/taiga/importers/jira/agile.py index bca5cada..c58d2f46 100644 --- a/taiga/importers/jira/agile.py +++ b/taiga/importers/jira/agile.py @@ -20,7 +20,7 @@ import datetime from django.template.defaultfilters import slugify from taiga.projects.references.models import recalc_reference_counter -from taiga.projects.models import Project, ProjectTemplate, Membership, Points +from taiga.projects.models import Project, ProjectTemplate, Points from taiga.projects.userstories.models import UserStory, RolePoints from taiga.projects.tasks.models import Task from taiga.projects.milestones.models import Milestone @@ -29,6 +29,7 @@ from taiga.projects.history.services import take_snapshot from taiga.timeline.rebuilder import rebuild_timeline from taiga.timeline.models import Timeline from .common import JiraImporterCommon +from taiga.importers import services as import_service class JiraAgileImporter(JiraImporterCommon): @@ -140,15 +141,7 @@ class JiraAgileImporter(JiraImporterCommon): ) self._create_custom_fields(project) - - for user in options.get('users_bindings', {}).values(): - if user != self._user: - Membership.objects.get_or_create( - user=user, - project=project, - role=project.get_roles().get(slug="main"), - is_admin=False, - ) + import_service.create_memberships(options.get('users_bindings', {}), project, self._user, "main") if project_template.slug == "scrum": for sprint in self._client.get_agile("/board/{}/sprint".format(project_id))['values']: diff --git a/taiga/importers/jira/normal.py b/taiga/importers/jira/normal.py index 2854ec26..0db32f35 100644 --- a/taiga/importers/jira/normal.py +++ b/taiga/importers/jira/normal.py @@ -20,7 +20,7 @@ from collections import OrderedDict from django.template.defaultfilters import slugify from taiga.projects.references.models import recalc_reference_counter -from taiga.projects.models import Project, ProjectTemplate, Membership, Points +from taiga.projects.models import Project, ProjectTemplate, Points from taiga.projects.userstories.models import UserStory, RolePoints from taiga.projects.tasks.models import Task from taiga.projects.issues.models import Issue @@ -29,6 +29,7 @@ from taiga.projects.history.services import take_snapshot from taiga.timeline.rebuilder import rebuild_timeline from taiga.timeline.models import Timeline from .common import JiraImporterCommon +from taiga.importers import services as import_service class JiraNormalImporter(JiraImporterCommon): @@ -177,15 +178,8 @@ class JiraNormalImporter(JiraImporterCommon): ) self._create_custom_fields(project) + import_service.create_memberships(options.get('users_bindings', {}), project, self._user, "main") - for user in options.get('users_bindings', {}).values(): - if user != self._user: - Membership.objects.get_or_create( - user=user, - project=project, - role=project.get_roles().get(slug="main"), - is_admin=False, - ) return project def _import_user_stories_data(self, project_id, project, options): diff --git a/taiga/importers/services.py b/taiga/importers/services.py index d2a0e50c..1f99e446 100644 --- a/taiga/importers/services.py +++ b/taiga/importers/services.py @@ -17,6 +17,7 @@ # along with this program. If not, see . from taiga.users.models import User +from taiga.projects.models import Membership def resolve_users_bindings(users_bindings): @@ -29,11 +30,23 @@ def resolve_users_bindings(users_bindings): if isinstance(value, str): try: - new_users_bindings[user_key] = User.objects.get(email_iexact=value) + new_users_bindings[user_key] = User.objects.get(email__iexact=value) except User.MultipleObjectsReturned: new_users_bindings[user_key] = User.objects.get(email=value) - except User.DoesNotExists: + except User.DoesNotExist: new_users_bindings[user_key] = None else: new_users_bindings[user_key] = User.objects.get(id=value) return new_users_bindings + +def create_memberships(users_bindings, project, creator, role_name): + for user in users_bindings.values(): + if Membership.objects.filter(project=project, user=user).count() > 0: + continue + Membership.objects.create( + user=user, + project=project, + role=project.get_roles().get(slug=role_name), + is_admin=False, + invited_by=creator, + ) diff --git a/taiga/importers/trello/importer.py b/taiga/importers/trello/importer.py index bb1ea92f..e84515ea 100644 --- a/taiga/importers/trello/importer.py +++ b/taiga/importers/trello/importer.py @@ -28,7 +28,7 @@ import webcolors from django.template.defaultfilters import slugify from taiga.base import exceptions as exc from taiga.projects.services import projects as projects_service -from taiga.projects.models import Project, ProjectTemplate, Membership +from taiga.projects.models import Project, ProjectTemplate from taiga.projects.userstories.models import UserStory from taiga.projects.tasks.models import Task from taiga.projects.attachments.models import Attachment @@ -44,6 +44,7 @@ from taiga.mdrender.service import render as mdrender from taiga.timeline.rebuilder import rebuild_timeline from taiga.timeline.models import Timeline from taiga.front.templatetags.functions import resolve as resolve_front_url +from taiga.importers import services as import_service from taiga.base import exceptions @@ -250,14 +251,7 @@ class TrelloImporter: order=1, project=project ) - for user in options.get('users_bindings', {}).values(): - Membership.objects.create( - user=user, - project=project, - role=project.get_roles().get(slug="trello"), - is_admin=False, - invited_by=self._user, - ) + import_service.create_memberships(options.get('users_bindings', {}), project, self._user, "trello") return project def _import_user_stories_data(self, data, project, options): From ba7f9b2096663be406598d26a2453444e8acc798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 8 Mar 2017 16:32:57 +0100 Subject: [PATCH 142/144] [i18n] Update locales --- taiga/locale/ca/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/de/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/en/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/es/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/fi/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/fr/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/it/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/ja/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/ko/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/nb/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/nl/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/pl/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/pt_BR/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/ru/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/sv/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/tr/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/zh-Hans/LC_MESSAGES/django.po | 8 ++++---- taiga/locale/zh-Hant/LC_MESSAGES/django.po | 8 ++++---- 18 files changed, 72 insertions(+), 72 deletions(-) diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index 53e717ca..df4a1ab4 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1175,17 +1175,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/de/LC_MESSAGES/django.po b/taiga/locale/de/LC_MESSAGES/django.po index 37a0b75d..b3565d1d 100644 --- a/taiga/locale/de/LC_MESSAGES/django.po +++ b/taiga/locale/de/LC_MESSAGES/django.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1326,17 +1326,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/en/LC_MESSAGES/django.po b/taiga/locale/en/LC_MESSAGES/django.po index f369a528..52aa6596 100644 --- a/taiga/locale/en/LC_MESSAGES/django.po +++ b/taiga/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2015-03-25 20:09+0100\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Taiga Dev Team \n" @@ -1148,17 +1148,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/es/LC_MESSAGES/django.po b/taiga/locale/es/LC_MESSAGES/django.po index 9e180f5c..dcffe647 100644 --- a/taiga/locale/es/LC_MESSAGES/django.po +++ b/taiga/locale/es/LC_MESSAGES/django.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 17:04+0000\n" "Last-Translator: David Barragán \n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1425,17 +1425,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "[%(project)s] Tu proyecto de Trello se ha importado" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "Solicitud inválida: %s en %s" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "No autorizado: %s en %s" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "Recurso no disponible: %s en %s" diff --git a/taiga/locale/fi/LC_MESSAGES/django.po b/taiga/locale/fi/LC_MESSAGES/django.po index 7f96e14e..4a26439a 100644 --- a/taiga/locale/fi/LC_MESSAGES/django.po +++ b/taiga/locale/fi/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1270,17 +1270,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/fr/LC_MESSAGES/django.po b/taiga/locale/fr/LC_MESSAGES/django.po index 3f24353e..fb4a2b1a 100644 --- a/taiga/locale/fr/LC_MESSAGES/django.po +++ b/taiga/locale/fr/LC_MESSAGES/django.po @@ -25,7 +25,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1302,17 +1302,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/it/LC_MESSAGES/django.po b/taiga/locale/it/LC_MESSAGES/django.po index 7cfa7aa2..a11979d7 100644 --- a/taiga/locale/it/LC_MESSAGES/django.po +++ b/taiga/locale/it/LC_MESSAGES/django.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:55+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1406,17 +1406,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po index 1e802723..5e26385d 100644 --- a/taiga/locale/ja/LC_MESSAGES/django.po +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Japanese (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1340,17 +1340,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/ko/LC_MESSAGES/django.po b/taiga/locale/ko/LC_MESSAGES/django.po index 45478f06..360d24ff 100644 --- a/taiga/locale/ko/LC_MESSAGES/django.po +++ b/taiga/locale/ko/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:55+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Korean (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1336,17 +1336,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "유효하지 않은 요청: %s 의 %s" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "인증되지 않음: %s 의 %s" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "자원 사용 불가: %s 의 %s" diff --git a/taiga/locale/nb/LC_MESSAGES/django.po b/taiga/locale/nb/LC_MESSAGES/django.po index 73d6c11c..02037b90 100644 --- a/taiga/locale/nb/LC_MESSAGES/django.po +++ b/taiga/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/taiga-agile-llc/" @@ -1185,17 +1185,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/nl/LC_MESSAGES/django.po b/taiga/locale/nl/LC_MESSAGES/django.po index 127d2dda..415ad207 100644 --- a/taiga/locale/nl/LC_MESSAGES/django.po +++ b/taiga/locale/nl/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1215,17 +1215,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/pl/LC_MESSAGES/django.po b/taiga/locale/pl/LC_MESSAGES/django.po index c6e786e3..234fc090 100644 --- a/taiga/locale/pl/LC_MESSAGES/django.po +++ b/taiga/locale/pl/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1284,17 +1284,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/pt_BR/LC_MESSAGES/django.po b/taiga/locale/pt_BR/LC_MESSAGES/django.po index 26001611..2b7b2c5e 100644 --- a/taiga/locale/pt_BR/LC_MESSAGES/django.po +++ b/taiga/locale/pt_BR/LC_MESSAGES/django.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/" @@ -1315,17 +1315,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/ru/LC_MESSAGES/django.po b/taiga/locale/ru/LC_MESSAGES/django.po index c33ba19b..2049794e 100644 --- a/taiga/locale/ru/LC_MESSAGES/django.po +++ b/taiga/locale/ru/LC_MESSAGES/django.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:55+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1310,17 +1310,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/sv/LC_MESSAGES/django.po b/taiga/locale/sv/LC_MESSAGES/django.po index f8e24851..09ac5ea3 100644 --- a/taiga/locale/sv/LC_MESSAGES/django.po +++ b/taiga/locale/sv/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Swedish (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1166,17 +1166,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/tr/LC_MESSAGES/django.po b/taiga/locale/tr/LC_MESSAGES/django.po index 0152eef1..7fb9c720 100644 --- a/taiga/locale/tr/LC_MESSAGES/django.po +++ b/taiga/locale/tr/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Turkish (http://www.transifex.com/taiga-agile-llc/taiga-back/" @@ -1275,17 +1275,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/zh-Hans/LC_MESSAGES/django.po b/taiga/locale/zh-Hans/LC_MESSAGES/django.po index 54dcfdaf..0a8a11d2 100644 --- a/taiga/locale/zh-Hans/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hans/LC_MESSAGES/django.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:55+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Simplified (http://www.transifex.com/taiga-agile-llc/" @@ -1326,17 +1326,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" diff --git a/taiga/locale/zh-Hant/LC_MESSAGES/django.po b/taiga/locale/zh-Hant/LC_MESSAGES/django.po index 8575f0da..55aa4ec4 100644 --- a/taiga/locale/zh-Hant/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hant/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-06 17:53+0100\n" +"POT-Creation-Date: 2017-03-08 16:30+0100\n" "PO-Revision-Date: 2017-03-06 16:54+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/" @@ -1260,17 +1260,17 @@ msgstr "" msgid "[%(project)s] Your Trello project has been imported" msgstr "" -#: taiga/importers/trello/importer.py:77 +#: taiga/importers/trello/importer.py:78 #, python-format msgid "Invalid Request: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:79 taiga/importers/trello/importer.py:81 +#: taiga/importers/trello/importer.py:80 taiga/importers/trello/importer.py:82 #, python-format msgid "Unauthorized: %s at %s" msgstr "" -#: taiga/importers/trello/importer.py:83 taiga/importers/trello/importer.py:85 +#: taiga/importers/trello/importer.py:84 taiga/importers/trello/importer.py:86 #, python-format msgid "Resource Unavailable: %s at %s" msgstr "" From ad60ac223535208081ca8e8f231d821f199a04bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 8 Mar 2017 16:51:41 +0100 Subject: [PATCH 143/144] Catch amqp.exception.AccessRefused in taiga.events backend --- taiga/events/backends/rabbitmq.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/taiga/events/backends/rabbitmq.py b/taiga/events/backends/rabbitmq.py index 99b34629..602e74ad 100644 --- a/taiga/events/backends/rabbitmq.py +++ b/taiga/events/backends/rabbitmq.py @@ -17,6 +17,7 @@ import json import logging from amqp import Connection as AmqpConnection +from amqp.exceptions import AccessRefused from amqp.basic_message import Message as AmqpMessage from urllib.parse import urlparse @@ -53,8 +54,13 @@ class EventsPushBackend(base.BaseEventsPushBackend): try: connection.connect() except ConnectionRefusedError: - log.error("EventsPushBackend: Unable to connect with RabbitMQ at {}".format(self.url), - exc_info=True) + err_msg = "EventsPushBackend: Unable to connect with RabbitMQ (connection refused) at {}".format( + self.url) + log.error(err_msg, exc_info=True) + except AccessRefused: + err_msg = "EventsPushBackend: Unable to connect with RabbitMQ (access refused) at {}".format( + self.url) + log.error(err_msg, exc_info=True) else: try: message = AmqpMessage(message) @@ -64,7 +70,6 @@ class EventsPushBackend(base.BaseEventsPushBackend): rchannel.basic_publish(message, routing_key=routing_key, exchange=channel) rchannel.close() except Exception: - log.error("EventsPushBackend: Unhandled exception", - exc_info=True) + log.error("EventsPushBackend: Unhandled exception", exc_info=True) finally: connection.close() From f390404b9851ca7b2a90c7d9949a4940a4e88616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 9 Mar 2017 09:30:03 +0100 Subject: [PATCH 144/144] Issue#4995 Fix problems with multiline commits in the webhooks --- taiga/hooks/bitbucket/event_hooks.py | 1 + taiga/hooks/event_hooks.py | 4 ++-- taiga/hooks/github/event_hooks.py | 3 ++- taiga/hooks/gitlab/event_hooks.py | 1 + taiga/hooks/gogs/event_hooks.py | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/taiga/hooks/bitbucket/event_hooks.py b/taiga/hooks/bitbucket/event_hooks.py index f31b5381..7021f61b 100644 --- a/taiga/hooks/bitbucket/event_hooks.py +++ b/taiga/hooks/bitbucket/event_hooks.py @@ -80,5 +80,6 @@ class PushEventHook(BaseBitBucketEventHook, BasePushEventHook): "commit_id": commit.get("hash", None), "commit_url": commit.get("links", {}).get('html', {}).get('href'), "commit_message": message.strip(), + "commit_short_message": message.split("\n")[0].strip(), }) return result diff --git a/taiga/hooks/event_hooks.py b/taiga/hooks/event_hooks.py index 8ab6e44d..6fa574c4 100644 --- a/taiga/hooks/event_hooks.py +++ b/taiga/hooks/event_hooks.py @@ -154,7 +154,7 @@ class BasePushEventHook(BaseEventHook): ) _status_change_message = _( "{user_text} changed the status from " - "[{platform} commit]({commit_url} \"See commit '{commit_id} - {commit_message}'\")\n\n" + "[{platform} commit]({commit_url} \"See commit '{commit_id} - {commit_short_message}'\")\n\n" " - Status: **{src_status}** → **{dst_status}**" ) _simple_status_change_message = _( @@ -177,7 +177,7 @@ class BasePushEventHook(BaseEventHook): _status_change_message = _( "This {type_name} has been mentioned by {user_text} " - "in the [{platform} commit]({commit_url} \"See commit '{commit_id} - {commit_message}'\") " + "in the [{platform} commit]({commit_url} \"See commit '{commit_id} - {commit_short_message}'\") " "\"{commit_message}\"" ) _simple_status_change_message = _( diff --git a/taiga/hooks/github/event_hooks.py b/taiga/hooks/github/event_hooks.py index 32724a71..6994f528 100644 --- a/taiga/hooks/github/event_hooks.py +++ b/taiga/hooks/github/event_hooks.py @@ -81,7 +81,8 @@ class PushEventHook(BaseGitHubEventHook, BasePushEventHook): "user_url": github_user.get('html_url', None), "commit_id": commit.get("id", None), "commit_url": commit.get("url", None), - "commit_message": commit.get("message", None), + "commit_message": commit.get("message").strip(), + "commit_short_message": commit.get("message").split("\n")[0].strip(), }) return result diff --git a/taiga/hooks/gitlab/event_hooks.py b/taiga/hooks/gitlab/event_hooks.py index 13f0f1e1..903daea4 100644 --- a/taiga/hooks/gitlab/event_hooks.py +++ b/taiga/hooks/gitlab/event_hooks.py @@ -85,5 +85,6 @@ class PushEventHook(BaseGitLabEventHook, BasePushEventHook): "commit_id": commit.get("id", None), "commit_url": commit.get("url", None), "commit_message": commit.get("message").strip(), + "commit_short_message": commit.get("message").split("\n")[0].strip(), }) return result diff --git a/taiga/hooks/gogs/event_hooks.py b/taiga/hooks/gogs/event_hooks.py index 885a668a..e2007ed5 100644 --- a/taiga/hooks/gogs/event_hooks.py +++ b/taiga/hooks/gogs/event_hooks.py @@ -47,6 +47,7 @@ class PushEventHook(BaseGogsEventHook, BasePushEventHook): "user_url": os.path.join(os.path.dirname(os.path.dirname(project_url)), user_name), "commit_id": commit.get("id", None), "commit_url": commit.get("url", None), - "commit_message": commit.get("message", None), + "commit_message": commit.get("message").strip(), + "commit_short_message": commit.get("message").split("\n")[0].strip(), }) return result
    - - - Taiga logo + + +
    - Taiga logo + {% trans %}

    You have been Taigatized!

    diff --git a/taiga/base/templates/emails/updates-body-html.jinja b/taiga/base/templates/emails/updates-body-html.jinja index 94d5b1ff..e542a091 100644 --- a/taiga/base/templates/emails/updates-body-html.jinja +++ b/taiga/base/templates/emails/updates-body-html.jinja @@ -395,7 +395,7 @@ - Taiga logo + {% block head %} {% endblock %} From e53fd229197e60f7f2ec258b3ab36d87b1ee501d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 14 Dec 2016 10:51:58 +0100 Subject: [PATCH 068/144] Add alt text in Taiga logo for emails --- taiga/base/templates/emails/base-body-html.jinja | 2 +- taiga/base/templates/emails/hero-body-html.jinja | 2 +- taiga/base/templates/emails/updates-body-html.jinja | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/taiga/base/templates/emails/base-body-html.jinja b/taiga/base/templates/emails/base-body-html.jinja index 6f644f0a..9a5fb68b 100644 --- a/taiga/base/templates/emails/base-body-html.jinja +++ b/taiga/base/templates/emails/base-body-html.jinja @@ -400,7 +400,7 @@     		- + Taiga
    - + Taiga {% trans %}

    You have been Taigatized!

    diff --git a/taiga/base/templates/emails/updates-body-html.jinja b/taiga/base/templates/emails/updates-body-html.jinja index e542a091..f07dbe74 100644 --- a/taiga/base/templates/emails/updates-body-html.jinja +++ b/taiga/base/templates/emails/updates-body-html.jinja @@ -395,7 +395,7 @@ - + Taiga {% block head %} {% endblock %} From c53530f6e2ab2b8277d012f0d4cab0fdd86422c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 14 Dec 2016 15:33:55 +0100 Subject: [PATCH 069/144] Fix issue #4832: 'OneToOneField' object has no attribute 'related' --- taiga/projects/admin.py | 23 ++++++++--------------- taiga/projects/attachments/admin.py | 2 +- taiga/projects/epics/admin.py | 4 ++-- taiga/projects/issues/admin.py | 4 ++-- taiga/projects/milestones/admin.py | 2 +- taiga/projects/tasks/admin.py | 4 ++-- taiga/projects/userstories/admin.py | 4 ++-- taiga/projects/wiki/admin.py | 2 +- 8 files changed, 19 insertions(+), 26 deletions(-) diff --git a/taiga/projects/admin.py b/taiga/projects/admin.py index 9f7f5431..5c7cd25a 100644 --- a/taiga/projects/admin.py +++ b/taiga/projects/admin.py @@ -44,11 +44,11 @@ class MembershipAdmin(admin.ModelAdmin): def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name in ["user", "invited_by"] and getattr(self, 'obj', None): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( memberships__project=self.obj.project) elif db_field.name in ["role"] and getattr(self, 'obj', None): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( project=self.obj.project) return super().formfield_for_foreignkey(db_field, request, **kwargs) @@ -59,17 +59,17 @@ class MembershipInline(admin.TabularInline): extra = 0 def get_formset(self, request, obj=None, **kwargs): - # Hack! Hook parent obj just in time to use in formfield_for_manytomany + # Hack! Hook parent obj just in time to use in formfield_for_foreignkey self.parent_obj = obj return super(MembershipInline, self).get_formset(request, obj, **kwargs) def formfield_for_foreignkey(self, db_field, request, **kwargs): if (db_field.name in ["user", "invited_by"]): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( memberships__project=self.parent_obj) elif (db_field.name in ["role"]): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( project=self.parent_obj) return super().formfield_for_foreignkey(db_field, request, **kwargs) @@ -152,25 +152,18 @@ class ProjectAdmin(admin.ModelAdmin): "default_priority", "default_severity", "default_issue_status", "default_issue_type"]): if getattr(self, 'obj', None): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( project=self.obj) else: - kwargs["queryset"] = db_field.related.model.objects.none() + kwargs["queryset"] = db_field.related_model.objects.none() elif (db_field.name in ["owner"] and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( memberships__project=self.obj.project) return super().formfield_for_foreignkey(db_field, request, **kwargs) - def formfield_for_manytomany(self, db_field, request, **kwargs): - if (db_field.name in ["watchers"] - and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.parent_model.objects.filter( - memberships__project=self.obj) - return super().formfield_for_manytomany(db_field, request, **kwargs) - def delete_model(self, request, obj): obj.delete_related_content() super().delete_model(request, obj) diff --git a/taiga/projects/attachments/admin.py b/taiga/projects/attachments/admin.py index befbef4f..40dd7aac 100644 --- a/taiga/projects/attachments/admin.py +++ b/taiga/projects/attachments/admin.py @@ -34,7 +34,7 @@ class AttachmentAdmin(admin.ModelAdmin): def formfield_for_foreignkey(self, db_field, request, **kwargs): if (db_field.name in ["owner"]and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( memberships__project=self.obj.project) return super().formfield_for_foreignkey(db_field, request, **kwargs) diff --git a/taiga/projects/epics/admin.py b/taiga/projects/epics/admin.py index 69aea806..a5dff623 100644 --- a/taiga/projects/epics/admin.py +++ b/taiga/projects/epics/admin.py @@ -44,10 +44,10 @@ class EpicAdmin(admin.ModelAdmin): def formfield_for_foreignkey(self, db_field, request, **kwargs): if (db_field.name in ["status"] and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter(project=self.obj.project) + kwargs["queryset"] = db_field.related_model.objects.filter(project=self.obj.project) elif (db_field.name in ["owner", "assigned_to"] and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter(memberships__project=self.obj.project) + kwargs["queryset"] = db_field.related_model.objects.filter(memberships__project=self.obj.project) return super().formfield_for_foreignkey(db_field, request, **kwargs) diff --git a/taiga/projects/issues/admin.py b/taiga/projects/issues/admin.py index 06be1a03..9618bffa 100644 --- a/taiga/projects/issues/admin.py +++ b/taiga/projects/issues/admin.py @@ -39,11 +39,11 @@ class IssueAdmin(admin.ModelAdmin): def formfield_for_foreignkey(self, db_field, request, **kwargs): if (db_field.name in ["status", "priority", "severity", "type", "milestone"] and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( project=self.obj.project) elif (db_field.name in ["owner", "assigned_to"] and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( memberships__project=self.obj.project) return super().formfield_for_foreignkey(db_field, request, **kwargs) diff --git a/taiga/projects/milestones/admin.py b/taiga/projects/milestones/admin.py index d3f8c994..2636c7d2 100644 --- a/taiga/projects/milestones/admin.py +++ b/taiga/projects/milestones/admin.py @@ -34,7 +34,7 @@ class MilestoneInline(admin.TabularInline): def formfield_for_foreignkey(self, db_field, request, **kwargs): if (db_field.name in ["owner"]): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( memberships__project=self.parent_obj) return super().formfield_for_foreignkey(db_field, request, **kwargs) diff --git a/taiga/projects/tasks/admin.py b/taiga/projects/tasks/admin.py index 281cdb11..9d094906 100644 --- a/taiga/projects/tasks/admin.py +++ b/taiga/projects/tasks/admin.py @@ -39,11 +39,11 @@ class TaskAdmin(admin.ModelAdmin): def formfield_for_foreignkey(self, db_field, request, **kwargs): if (db_field.name in ["status", "milestone", "user_story"] and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( project=self.obj.project) elif (db_field.name in ["owner", "assigned_to"] and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( memberships__project=self.obj.project) return super().formfield_for_foreignkey(db_field, request, **kwargs) diff --git a/taiga/projects/userstories/admin.py b/taiga/projects/userstories/admin.py index 50c8bb7b..6ea5a100 100644 --- a/taiga/projects/userstories/admin.py +++ b/taiga/projects/userstories/admin.py @@ -54,11 +54,11 @@ class UserStoryAdmin(admin.ModelAdmin): def formfield_for_foreignkey(self, db_field, request, **kwargs): if (db_field.name in ["status", "milestone", "generated_from_issue"] and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( project=self.obj.project) elif (db_field.name in ["owner", "assigned_to"] and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( memberships__project=self.obj.project) return super().formfield_for_foreignkey(db_field, request, **kwargs) diff --git a/taiga/projects/wiki/admin.py b/taiga/projects/wiki/admin.py index 73834938..2f0d1636 100644 --- a/taiga/projects/wiki/admin.py +++ b/taiga/projects/wiki/admin.py @@ -38,7 +38,7 @@ class WikiPageAdmin(admin.ModelAdmin): def formfield_for_foreignkey(self, db_field, request, **kwargs): if (db_field.name in ["owner", "last_modifier"] and getattr(self, 'obj', None)): - kwargs["queryset"] = db_field.related.model.objects.filter( + kwargs["queryset"] = db_field.related_model.objects.filter( memberships__project=self.obj.project) return super().formfield_for_foreignkey(db_field, request, **kwargs) From c84f0fdf2ef0a80f092d2e35cd6cf5a1fdb2754a Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 14 Dec 2016 13:00:38 +0100 Subject: [PATCH 070/144] Issue 4822: Error in US estimations when created from Epics --- taiga/projects/epics/services.py | 2 ++ taiga/projects/userstories/services.py | 3 ++- tests/integration/test_userstories.py | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/taiga/projects/epics/services.py b/taiga/projects/epics/services.py index 2921a35e..e2e712d4 100644 --- a/taiga/projects/epics/services.py +++ b/taiga/projects/epics/services.py @@ -108,6 +108,7 @@ def create_related_userstories_in_bulk(bulk_data, epic, **additional_fields): :return: List of created `Task` instances. """ userstories = get_userstories_from_bulk(bulk_data, **additional_fields) + project = additional_fields.get("project") disconnect_userstories_signals() try: @@ -121,6 +122,7 @@ def create_related_userstories_in_bulk(bulk_data, epic, **additional_fields): ) ) db.save_in_bulk(related_userstories) + project.update_role_points(user_stories=userstories) finally: connect_userstories_signals() diff --git a/taiga/projects/userstories/services.py b/taiga/projects/userstories/services.py index 9a94fecd..a7ded8e5 100644 --- a/taiga/projects/userstories/services.py +++ b/taiga/projects/userstories/services.py @@ -64,11 +64,12 @@ def create_userstories_in_bulk(bulk_data, callback=None, precall=None, **additio :return: List of created `Task` instances. """ userstories = get_userstories_from_bulk(bulk_data, **additional_fields) - + project = additional_fields.get("project") disconnect_userstories_signals() try: db.save_in_bulk(userstories, callback, precall) + project.update_role_points(user_stories=userstories) finally: connect_userstories_signals() diff --git a/tests/integration/test_userstories.py b/tests/integration/test_userstories.py index 3ff5f345..69d6af4a 100644 --- a/tests/integration/test_userstories.py +++ b/tests/integration/test_userstories.py @@ -47,9 +47,10 @@ def test_get_userstories_from_bulk(): def test_create_userstories_in_bulk(): data = "User Story #1\nUser Story #2\n" + project = f.ProjectFactory.create() with mock.patch("taiga.projects.userstories.services.db") as db: - userstories = services.create_userstories_in_bulk(data) + userstories = services.create_userstories_in_bulk(data, project=project) db.save_in_bulk.assert_called_once_with(userstories, None, None) From 1d3691469cd010c5071af0ba9ce8ab224c301d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Fri, 16 Dec 2016 14:06:27 +0100 Subject: [PATCH 071/144] Update some requirements --- requirements-devel.txt | 4 ++-- requirements.txt | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/requirements-devel.txt b/requirements-devel.txt index 8fd114df..c4cb4333 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -2,8 +2,8 @@ factory_boy==2.7.0 py==1.4.31 -pytest==3.0.3 -pytest-django==3.0.0 +pytest==3.0.5 +pytest-django==3.1.2 pytest-pythonpath==0.7.1 coverage==4.2 diff --git a/requirements.txt b/requirements.txt index 3307aed7..f6ea081a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ -Django==1.10.3 +Django==1.10.4 #djangorestframework==2.3.13 # It's not necessary since Taiga 1.7 django-picklefield==0.3.2 -django-sampledatahelper==0.4.0 +django-sampledatahelper==0.4.1 gunicorn==19.6.0 psycopg2==2.6.2 Pillow==3.4.2 -pytz==2016.7 +pytz==2016.10 six==1.10.0 -amqp==2.1.1 +amqp==2.1.4 djmail==0.13.1 django-jinja==2.2.1 jinja2==2.8 @@ -16,20 +16,20 @@ django-sites==0.9 Markdown==2.6.7 fn==0.4.3 diff-match-patch==20121119 -requests==2.9.1 +requests==2.12.4 django-sr==0.0.4 easy-thumbnails==2.3 celery==3.1.24 redis==2.10.5 Unidecode==0.04.19 -raven==5.10.2 -bleach==1.4.3 +raven==5.32.0 +bleach==1.5.0 django-ipware==1.1.6 premailer==3.0.1 cssutils==1.0.1 # Compatible with python 3.5 -lxml==3.6.4 +lxml==3.7.0 git+https://github.com/Xof/django-pglocks.git -pyjwkest==1.3.1 -python-dateutil==2.5.3 +pyjwkest==1.3.2 +python-dateutil==2.6.0 netaddr==0.7.18 serpy==0.1.1 From 27dead138358d22058249340dc3fdd4c71ca8ddb Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 30 Dec 2016 09:28:57 +0100 Subject: [PATCH 072/144] Fixing error for empty tags --- taiga/projects/tagging/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taiga/projects/tagging/fields.py b/taiga/projects/tagging/fields.py index 47553d8c..3a33ca87 100644 --- a/taiga/projects/tagging/fields.py +++ b/taiga/projects/tagging/fields.py @@ -43,7 +43,7 @@ class TagsAndTagsColorsField(serializers.WritableField): color = tag[1] if isinstance(name, str): - if color is None: + if color is None or color == "": continue if isinstance(color, str) and re.match('^\#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$', color): From 7bf5ad1a4bc7823ef5d1e96bc1f3f92b3295a33c Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 2 Jan 2017 10:01:24 +0100 Subject: [PATCH 073/144] Limiting max number of pending memberships --- settings/common.py | 2 ++ taiga/projects/services/members.py | 5 ++++ tests/integration/test_memberships.py | 40 +++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/settings/common.py b/settings/common.py index c1a60956..2b41d7d8 100644 --- a/settings/common.py +++ b/settings/common.py @@ -549,6 +549,8 @@ MAX_PUBLIC_PROJECTS_PER_USER = None # None == no limit MAX_MEMBERSHIPS_PRIVATE_PROJECTS = None # None == no limit MAX_MEMBERSHIPS_PUBLIC_PROJECTS = None # None == no limit +MAX_PENDING_MEMBERSHIPS = 30 # Max number of unconfirmed memberships in a project + from .sr import * diff --git a/taiga/projects/services/members.py b/taiga/projects/services/members.py index 3cd9b514..52c62eca 100644 --- a/taiga/projects/services/members.py +++ b/taiga/projects/services/members.py @@ -20,6 +20,7 @@ from taiga.base.exceptions import ValidationError from taiga.base.utils import db, text from taiga.users.models import User +from django.conf import settings from django.core.validators import validate_email from django.utils.translation import ugettext as _ @@ -143,4 +144,8 @@ def check_if_project_can_have_more_memberships(project, total_new_memberships): if max_memberships is not None and total_memberships > max_memberships: return False, error_members_exceeded + if project.memberships.filter(user=None).count() + total_new_memberships > settings.MAX_PENDING_MEMBERSHIPS: + error_pending_memberships_exceeded = _("You have reached the current limit of pending memberships") + return False, error_pending_memberships_exceeded + return True, None diff --git a/tests/integration/test_memberships.py b/tests/integration/test_memberships.py index b9c3dc95..16d642bf 100644 --- a/tests/integration/test_memberships.py +++ b/tests/integration/test_memberships.py @@ -657,3 +657,43 @@ def test_api_delete_membership_without_user(client): response = client.json.delete(url) assert response.status_code == 204 + + +def test_api_create_member_max_pending_memberships(client, settings): + settings.MAX_PENDING_MEMBERSHIPS = 2 + project = f.ProjectFactory() + john = f.UserFactory.create() + joseph = f.UserFactory.create() + tester = f.RoleFactory(project=project, name="Tester") + f.MembershipFactory(project=project, user=john, is_admin=True) + f.MembershipFactory(project=project, user=None) + f.MembershipFactory(project=project, user=None) + + url = reverse("memberships-list") + data = {"project": project.id, "role": tester.id, "username": joseph.email} + client.login(john) + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 400 + assert "limit of pending memberships" in response.data["_error_message"] + + +def test_api_create_bulk_members_max_pending_memberships(client, settings): + settings.MAX_PENDING_MEMBERSHIPS = 2 + project = f.ProjectFactory() + john = f.UserFactory.create() + joseph = f.UserFactory.create() + tester = f.RoleFactory(project=project, name="Tester") + f.MembershipFactory(project=project, user=john, is_admin=True) + f.MembershipFactory(project=project, user=None) + f.MembershipFactory(project=project, user=None) + + url = reverse("memberships-bulk-create") + data = { + "project_id": project.id, + "bulk_memberships": [ + {"role_id": tester.id, "username": "testing@taiga.io"}, + ] + } + client.login(john) + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 400 From 81ddea4f771ff2015d9660e2f986af871ff4893b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 2 Jan 2017 11:02:45 +0100 Subject: [PATCH 074/144] Adding throttling to memberships --- settings/common.py | 1 + settings/testing.py | 1 + taiga/base/throttling.py | 12 ++++ taiga/projects/api.py | 2 + taiga/projects/throttling.py | 24 ++++++++ tests/integration/test_memberships.py | 85 +++++++++++++++++++++++++++ 6 files changed, 125 insertions(+) create mode 100644 taiga/projects/throttling.py diff --git a/settings/common.py b/settings/common.py index 2b41d7d8..51849f79 100644 --- a/settings/common.py +++ b/settings/common.py @@ -440,6 +440,7 @@ REST_FRAMEWORK = { "user": None, "import-mode": None, "import-dump-mode": "1/minute", + "memberships": None, }, "FILTER_BACKEND": "taiga.base.filters.FilterBackend", "EXCEPTION_HANDLER": "taiga.base.exceptions.exception_handler", diff --git a/settings/testing.py b/settings/testing.py index 29dd67d2..9af0e6c8 100644 --- a/settings/testing.py +++ b/settings/testing.py @@ -33,4 +33,5 @@ REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"] = { "user": None, "import-mode": None, "import-dump-mode": None, + "memberships": None, } diff --git a/taiga/base/throttling.py b/taiga/base/throttling.py index c0577ce0..f2484ea9 100644 --- a/taiga/base/throttling.py +++ b/taiga/base/throttling.py @@ -21,7 +21,19 @@ from taiga.base.api import throttling class AnonRateThrottle(throttling.AnonRateThrottle): scope = "anon" + throttled_methods = ["GET", "POST", "PUT", "DELETE", "PATCH"] + + def allow_request(self, request, view): + if request.method not in self.throttled_methods: + return True + return super().allow_request(request, view) class UserRateThrottle(throttling.UserRateThrottle): scope = "user" + throttled_methods = ["GET", "POST", "PUT", "DELETE", "PATCH"] + + def allow_request(self, request, view): + if request.method not in self.throttled_methods: + return True + return super().allow_request(request, view) diff --git a/taiga/projects/api.py b/taiga/projects/api.py index cbe4a897..7f9d0611 100644 --- a/taiga/projects/api.py +++ b/taiga/projects/api.py @@ -60,6 +60,7 @@ from . import serializers from . import validators from . import services from . import utils as project_utils +from . import throttling ###################################################### # Project @@ -658,6 +659,7 @@ class MembershipViewSet(BlockedByProjectMixin, ModelCrudViewSet): permission_classes = (permissions.MembershipPermission,) filter_backends = (filters.CanViewProjectFilterBackend,) filter_fields = ("project", "role") + throttle_classes = (throttling.MembershipsRateThrottle,) def get_serializer_class(self): use_admin_serializer = False diff --git a/taiga/projects/throttling.py b/taiga/projects/throttling.py new file mode 100644 index 00000000..f3da1ba3 --- /dev/null +++ b/taiga/projects/throttling.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from taiga.base import throttling + + +class MembershipsRateThrottle(throttling.UserRateThrottle): + scope = "memberships" + throttled_methods = ["POST", "PUT"] diff --git a/tests/integration/test_memberships.py b/tests/integration/test_memberships.py index 16d642bf..5eb75486 100644 --- a/tests/integration/test_memberships.py +++ b/tests/integration/test_memberships.py @@ -697,3 +697,88 @@ def test_api_create_bulk_members_max_pending_memberships(client, settings): client.login(john) response = client.json.post(url, json.dumps(data)) assert response.status_code == 400 + assert "limit of pending memberships" in response.data["_error_message"] + + +def test_create_memberhips_throttling(client, settings): + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = "1/minute" + + membership = f.MembershipFactory(is_admin=True) + role = f.RoleFactory.create(project=membership.project) + user = f.UserFactory.create() + user2 = f.UserFactory.create() + + client.login(membership.user) + url = reverse("memberships-list") + data = {"role": role.pk, "project": role.project.pk, "username": user.email} + response = client.json.post(url, json.dumps(data)) + + assert response.status_code == 201 + assert response.data["user_email"] == user.email + + data = {"role": role.pk, "project": role.project.pk, "username": user2.email} + response = client.json.post(url, json.dumps(data)) + + assert response.status_code == 429 + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = None + + +def test_api_resend_invitation_throttling(client, outbox, settings): + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = "1/minute" + + invitation = f.create_invitation(user=None) + f.MembershipFactory(project=invitation.project, user=invitation.project.owner, is_admin=True) + url = reverse("memberships-resend-invitation", kwargs={"pk": invitation.pk}) + + client.login(invitation.project.owner) + response = client.post(url) + + assert response.status_code == 204 + assert len(outbox) == 1 + assert outbox[0].to == [invitation.email] + + response = client.post(url) + + assert response.status_code == 429 + assert len(outbox) == 1 + assert outbox[0].to == [invitation.email] + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = None + + +def test_api_create_bulk_members_throttling(client, settings): + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = "1/minute" + + project = f.ProjectFactory() + john = f.UserFactory.create() + joseph = f.UserFactory.create() + other = f.UserFactory.create() + tester = f.RoleFactory(project=project, name="Tester", permissions=["view_project"]) + gamer = f.RoleFactory(project=project, name="Gamer", permissions=["view_project"]) + f.MembershipFactory(project=project, user=john, role=tester, is_admin=True) + + # John and Other are members from another project + project2 = f.ProjectFactory() + f.MembershipFactory(project=project2, user=john, role=gamer, is_admin=True) + f.MembershipFactory(project=project2, user=other, role=gamer) + + url = reverse("memberships-bulk-create") + + data = { + "project_id": project.id, + "bulk_memberships": [ + {"role_id": gamer.pk, "username": joseph.email}, + {"role_id": gamer.pk, "username": other.username}, + ] + } + client.login(john) + response = client.json.post(url, json.dumps(data)) + + assert response.status_code == 200 + response_user_ids = set([u["user"] for u in response.data]) + user_ids = {other.id, joseph.id} + assert(user_ids.issubset(response_user_ids)) + + response = client.json.post(url, json.dumps(data)) + + assert response.status_code == 429 + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = None From 83c445dd2fc15e66d1f074657f60e3632c9fed5c Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 4 Jan 2017 08:42:57 +0100 Subject: [PATCH 075/144] Throttling membership creation --- settings/common.py | 2 +- settings/testing.py | 2 +- taiga/base/api/throttling.py | 12 ++++++++---- taiga/projects/throttling.py | 17 ++++++++++++++++- tests/integration/test_memberships.py | 12 ++++++------ 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/settings/common.py b/settings/common.py index 51849f79..8bd85f62 100644 --- a/settings/common.py +++ b/settings/common.py @@ -440,7 +440,7 @@ REST_FRAMEWORK = { "user": None, "import-mode": None, "import-dump-mode": "1/minute", - "memberships": None, + "create-memberships": None }, "FILTER_BACKEND": "taiga.base.filters.FilterBackend", "EXCEPTION_HANDLER": "taiga.base.exceptions.exception_handler", diff --git a/settings/testing.py b/settings/testing.py index 9af0e6c8..c8875026 100644 --- a/settings/testing.py +++ b/settings/testing.py @@ -33,5 +33,5 @@ REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"] = { "user": None, "import-mode": None, "import-dump-mode": None, - "memberships": None, + "create-memberships": None, } diff --git a/taiga/base/api/throttling.py b/taiga/base/api/throttling.py index b23bea09..74178922 100644 --- a/taiga/base/api/throttling.py +++ b/taiga/base/api/throttling.py @@ -153,11 +153,15 @@ class SimpleRateThrottle(BaseThrottle): # throttle duration while self.history and self.history[-1] <= self.now - self.duration: self.history.pop() - if len(self.history) >= self.num_requests: - return self.throttle_failure() - return self.throttle_success() - def throttle_success(self): + if self.exceeded_throttling_restriction(request, view): + return self.throttle_failure() + return self.throttle_success(request, view) + + def exceeded_throttling_restriction(self, request, view): + return len(self.history) >= self.num_requests + + def throttle_success(self, request, view): """ Inserts the current request's timestamp along with the key into the cache. diff --git a/taiga/projects/throttling.py b/taiga/projects/throttling.py index f3da1ba3..7694b274 100644 --- a/taiga/projects/throttling.py +++ b/taiga/projects/throttling.py @@ -20,5 +20,20 @@ from taiga.base import throttling class MembershipsRateThrottle(throttling.UserRateThrottle): - scope = "memberships" + scope = "create-memberships" throttled_methods = ["POST", "PUT"] + + def exceeded_throttling_restriction(self, request, view): + self.created_memberships = 0 + if view.action in ["create", "resend_invitation"]: + self.created_memberships = 1 + elif view.action == "bulk_create": + self.created_memberships = len(request.DATA.get("bulk_memberships", [])) + return len(self.history) + self.created_memberships > self.num_requests + + def throttle_success(self, request, view): + for i in range(self.created_memberships): + self.history.insert(0, self.now) + + self.cache.set(self.key, self.history, self.duration) + return True diff --git a/tests/integration/test_memberships.py b/tests/integration/test_memberships.py index 5eb75486..4f3568b9 100644 --- a/tests/integration/test_memberships.py +++ b/tests/integration/test_memberships.py @@ -701,7 +701,7 @@ def test_api_create_bulk_members_max_pending_memberships(client, settings): def test_create_memberhips_throttling(client, settings): - settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = "1/minute" + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["create-memberships"] = "1/minute" membership = f.MembershipFactory(is_admin=True) role = f.RoleFactory.create(project=membership.project) @@ -720,11 +720,11 @@ def test_create_memberhips_throttling(client, settings): response = client.json.post(url, json.dumps(data)) assert response.status_code == 429 - settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = None + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["create-memberships"] = None def test_api_resend_invitation_throttling(client, outbox, settings): - settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = "1/minute" + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["create-memberships"] = "1/minute" invitation = f.create_invitation(user=None) f.MembershipFactory(project=invitation.project, user=invitation.project.owner, is_admin=True) @@ -742,11 +742,11 @@ def test_api_resend_invitation_throttling(client, outbox, settings): assert response.status_code == 429 assert len(outbox) == 1 assert outbox[0].to == [invitation.email] - settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = None + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["create-memberships"] = None def test_api_create_bulk_members_throttling(client, settings): - settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = "1/minute" + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["create-memberships"] = "2/minute" project = f.ProjectFactory() john = f.UserFactory.create() @@ -781,4 +781,4 @@ def test_api_create_bulk_members_throttling(client, settings): response = client.json.post(url, json.dumps(data)) assert response.status_code == 429 - settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["memberships"] = None + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["create-memberships"] = None From 3d5b98d2a9c2d23fc895767dc9f346ac5a4bfa6e Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 4 Jan 2017 11:57:23 +0100 Subject: [PATCH 076/144] Fixing testing requirements --- requirements-devel.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-devel.txt b/requirements-devel.txt index c4cb4333..b491f29a 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -1,6 +1,6 @@ -r requirements.txt -factory_boy==2.7.0 +factory_boy==2.8.1 py==1.4.31 pytest==3.0.5 pytest-django==3.1.2 From 78abcab6d590da1ed1683ecf983fb9ebd393bd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 3 Jan 2017 19:40:36 +0100 Subject: [PATCH 077/144] Fix #4841: Use the plugins login for invitations --- taiga/auth/api.py | 50 ++++++------------------------ taiga/auth/services.py | 15 ++------- taiga/auth/validators.py | 8 +---- tests/integration/test_auth_api.py | 16 +++++----- 4 files changed, 20 insertions(+), 69 deletions(-) diff --git a/taiga/auth/api.py b/taiga/auth/api.py index df077b52..52892bb1 100644 --- a/taiga/auth/api.py +++ b/taiga/auth/api.py @@ -30,14 +30,13 @@ from taiga.base import exceptions as exc from taiga.base import response from .validators import PublicRegisterValidator -from .validators import PrivateRegisterForExistingUserValidator -from .validators import PrivateRegisterForNewUserValidator +from .validators import PrivateRegisterValidator -from .services import private_register_for_existing_user from .services import private_register_for_new_user from .services import public_register from .services import make_auth_response_data from .services import get_auth_plugins +from .services import accept_invitation_by_existing_user from .permissions import AuthPermission @@ -61,37 +60,8 @@ def _parse_data(data:dict, *, cls): # Parse public register data parse_public_register_data = partial(_parse_data, cls=PublicRegisterValidator) -# Parse private register data for existing user -parse_private_register_for_existing_user_data = \ - partial(_parse_data, cls=PrivateRegisterForExistingUserValidator) - # Parse private register data for new user -parse_private_register_for_new_user_data = \ - partial(_parse_data, cls=PrivateRegisterForNewUserValidator) - - -class RegisterTypeEnum(Enum): - new_user = 1 - existing_user = 2 - - -def parse_register_type(userdata:dict) -> str: - """ - Parses user data and detects that register type is. - It returns RegisterTypeEnum value. - """ - # Create adhoc inner serializer for avoid parse - # manually the user data. - class _validator(validators.Validator): - existing = serializers.BooleanField() - - instance = _validator(data=userdata) - if not instance.is_valid(): - raise exc.RequestValidationError(instance.errors) - - if instance.data["existing"]: - return RegisterTypeEnum.existing_user - return RegisterTypeEnum.new_user +parse_private_register_data = partial(_parse_data, cls=PrivateRegisterValidator) class AuthViewSet(viewsets.ViewSet): @@ -111,14 +81,8 @@ class AuthViewSet(viewsets.ViewSet): return response.Created(data) def _private_register(self, request): - register_type = parse_register_type(request.DATA) - - if register_type is RegisterTypeEnum.existing_user: - data = parse_private_register_for_existing_user_data(request.DATA) - user = private_register_for_existing_user(**data) - else: - data = parse_private_register_for_new_user_data(request.DATA) - user = private_register_for_new_user(**data) + data = parse_private_register_data(request.DATA) + user = private_register_for_new_user(**data) data = make_auth_response_data(user) return response.Created(data) @@ -140,9 +104,13 @@ class AuthViewSet(viewsets.ViewSet): auth_plugins = get_auth_plugins() login_type = request.DATA.get("type", None) + invitation_token = request.DATA.get("invitation_token", None) if login_type in auth_plugins: data = auth_plugins[login_type]['login_func'](request) + if invitation_token: + accept_invitation_by_existing_user(invitation_token, data['id']) return response.Ok(data) + raise exc.BadRequest(_("invalid login type")) diff --git a/taiga/auth/services.py b/taiga/auth/services.py index a76c350f..f4c02296 100644 --- a/taiga/auth/services.py +++ b/taiga/auth/services.py @@ -128,16 +128,9 @@ def public_register(username:str, password:str, email:str, full_name:str): @tx.atomic -def private_register_for_existing_user(token:str, username:str, password:str): - """ - Register works not only for register users, also serves for accept - inviatations for projects as existing user. - - Given a invitation token with parsed parameters, accept inviation - as existing user. - """ - - user = get_and_validate_user(username=username, password=password) +def accept_invitation_by_existing_user(token:str, user_id:int): + user_model = get_user_model() + user = user_model.objects.get(id=user_id) membership = get_membership_by_token(token) try: @@ -145,8 +138,6 @@ def private_register_for_existing_user(token:str, username:str, password:str): membership.save(update_fields=["user"]) except IntegrityError: raise exc.IntegrityError(_("This user is already a member of the project.")) - - send_register_email(user) return user diff --git a/taiga/auth/validators.py b/taiga/auth/validators.py index a18dc4bc..fdfb4009 100644 --- a/taiga/auth/validators.py +++ b/taiga/auth/validators.py @@ -48,11 +48,5 @@ class PublicRegisterValidator(BaseRegisterValidator): pass -class PrivateRegisterForNewUserValidator(BaseRegisterValidator): - token = serializers.CharField(max_length=255, required=True) - - -class PrivateRegisterForExistingUserValidator(validators.Validator): - username = serializers.CharField(max_length=255) - password = serializers.CharField(min_length=4) +class PrivateRegisterValidator(BaseRegisterValidator): token = serializers.CharField(max_length=255, required=True) diff --git a/tests/integration/test_auth_api.py b/tests/integration/test_auth_api.py index 0504881b..1add6615 100644 --- a/tests/integration/test_auth_api.py +++ b/tests/integration/test_auth_api.py @@ -62,23 +62,21 @@ def test_respond_201_when_the_email_domain_is_in_allowed_domains(client, setting assert response.status_code == 201 -def test_respond_201_with_invitation_without_public_registration(client, register_form, settings): +def test_respond_201_with_invitation_login(client, settings): settings.PUBLIC_REGISTER_ENABLED = False user = factories.UserFactory() membership = factories.MembershipFactory(user=user) - register_form.update({ - "type": "private", - "existing": "1", - "token": membership.token, + auth_data = { + "type": "normal", + "invitation_token": membership.token, "username": user.username, - "email": user.email, "password": user.username, - }) + } - response = client.post(reverse("auth-register"), register_form) + response = client.post(reverse("auth-list"), auth_data) - assert response.status_code == 201, response.data + assert response.status_code == 200, response.data def test_response_200_in_public_registration(client, settings): From 1790cec37d5603a11bb7bb04b5421081245cb915 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 16 Dec 2016 15:04:37 +0100 Subject: [PATCH 078/144] Adding management command to block projects --- .../commands/block_user_projects.py | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 taiga/projects/management/commands/block_user_projects.py diff --git a/taiga/projects/management/commands/block_user_projects.py b/taiga/projects/management/commands/block_user_projects.py new file mode 100644 index 00000000..3cf86cb7 --- /dev/null +++ b/taiga/projects/management/commands/block_user_projects.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from django.core.management.base import BaseCommand +from taiga.projects.choices import BLOCKED_BY_NONPAYMENT +from taiga.projects.models import Project + + +class Command(BaseCommand): + help = "Block user projects" + + def add_arguments(self, parser): + parser.add_argument("owner_usernames", + nargs="+", + help="") + + parser.add_argument("--is-private", + dest="is_private") + + parser.add_argument("--blocked-code", + dest="blocked_code") + + def handle(self, *args, **options): + owner_usernames = options["owner_usernames"] + projects = Project.objects.filter(owner__username__in=owner_usernames) + + is_private = options.get("is_private") + if is_private is not None: + is_private = is_private.lower() + is_private = is_private[0] in ["t", "y", "1"] + projects = projects.filter(is_private=is_private) + + blocked_code = options.get("blocked_code") + blocked_code = blocked_code if blocked_code is not None else BLOCKED_BY_NONPAYMENT + projects.update(blocked_code=blocked_code) From 9bf325d5f95f76c335156bdd5a55ea211fe52ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 5 Jan 2017 13:14:09 +0100 Subject: [PATCH 079/144] Add Throttling for users auth, register and detail --- settings/common.py | 5 +- settings/testing.py | 3 ++ taiga/auth/api.py | 3 +- taiga/auth/throttling.py | 46 +++++++++++++++++ taiga/base/api/throttling.py | 12 +++++ taiga/base/api/views.py | 17 ++++++- taiga/base/throttling.py | 44 ++++++++++++---- taiga/projects/throttling.py | 4 +- taiga/users/api.py | 2 + taiga/users/throttling.py | 24 +++++++++ tests/integration/test_auth_api.py | 80 ++++++++++++++++++++++++++++++ tests/integration/test_users.py | 37 ++++++++++++++ 12 files changed, 261 insertions(+), 16 deletions(-) create mode 100644 taiga/auth/throttling.py create mode 100644 taiga/users/throttling.py diff --git a/settings/common.py b/settings/common.py index 8bd85f62..6980efb8 100644 --- a/settings/common.py +++ b/settings/common.py @@ -440,7 +440,10 @@ REST_FRAMEWORK = { "user": None, "import-mode": None, "import-dump-mode": "1/minute", - "create-memberships": None + "create-memberships": None, + "login-fail": None, + "register-success": None, + "user-detail": None, }, "FILTER_BACKEND": "taiga.base.filters.FilterBackend", "EXCEPTION_HANDLER": "taiga.base.exceptions.exception_handler", diff --git a/settings/testing.py b/settings/testing.py index c8875026..12532b9b 100644 --- a/settings/testing.py +++ b/settings/testing.py @@ -34,4 +34,7 @@ REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"] = { "import-mode": None, "import-dump-mode": None, "create-memberships": None, + "login-fail": None, + "register-success": None, + "user-detail": None, } diff --git a/taiga/auth/api.py b/taiga/auth/api.py index 52892bb1..d9a2c85c 100644 --- a/taiga/auth/api.py +++ b/taiga/auth/api.py @@ -39,6 +39,7 @@ from .services import get_auth_plugins from .services import accept_invitation_by_existing_user from .permissions import AuthPermission +from .throttling import LoginFailRateThrottle, RegisterSuccessRateThrottle def _parse_data(data:dict, *, cls): @@ -66,6 +67,7 @@ parse_private_register_data = partial(_parse_data, cls=PrivateRegisterValidator) class AuthViewSet(viewsets.ViewSet): permission_classes = (AuthPermission,) + throttle_classes = (LoginFailRateThrottle, RegisterSuccessRateThrottle) def _public_register(self, request): if not settings.PUBLIC_REGISTER_ENABLED: @@ -112,5 +114,4 @@ class AuthViewSet(viewsets.ViewSet): accept_invitation_by_existing_user(invitation_token, data['id']) return response.Ok(data) - raise exc.BadRequest(_("invalid login type")) diff --git a/taiga/auth/throttling.py b/taiga/auth/throttling.py new file mode 100644 index 00000000..e622407b --- /dev/null +++ b/taiga/auth/throttling.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from taiga.base import throttling + + +class LoginFailRateThrottle(throttling.GlobalThrottlingMixin, throttling.ThrottleByActionMixin, throttling.SimpleRateThrottle): + scope = "login-fail" + throttled_actions = ["create"] + + def throttle_success(self, request, view): + return True + + def finalize(self, request, response, view): + if response.status_code == 400: + self.history.insert(0, self.now) + self.cache.set(self.key, self.history, self.duration) + + +class RegisterSuccessRateThrottle(throttling.GlobalThrottlingMixin, throttling.ThrottleByActionMixin, throttling.SimpleRateThrottle): + scope = "register-success" + throttled_actions = ["register"] + + def throttle_success(self, request, view): + return True + + def finalize(self, request, response, view): + if response.status_code == 201: + self.history.insert(0, self.now) + self.cache.set(self.key, self.history, self.duration) + diff --git a/taiga/base/api/throttling.py b/taiga/base/api/throttling.py index 74178922..f1b49ca0 100644 --- a/taiga/base/api/throttling.py +++ b/taiga/base/api/throttling.py @@ -64,6 +64,12 @@ class BaseThrottle(object): """ raise NotImplementedError(".allow_request() must be overridden") + def finalize(self, request, response, view): + """ + Optionally, update the Trottling information based on de response. + """ + return None + def wait(self): """ Optionally, return a recommended number of seconds to wait before @@ -105,6 +111,12 @@ class SimpleRateThrottle(BaseThrottle): """ raise NotImplementedError(".get_cache_key() must be overridden") + def has_to_finalize(self, request, response, view): + """ + Determine if the finalize method must be executed. + """ + return self.rate is not None + def get_rate(self): """ Determine the string representation of the allowed request rate. diff --git a/taiga/base/api/views.py b/taiga/base/api/views.py index 8c6dfd09..310f424a 100644 --- a/taiga/base/api/views.py +++ b/taiga/base/api/views.py @@ -144,6 +144,8 @@ class APIView(View): # Allow dependancy injection of other settings to make testing easier. settings = api_settings + _trottle_instances = None + @classmethod def as_view(cls, **initkwargs): """ @@ -286,7 +288,9 @@ class APIView(View): """ Instantiates and returns the list of throttles that this view uses. """ - return [throttle() for throttle in self.throttle_classes] + if self._trottle_instances is None: + self._trottle_instances = [throttle() for throttle in self.throttle_classes] + return self._trottle_instances def get_content_negotiator(self): """ @@ -342,6 +346,15 @@ class APIView(View): if not throttle.allow_request(request, self): self.throttled(request, throttle.wait()) + def finalize_throttles(self, request, response): + """ + Check if request should be throttled. + Raises an appropriate exception if the request is throttled. + """ + for throttle in self.get_throttles(): + if throttle.has_to_finalize(request, response, self): + throttle.finalize(request, response, self) + # Dispatch methods def initialize_request(self, request, *args, **kwargs): @@ -391,6 +404,8 @@ class APIView(View): for key, value in self.headers.items(): response[key] = value + self.finalize_throttles(request, response) + return response def handle_exception(self, exc): diff --git a/taiga/base/throttling.py b/taiga/base/throttling.py index f2484ea9..676d6027 100644 --- a/taiga/base/throttling.py +++ b/taiga/base/throttling.py @@ -19,21 +19,43 @@ from taiga.base.api import throttling -class AnonRateThrottle(throttling.AnonRateThrottle): - scope = "anon" - throttled_methods = ["GET", "POST", "PUT", "DELETE", "PATCH"] +class GlobalThrottlingMixin: + """ + Define the cache key based on the user IP independently if the user is + logged in or not. + """ + def get_cache_key(self, request, view): + ident = request.META.get("HTTP_X_FORWARDED_FOR") + if ident is None: + ident = request.META.get("REMOTE_ADDR") + + return self.cache_format % { + "scope": self.scope, + "ident": ident + } + + +class ThrottleByActionMixin: + throttled_actions = [] + + def has_to_finalize(self, request, response, view): + if super().has_to_finalize(request, response, view): + return view.action in self.throttled_actions + return False def allow_request(self, request, view): - if request.method not in self.throttled_methods: - return True - return super().allow_request(request, view) + if view.action in self.throttled_actions: + return super().allow_request(request, view) + return True + + +class AnonRateThrottle(throttling.AnonRateThrottle): + scope = "anon" class UserRateThrottle(throttling.UserRateThrottle): scope = "user" - throttled_methods = ["GET", "POST", "PUT", "DELETE", "PATCH"] - def allow_request(self, request, view): - if request.method not in self.throttled_methods: - return True - return super().allow_request(request, view) + +class SimpleRateThrottle(throttling.SimpleRateThrottle): + pass diff --git a/taiga/projects/throttling.py b/taiga/projects/throttling.py index 7694b274..f46844f3 100644 --- a/taiga/projects/throttling.py +++ b/taiga/projects/throttling.py @@ -19,9 +19,9 @@ from taiga.base import throttling -class MembershipsRateThrottle(throttling.UserRateThrottle): +class MembershipsRateThrottle(throttling.ThrottleByActionMixin, throttling.UserRateThrottle): scope = "create-memberships" - throttled_methods = ["POST", "PUT"] + throttled_actions = ["create", "resend_invitation", "bulk_create"] def exceeded_throttling_restriction(self, request, view): self.created_memberships = 0 diff --git a/taiga/users/api.py b/taiga/users/api.py index ef22c661..d08ebeb9 100644 --- a/taiga/users/api.py +++ b/taiga/users/api.py @@ -49,6 +49,7 @@ from . import services from . import utils as user_utils from .signals import user_cancel_account as user_cancel_account_signal from .signals import user_change_email as user_change_email_signal +from .throttling import UserDetailRateThrottle class UsersViewSet(ModelCrudViewSet): permission_classes = (permissions.UserPermission,) @@ -57,6 +58,7 @@ class UsersViewSet(ModelCrudViewSet): admin_validator_class = validators.UserAdminValidator validator_class = validators.UserValidator filter_backends = (MembersFilterBackend,) + throttle_classes = (UserDetailRateThrottle,) model = models.User def get_serializer_class(self): diff --git a/taiga/users/throttling.py b/taiga/users/throttling.py new file mode 100644 index 00000000..9a5f4918 --- /dev/null +++ b/taiga/users/throttling.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2014-2016 Andrey Antukh +# Copyright (C) 2014-2016 Jesús Espino +# Copyright (C) 2014-2016 David Barragán +# Copyright (C) 2014-2016 Alejandro Alonso +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from taiga.base import throttling + + +class UserDetailRateThrottle(throttling.GlobalThrottlingMixin, throttling.ThrottleByActionMixin, throttling.SimpleRateThrottle): + scope = "user-detail" + throttled_actions = ["by_username", "retrieve"] diff --git a/tests/integration/test_auth_api.py b/tests/integration/test_auth_api.py index 1add6615..bc3bd3b2 100644 --- a/tests/integration/test_auth_api.py +++ b/tests/integration/test_auth_api.py @@ -184,3 +184,83 @@ def test_auth_uppercase_ignore(client, settings): response = client.post(reverse("auth-list"), login_form) assert response.status_code == 400 + + +def test_login_fail_throttling(client, settings): + settings.PUBLIC_REGISTER_ENABLED = True + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["login-fail"] = "1/minute" + + register_form = {"username": "valid_username_login_fail", + "password": "valid_password", + "full_name": "fullname", + "email": "valid_username_login_fail@email.com", + "type": "public"} + response = client.post(reverse("auth-register"), register_form) + + login_form = {"type": "normal", + "username": "valid_username_login_fail", + "password": "valid_password"} + + response = client.post(reverse("auth-list"), login_form) + assert response.status_code == 200 + + login_form = {"type": "normal", + "username": "invalid_username_login_fail", + "password": "invalid_password"} + + response = client.post(reverse("auth-list"), login_form) + assert response.status_code == 400 + + login_form = {"type": "normal", + "username": "invalid_username_login_fail", + "password": "invalid_password"} + + response = client.post(reverse("auth-list"), login_form) + assert response.status_code == 429 + + login_form = {"type": "normal", + "username": "valid_username_login_fail", + "password": "valid_password"} + + response = client.post(reverse("auth-list"), login_form) + assert response.status_code == 429 + + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["login-fail"] = None + +def test_register_success_throttling(client, settings): + settings.PUBLIC_REGISTER_ENABLED = True + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["register-success"] = "1/minute" + + register_form = {"username": "valid_username_register_success", + "password": "valid_password", + "full_name": "fullname", + "email": "", + "type": "public"} + response = client.post(reverse("auth-register"), register_form) + assert response.status_code == 400 + + register_form = {"username": "valid_username_register_success", + "password": "valid_password", + "full_name": "fullname", + "email": "valid_username_register_success@email.com", + "type": "public"} + response = client.post(reverse("auth-register"), register_form) + assert response.status_code == 201 + + register_form = {"username": "valid_username_register_success2", + "password": "valid_password2", + "full_name": "fullname", + "email": "valid_username_register_success2@email.com", + "type": "public"} + response = client.post(reverse("auth-register"), register_form) + assert response.status_code == 429 + + register_form = {"username": "valid_username_register_success2", + "password": "valid_password2", + "full_name": "fullname", + "email": "", + "type": "public"} + response = client.post(reverse("auth-register"), register_form) + assert response.status_code == 429 + + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["register-success"] = None diff --git a/tests/integration/test_users.py b/tests/integration/test_users.py index cad6507c..678d4a03 100644 --- a/tests/integration/test_users.py +++ b/tests/integration/test_users.py @@ -24,6 +24,7 @@ from django.conf import settings from django.contrib.contenttypes.models import ContentType from django.core.urlresolvers import reverse from django.core.files import File +from django.core.cache import cache as default_cache from .. import factories as f from ..utils import DUMMY_BMP_DATA @@ -980,3 +981,39 @@ def test_get_voted_list_permissions(): project.anon_permissions = ["view_project", "view_epic", "view_us", "view_tasks", "view_issues"] project.save() assert len(get_voted_list(fav_user, viewer_unpriviliged_user)) == 4 + +############################## +## Retrieve user +############################## + +def test_users_retrieve_throttling_api(client): + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["user-detail"] = "1/minute" + + user = f.UserFactory.create() + + url = reverse('users-detail', kwargs={"pk": user.pk}) + data = {} + + response = client.get(url, content_type="application/json") + assert response.status_code == 200 + + response = client.get(url, content_type="application/json") + assert response.status_code == 429 + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["user-detail"] = None + default_cache.clear() + + +def test_users_by_username_throttling_api(client): + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["user-detail"] = "1/minute" + user = f.UserFactory.create(username="test-user-detail") + + url = reverse('users-by-username') + data = {} + + response = client.get(url, {"username": user.username}, content_type="application/json") + assert response.status_code == 200 + + response = client.get(url, {"username": user.username}, content_type="application/json") + assert response.status_code == 429 + settings.REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]["user-detail"] = None + default_cache.clear() From b6350557840bee0d88c7d4756c1c909892aaed96 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 25 Oct 2016 14:58:15 +0200 Subject: [PATCH 080/144] US 4662: Duplicate project --- CHANGELOG.md | 3 +- taiga/export_import/api.py | 4 +- taiga/export_import/services/store.py | 2 +- taiga/projects/api.py | 40 +++- taiga/projects/apps.py | 3 +- taiga/projects/custom_attributes/api.py | 4 - .../fixtures/initial_project_templates.json | 12 +- .../migrations/0058_auto_20161215_1347.py | 58 ++++++ taiga/projects/models.py | 177 +++++++++++++---- taiga/projects/permissions.py | 1 + taiga/projects/services/__init__.py | 1 + taiga/projects/services/members.py | 6 +- taiga/projects/services/projects.py | 60 +++++- taiga/projects/signals.py | 10 +- taiga/projects/tagging/models.py | 2 +- taiga/projects/utils.py | 1 + taiga/projects/validators.py | 18 +- taiga/users/services.py | 2 +- tests/factories.py | 4 + .../test_projects_resource.py | 34 ++++ tests/integration/test_projects.py | 180 ++++++++++++++++++ 21 files changed, 559 insertions(+), 63 deletions(-) create mode 100644 taiga/projects/migrations/0058_auto_20161215_1347.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 344e5b8e..d91736e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ ### Features - Contact with the project: if the projects have this module enabled Taiga users can contact them. - Ability to create rich text custom fields in Epics, User Stories, Tasks and Isues. -- Full text search now use simple as tolenizer so search with non-english text are allowed. +- Full text search now use simple as tokenizer so search with non-english text are allowed. +- Duplicate project: allows creating a new project based on the structure of another (status, tags, colors, default values...) - i18n: - Add japanese (ja) translation. - Add chinese simplified (zh-Hans) translation. diff --git a/taiga/export_import/api.py b/taiga/export_import/api.py index 75644365..9d90b638 100644 --- a/taiga/export_import/api.py +++ b/taiga/export_import/api.py @@ -104,7 +104,7 @@ class ProjectImporterViewSet(mixins.ImportThrottlingPolicyMixin, CreateModelMixi is_private = data.get('is_private', False) total_memberships = len([m for m in data.get("memberships", []) if m.get("email", None) != data["owner"]]) total_memberships = total_memberships + 1 # 1 is the owner - (enough_slots, error_message) = users_services.has_available_slot_for_import_new_project( + (enough_slots, error_message) = users_services.has_available_slot_for_new_project( self.request.user, is_private, total_memberships @@ -344,7 +344,7 @@ class ProjectImporterViewSet(mixins.ImportThrottlingPolicyMixin, CreateModelMixi total_memberships = len([m for m in dump.get("memberships", []) if m.get("email", None) != dump["owner"]]) total_memberships = total_memberships + 1 # 1 is the owner - (enough_slots, error_message) = users_services.has_available_slot_for_import_new_project( + (enough_slots, error_message) = users_services.has_available_slot_for_new_project( user, is_private, total_memberships diff --git a/taiga/export_import/services/store.py b/taiga/export_import/services/store.py index e28353bc..80a784eb 100644 --- a/taiga/export_import/services/store.py +++ b/taiga/export_import/services/store.py @@ -700,7 +700,7 @@ def _validate_if_owner_have_enought_space_to_this_project(owner, data): if m.get("email", None) != data["owner"]]) total_memberships = total_memberships + 1 # 1 is the owner - (enough_slots, error_message) = users_service.has_available_slot_for_import_new_project( + (enough_slots, error_message) = users_service.has_available_slot_for_new_project( owner, is_private, total_memberships diff --git a/taiga/projects/api.py b/taiga/projects/api.py index 7f9d0611..91d850d3 100644 --- a/taiga/projects/api.py +++ b/taiga/projects/api.py @@ -52,6 +52,7 @@ from taiga.projects.mixins.ordering import BulkUpdateOrderMixin from taiga.projects.tasks.models import Task from taiga.projects.tagging.api import TagsColorsResourceMixin from taiga.projects.userstories.models import UserStory, RolePoints +from taiga.users import services as users_services from . import filters as project_filters from . import models @@ -218,7 +219,7 @@ class ProjectViewSet(LikedResourceMixin, HistoryResourceMixin, if not template_description: raise response.BadRequest(_("Not valid template description")) - with advisory_lock("create-project-template") as acquired_key_lock: + with advisory_lock("create-project-template"): template_slug = slugify_uniquely(template_name, models.ProjectTemplate) project = self.get_object() @@ -392,6 +393,42 @@ class ProjectViewSet(LikedResourceMixin, HistoryResourceMixin, services.reject_project_transfer(project, request.user, token, reason) return response.Ok() + @detail_route(methods=["POST"]) + def duplicate(self, request, pk=None): + project = self.get_object() + self.check_permissions(request, "duplicate", project) + if project.blocked_code is not None: + raise exc.Blocked(_("Blocked element")) + + validator = validators.DuplicateProjectValidator(data=request.DATA) + if not validator.is_valid(): + return response.BadRequest(validator.errors) + + data = validator.data + + # Validate if the project can be imported + is_private = data.get('is_private', False) + total_memberships = len(data.get("users", [])) + 1 + (enough_slots, error_message) = users_services.has_available_slot_for_new_project( + self.request.user, + is_private, + total_memberships + ) + if not enough_slots: + raise exc.NotEnoughSlotsForProject(is_private, total_memberships, error_message) + + new_project = services.duplicate_project( + project=project, + owner=request.user, + name=data["name"], + description=data["description"], + is_private=data["is_private"], + users=data["users"] + ) + new_project = get_object_or_404(self.get_queryset(), id=new_project.id) + serializer = self.get_serializer(new_project) + return response.Created(serializer.data) + def _raise_if_blocked(self, project): if self.is_blocked(project): raise exc.Blocked(_("Blocked element")) @@ -632,7 +669,6 @@ class IssueStatusViewSet(MoveOnDestroyMixin, BlockedByProjectMixin, return super().create(request, *args, **kwargs) - ###################################################### ## Project Template ###################################################### diff --git a/taiga/projects/apps.py b/taiga/projects/apps.py index 634d56ce..2ef6ac55 100644 --- a/taiga/projects/apps.py +++ b/taiga/projects/apps.py @@ -58,6 +58,7 @@ def connect_memberships_signals(): sender=apps.get_model("projects", "Membership"), dispatch_uid='create-notify-policy') + def disconnect_memberships_signals(): signals.pre_delete.disconnect(sender=apps.get_model("projects", "Membership"), dispatch_uid='membership_pre_delete') @@ -79,7 +80,6 @@ def disconnect_us_status_signals(): dispatch_uid="try_to_close_or_open_user_stories_when_edit_us_status") - ## Tasks Statuses Signals def connect_task_status_signals(): @@ -94,7 +94,6 @@ def disconnect_task_status_signals(): dispatch_uid="try_to_close_or_open_user_stories_when_edit_task_status") - class ProjectsAppConfig(AppConfig): name = "taiga.projects" verbose_name = "Projects" diff --git a/taiga/projects/custom_attributes/api.py b/taiga/projects/custom_attributes/api.py index f8e74b00..e13a989a 100644 --- a/taiga/projects/custom_attributes/api.py +++ b/taiga/projects/custom_attributes/api.py @@ -16,14 +16,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from django.utils.translation import ugettext_lazy as _ - from taiga.base.api import ModelCrudViewSet from taiga.base.api import ModelUpdateRetrieveViewSet from taiga.base.api.mixins import BlockedByProjectMixin -from taiga.base import exceptions as exc from taiga.base import filters -from taiga.base import response from taiga.projects.mixins.ordering import BulkUpdateOrderMixin from taiga.projects.history.mixins import HistoryResourceMixin diff --git a/taiga/projects/fixtures/initial_project_templates.json b/taiga/projects/fixtures/initial_project_templates.json index e4c92cd0..7d84b49f 100644 --- a/taiga/projects/fixtures/initial_project_templates.json +++ b/taiga/projects/fixtures/initial_project_templates.json @@ -564,7 +564,11 @@ "comment_wiki_page" ] } - ] + ], + "epic_custom_attributes": [], + "us_custom_attributes": [], + "task_custom_attributes": [], + "issue_custom_attributes": [] } }, { @@ -1132,7 +1136,11 @@ "comment_wiki_page" ] } - ] + ], + "epic_custom_attributes": [], + "us_custom_attributes": [], + "task_custom_attributes": [], + "issue_custom_attributes": [] } } ] diff --git a/taiga/projects/migrations/0058_auto_20161215_1347.py b/taiga/projects/migrations/0058_auto_20161215_1347.py new file mode 100644 index 00000000..341f2fb1 --- /dev/null +++ b/taiga/projects/migrations/0058_auto_20161215_1347.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2016-12-15 13:47 +from __future__ import unicode_literals + +import django.contrib.postgres.fields +import django.core.serializers.json +from django.db import migrations, models +import taiga.base.db.models.fields.json + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0057_auto_20161129_0945'), + ] + + operations = [ + migrations.AddField( + model_name='projecttemplate', + name='epic_custom_attributes', + field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='epic custom attributes'), + ), + migrations.AddField( + model_name='projecttemplate', + name='is_looking_for_people', + field=models.BooleanField(default=False, verbose_name='is looking for people'), + ), + migrations.AddField( + model_name='projecttemplate', + name='issue_custom_attributes', + field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='issue custom attributes'), + ), + migrations.AddField( + model_name='projecttemplate', + name='looking_for_people_note', + field=models.TextField(blank=True, default='', verbose_name='loking for people note'), + ), + migrations.AddField( + model_name='projecttemplate', + name='tags', + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), blank=True, default=[], null=True, size=None, verbose_name='tags'), + ), + migrations.AddField( + model_name='projecttemplate', + name='tags_colors', + field=django.contrib.postgres.fields.ArrayField(base_field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(blank=True, null=True), size=2), blank=True, default=[], null=True, size=None, verbose_name='tags colors'), + ), + migrations.AddField( + model_name='projecttemplate', + name='task_custom_attributes', + field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='task custom attributes'), + ), + migrations.AddField( + model_name='projecttemplate', + name='us_custom_attributes', + field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='us custom attributes'), + ), + ] diff --git a/taiga/projects/models.py b/taiga/projects/models.py index 46a8a694..b23cd151 100644 --- a/taiga/projects/models.py +++ b/taiga/projects/models.py @@ -32,8 +32,12 @@ from django_pglocks import advisory_lock from taiga.base.db.models.fields import JSONField from taiga.base.utils.time import timestamp_ms +from taiga.projects.custom_attributes.models import EpicCustomAttribute +from taiga.projects.custom_attributes.models import UserStoryCustomAttribute +from taiga.projects.custom_attributes.models import TaskCustomAttribute +from taiga.projects.custom_attributes.models import IssueCustomAttribute from taiga.projects.tagging.models import TaggedMixin -from taiga.projects.tagging.models import TagsColorsdMixin +from taiga.projects.tagging.models import TagsColorsMixin from taiga.base.utils.files import get_file_path from taiga.base.utils.slug import slugify_uniquely from taiga.base.utils.slug import slugify_uniquely_for_queryset @@ -82,10 +86,10 @@ class Membership(models.Model): null=True, blank=True) invitation_extra_text = models.TextField(null=True, blank=True, - verbose_name=_("invitation extra text")) + verbose_name=_("invitation extra text")) user_order = models.BigIntegerField(default=timestamp_ms, null=False, blank=False, - verbose_name=_("user order")) + verbose_name=_("user order")) class Meta: verbose_name = "membership" @@ -106,9 +110,9 @@ class Membership(models.Model): class ProjectDefaults(models.Model): default_epic_status = models.OneToOneField("projects.EpicStatus", - on_delete=models.SET_NULL, related_name="+", - null=True, blank=True, - verbose_name=_("default epic status")) + on_delete=models.SET_NULL, related_name="+", + null=True, blank=True, + verbose_name=_("default epic status")) default_us_status = models.OneToOneField("projects.UserStoryStatus", on_delete=models.SET_NULL, related_name="+", null=True, blank=True, @@ -139,7 +143,7 @@ class ProjectDefaults(models.Model): abstract = True -class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): +class Project(ProjectDefaults, TaggedMixin, TagsColorsMixin, models.Model): name = models.CharField(max_length=250, null=False, blank=False, verbose_name=_("name")) slug = models.SlugField(max_length=250, unique=True, null=False, blank=True, @@ -148,8 +152,8 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): verbose_name=_("description")) logo = models.FileField(upload_to=get_project_logo_file_path, - max_length=500, null=True, blank=True, - verbose_name=_("logo")) + max_length=500, null=True, blank=True, + verbose_name=_("logo")) created_date = models.DateTimeField(null=False, blank=False, verbose_name=_("created date"), @@ -180,7 +184,7 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): choices=choices.VIDEOCONFERENCES_CHOICES, verbose_name=_("videoconference system")) videoconferences_extra_data = models.CharField(max_length=250, null=True, blank=True, - verbose_name=_("videoconference extra data")) + verbose_name=_("videoconference extra data")) creation_template = models.ForeignKey("projects.ProjectTemplate", related_name="projects", null=True, @@ -196,10 +200,10 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): null=True, blank=True, default=[], verbose_name=_("user permissions")) is_featured = models.BooleanField(default=False, null=False, blank=True, - verbose_name=_("is featured")) + verbose_name=_("is featured")) is_looking_for_people = models.BooleanField(default=False, null=False, blank=True, - verbose_name=_("is looking for people")) + verbose_name=_("is looking for people")) looking_for_people_note = models.TextField(default="", null=False, blank=True, verbose_name=_("loking for people note")) @@ -218,36 +222,39 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): verbose_name=_("project transfer token")) blocked_code = models.CharField(null=True, blank=True, max_length=255, - choices=choices.BLOCKING_CODES + settings.EXTRA_BLOCKING_CODES, default=None, - verbose_name=_("blocked code")) - - #Totals: + choices=choices.BLOCKING_CODES + settings.EXTRA_BLOCKING_CODES, + default=None, verbose_name=_("blocked code")) + # Totals: totals_updated_datetime = models.DateTimeField(null=False, blank=False, auto_now_add=True, - verbose_name=_("updated date time"), db_index=True) + verbose_name=_("updated date time"), db_index=True) total_fans = models.PositiveIntegerField(null=False, blank=False, default=0, verbose_name=_("count"), db_index=True) total_fans_last_week = models.PositiveIntegerField(null=False, blank=False, default=0, - verbose_name=_("fans last week"), db_index=True) + verbose_name=_("fans last week"), db_index=True) total_fans_last_month = models.PositiveIntegerField(null=False, blank=False, default=0, - verbose_name=_("fans last month"), db_index=True) + verbose_name=_("fans last month"), db_index=True) total_fans_last_year = models.PositiveIntegerField(null=False, blank=False, default=0, - verbose_name=_("fans last year"), db_index=True) + verbose_name=_("fans last year"), db_index=True) total_activity = models.PositiveIntegerField(null=False, blank=False, default=0, - verbose_name=_("count"), db_index=True) + verbose_name=_("count"), + db_index=True) total_activity_last_week = models.PositiveIntegerField(null=False, blank=False, default=0, - verbose_name=_("activity last week"), db_index=True) + verbose_name=_("activity last week"), + db_index=True) total_activity_last_month = models.PositiveIntegerField(null=False, blank=False, default=0, - verbose_name=_("activity last month"), db_index=True) + verbose_name=_("activity last month"), + db_index=True) total_activity_last_year = models.PositiveIntegerField(null=False, blank=False, default=0, - verbose_name=_("activity last year"), db_index=True) + verbose_name=_("activity last year"), + db_index=True) _importing = None @@ -303,13 +310,13 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): self.total_fans = qs.count() - qs_week = qs.filter(created_date__gte=now-relativedelta(weeks=1)) + qs_week = qs.filter(created_date__gte=now - relativedelta(weeks=1)) self.total_fans_last_week = qs_week.count() - qs_month = qs.filter(created_date__gte=now-relativedelta(months=1)) + qs_month = qs.filter(created_date__gte=now - relativedelta(months=1)) self.total_fans_last_month = qs_month.count() - qs_year = qs.filter(created_date__gte=now-relativedelta(years=1)) + qs_year = qs.filter(created_date__gte=now - relativedelta(years=1)) self.total_fans_last_year = qs_year.count() tl_model = apps.get_model("timeline", "Timeline") @@ -318,13 +325,13 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): qs = tl_model.objects.filter(namespace=namespace) self.total_activity = qs.count() - qs_week = qs.filter(created__gte=now-relativedelta(weeks=1)) + qs_week = qs.filter(created__gte=now - relativedelta(weeks=1)) self.total_activity_last_week = qs_week.count() - qs_month = qs.filter(created__gte=now-relativedelta(months=1)) + qs_month = qs.filter(created__gte=now - relativedelta(months=1)) self.total_activity_last_month = qs_month.count() - qs_year = qs.filter(created__gte=now-relativedelta(years=1)) + qs_year = qs.filter(created__gte=now - relativedelta(years=1)) self.total_activity_last_year = qs_year.count() if save: @@ -358,7 +365,7 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): policy = model_cls.objects.create( project=self, user=user, - notify_level= NotifyLevel.involved) + notify_level=NotifyLevel.involved) del self.cached_notify_policies @@ -460,6 +467,8 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): # NOTE: Remember to update code in taiga.projects.admin.ProjectAdmin.delete_selected from taiga.events.apps import (connect_events_signals, disconnect_events_signals) + from taiga.projects.epics.apps import (connect_all_epics_signals, + disconnect_all_epics_signals) from taiga.projects.tasks.apps import (connect_all_tasks_signals, disconnect_all_tasks_signals) from taiga.projects.userstories.apps import (connect_all_userstories_signals, @@ -470,12 +479,14 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): disconnect_memberships_signals) disconnect_events_signals() + disconnect_all_epics_signals() disconnect_all_issues_signals() disconnect_all_tasks_signals() disconnect_all_userstories_signals() disconnect_memberships_signals() try: + self.epics.all().delete() self.tasks.all().delete() self.user_stories.all().delete() self.issues.all().delete() @@ -486,12 +497,13 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): connect_all_issues_signals() connect_all_tasks_signals() connect_all_userstories_signals() + connect_all_epics_signals() connect_memberships_signals() class ProjectModulesConfig(models.Model): project = models.OneToOneField("Project", null=False, blank=False, - related_name="modules_config", verbose_name=_("project")) + related_name="modules_config", verbose_name=_("project")) config = JSONField(null=True, blank=True, verbose_name=_("modules config")) class Meta: @@ -544,7 +556,7 @@ class UserStoryStatus(models.Model): is_closed = models.BooleanField(default=False, null=False, blank=True, verbose_name=_("is closed")) is_archived = models.BooleanField(default=False, null=False, blank=True, - verbose_name=_("is archived")) + verbose_name=_("is archived")) color = models.CharField(max_length=20, null=False, blank=False, default="#999999", verbose_name=_("color")) wip_limit = models.IntegerField(null=True, blank=True, default=None, @@ -718,7 +730,7 @@ class IssueType(models.Model): return self.name -class ProjectTemplate(models.Model): +class ProjectTemplate(TaggedMixin, TagsColorsMixin, models.Model): name = models.CharField(max_length=250, null=False, blank=False, verbose_name=_("name")) slug = models.SlugField(max_length=250, null=False, blank=True, @@ -726,7 +738,7 @@ class ProjectTemplate(models.Model): description = models.TextField(null=False, blank=False, verbose_name=_("description")) order = models.BigIntegerField(default=timestamp_ms, null=False, blank=False, - verbose_name=_("user order")) + verbose_name=_("user order")) created_date = models.DateTimeField(null=False, blank=False, verbose_name=_("created date"), default=timezone.now) @@ -747,11 +759,15 @@ class ProjectTemplate(models.Model): verbose_name=_("active wiki panel")) is_issues_activated = models.BooleanField(default=True, null=False, blank=True, verbose_name=_("active issues panel")) + is_looking_for_people = models.BooleanField(default=False, null=False, blank=True, + verbose_name=_("is looking for people")) + looking_for_people_note = models.TextField(default="", null=False, blank=True, + verbose_name=_("loking for people note")) videoconferences = models.CharField(max_length=250, null=True, blank=True, choices=choices.VIDEOCONFERENCES_CHOICES, verbose_name=_("videoconference system")) videoconferences_extra_data = models.CharField(max_length=250, null=True, blank=True, - verbose_name=_("videoconference extra data")) + verbose_name=_("videoconference extra data")) default_options = JSONField(null=True, blank=True, verbose_name=_("default options")) epic_statuses = JSONField(null=True, blank=True, verbose_name=_("epic statuses")) @@ -763,6 +779,11 @@ class ProjectTemplate(models.Model): priorities = JSONField(null=True, blank=True, verbose_name=_("priorities")) severities = JSONField(null=True, blank=True, verbose_name=_("severities")) roles = JSONField(null=True, blank=True, verbose_name=_("roles")) + epic_custom_attributes = JSONField(null=True, blank=True, verbose_name=_("epic custom attributes")) + us_custom_attributes = JSONField(null=True, blank=True, verbose_name=_("us custom attributes")) + task_custom_attributes = JSONField(null=True, blank=True, verbose_name=_("task custom attributes")) + issue_custom_attributes = JSONField(null=True, blank=True, verbose_name=_("issue custom attributes")) + _importing = None class Meta: @@ -779,6 +800,8 @@ class ProjectTemplate(models.Model): def save(self, *args, **kwargs): if not self._importing or not self.modified_date: self.modified_date = timezone.now() + if not self.slug: + self.slug = slugify_uniquely(self.name, self.__class__) super().save(*args, **kwargs) def load_data_from_project(self, project): @@ -886,12 +909,53 @@ class ProjectTemplate(models.Model): "computable": role.computable }) + self.epic_custom_attributes = [] + for ca in project.epiccustomattributes.all(): + self.epic_custom_attributes.append({ + "name": ca.name, + "description": ca.description, + "type": ca.type, + "order": ca.order + }) + + self.us_custom_attributes = [] + for ca in project.userstorycustomattributes.all(): + self.us_custom_attributes.append({ + "name": ca.name, + "description": ca.description, + "type": ca.type, + "order": ca.order + }) + + self.task_custom_attributes = [] + for ca in project.taskcustomattributes.all(): + self.task_custom_attributes.append({ + "name": ca.name, + "description": ca.description, + "type": ca.type, + "order": ca.order + }) + + self.issue_custom_attributes = [] + for ca in project.issuecustomattributes.all(): + self.issue_custom_attributes.append({ + "name": ca.name, + "description": ca.description, + "type": ca.type, + "order": ca.order + }) + try: owner_membership = Membership.objects.get(project=project, user=project.owner) self.default_owner_role = owner_membership.role.slug except Membership.DoesNotExist: self.default_owner_role = self.roles[0].get("slug", None) + self.tags = project.tags + self.tags_colors = project.tags_colors + self.is_looking_for_people = project.is_looking_for_people + self.looking_for_people_note = project.looking_for_people_note + def apply_to_project(self, project): Role = apps.get_model("users", "Role") @@ -1022,4 +1086,45 @@ class ProjectTemplate(models.Model): project.default_severity = Severity.objects.get(name=self.default_options["severity"], project=project) + for ca in self.epic_custom_attributes: + EpicCustomAttribute.objects.create( + name=ca["name"], + description=ca["description"], + type=ca["type"], + order=ca["order"], + project=project + ) + + for ca in self.us_custom_attributes: + UserStoryCustomAttribute.objects.create( + name=ca["name"], + description=ca["description"], + type=ca["type"], + order=ca["order"], + project=project + ) + + for ca in self.task_custom_attributes: + TaskCustomAttribute.objects.create( + name=ca["name"], + description=ca["description"], + type=ca["type"], + order=ca["order"], + project=project + ) + + for ca in self.issue_custom_attributes: + IssueCustomAttribute.objects.create( + name=ca["name"], + description=ca["description"], + type=ca["type"], + order=ca["order"], + project=project + ) + + project.tags = self.tags + project.tags_colors = self.tags_colors + project.is_looking_for_people = self.is_looking_for_people + project.looking_for_people_note = self.looking_for_people_note + return project diff --git a/taiga/projects/permissions.py b/taiga/projects/permissions.py index 7c10b5c2..cda5c17c 100644 --- a/taiga/projects/permissions.py +++ b/taiga/projects/permissions.py @@ -83,6 +83,7 @@ class ProjectPermission(TaigaResourcePermission): edit_tag_perms = IsProjectAdmin() delete_tag_perms = IsProjectAdmin() mix_tags_perms = IsProjectAdmin() + duplicate_perms = IsAuthenticated() & HasProjectPerm('view_project') class ProjectFansPermission(TaigaResourcePermission): diff --git a/taiga/projects/services/__init__.py b/taiga/projects/services/__init__.py index 3be0a9d8..b5e231c4 100644 --- a/taiga/projects/services/__init__.py +++ b/taiga/projects/services/__init__.py @@ -52,6 +52,7 @@ from .projects import check_if_project_can_be_transfered from .projects import check_if_project_is_out_of_owner_limits from .projects import orphan_project from .projects import delete_project +from .projects import duplicate_project from .stats import get_stats_for_project_issues from .stats import get_stats_for_project diff --git a/taiga/projects/services/members.py b/taiga/projects/services/members.py index 52c62eca..6164ed24 100644 --- a/taiga/projects/services/members.py +++ b/taiga/projects/services/members.py @@ -17,7 +17,7 @@ # along with this program. If not, see . from taiga.base.exceptions import ValidationError -from taiga.base.utils import db, text +from taiga.base.utils import db from taiga.users.models import User from django.conf import settings @@ -84,9 +84,9 @@ def project_has_valid_admins(project, exclude_user=None): def can_user_leave_project(user, project): membership = project.memberships.get(user=user) if not membership.is_admin: - return True + return True - #The user can't leave if is the real owner of the project + # The user can't leave if is the real owner of the project if project.owner == user: return False diff --git a/taiga/projects/services/projects.py b/taiga/projects/services/projects.py index 2bd31d94..3f97d877 100644 --- a/taiga/projects/services/projects.py +++ b/taiga/projects/services/projects.py @@ -19,7 +19,12 @@ from django.apps import apps from django.utils.translation import ugettext as _ from taiga.celery import app +from taiga.base.api.utils import get_object_or_404 +from taiga.permissions import services as permissions_services +from taiga.projects.history.services import take_snapshot + from .. import choices +from ..apps import connect_projects_signals, disconnect_projects_signals ERROR_MAX_PUBLIC_PROJECTS_MEMBERSHIPS = 'max_public_projects_memberships' ERROR_MAX_PRIVATE_PROJECTS_MEMBERSHIPS = 'max_private_projects_memberships' @@ -27,7 +32,9 @@ ERROR_MAX_PUBLIC_PROJECTS = 'max_public_projects' ERROR_MAX_PRIVATE_PROJECTS = 'max_private_projects' ERROR_PROJECT_WITHOUT_OWNER = 'project_without_owner' -def check_if_project_privacity_can_be_changed(project, + +def check_if_project_privacity_can_be_changed( + project, current_memberships=None, current_private_projects=None, current_public_projects=None): @@ -91,7 +98,7 @@ def check_if_project_can_be_created_or_updated(project): if project.is_private: current_projects = project.owner.owned_projects.filter(is_private=True).count() max_projects = project.owner.max_private_projects - error_project_exceeded = _("You can't have more private projects") + error_project_exceeded = _("You can't have more private projects") current_memberships = project.memberships.count() or 1 max_memberships = project.owner.max_memberships_private_projects @@ -131,7 +138,7 @@ def check_if_project_can_be_transfered(project, new_owner): if project.is_private: current_projects = new_owner.owned_projects.filter(is_private=True).count() max_projects = new_owner.max_private_projects - error_project_exceeded = _("You can't have more private projects") + error_project_exceeded = _("You can't have more private projects") current_memberships = project.memberships.count() max_memberships = new_owner.max_memberships_private_projects @@ -154,7 +161,8 @@ def check_if_project_can_be_transfered(project, new_owner): return (True, None) -def check_if_project_is_out_of_owner_limits(project, +def check_if_project_is_out_of_owner_limits( + project, current_memberships=None, current_private_projects=None, current_public_projects=None): @@ -219,3 +227,47 @@ def delete_project(project_id): project.delete_related_content() project.delete() + + +def duplicate_project(project, **new_project_extra_args): + owner = new_project_extra_args.get("owner") + users = new_project_extra_args.pop("users") + + disconnect_projects_signals() + Project = apps.get_model("projects", "Project") + new_project = Project.objects.create(**new_project_extra_args) + connect_projects_signals() + + permissions_services.set_base_permissions_for_project(new_project) + + # Cloning the structure from the old project using templates + Template = apps.get_model("projects", "ProjectTemplate") + template = Template() + template.load_data_from_project(project) + template.apply_to_project(new_project) + new_project.creation_template = project.creation_template + new_project.save() + + # Creating the membership for the new owner + Membership = apps.get_model("projects", "Membership") + Membership.objects.create( + user=owner, + is_admin=True, + role=new_project.roles.get(slug=template.default_owner_role), + project=new_project + ) + + # Creating the extra memberships + for user in users: + project_memberships = project.memberships.exclude(user_id=owner.id) + membership = get_object_or_404(project_memberships, user_id=user["id"]) + Membership.objects.create( + user=membership.user, + is_admin=membership.is_admin, + role=new_project.roles.get(slug=membership.role.slug), + project=new_project + ) + + # Take initial snapshot for the project + take_snapshot(new_project, user=owner) + return new_project diff --git a/taiga/projects/signals.py b/taiga/projects/signals.py index b94e5cda..6a0c016c 100644 --- a/taiga/projects/signals.py +++ b/taiga/projects/signals.py @@ -20,9 +20,6 @@ from django.apps import apps from django.conf import settings from taiga.projects.notifications.services import create_notify_policy_if_not_exists -from taiga.base.utils.db import get_typename_for_model_class - -from easy_thumbnails.files import get_thumbnailer #################################### @@ -58,6 +55,13 @@ def project_post_save(sender, instance, created, **kwargs): if template is None: ProjectTemplate = apps.get_model("projects", "ProjectTemplate") template = ProjectTemplate.objects.get(slug=settings.DEFAULT_PROJECT_TEMPLATE) + + if instance.tags: + template.tags = instance.tags + + if instance.tags_colors: + template.tags_colors = instance.tags_colors + template.apply_to_project(instance) instance.save() diff --git a/taiga/projects/tagging/models.py b/taiga/projects/tagging/models.py index 970dae40..5ad63b39 100644 --- a/taiga/projects/tagging/models.py +++ b/taiga/projects/tagging/models.py @@ -30,7 +30,7 @@ class TaggedMixin(models.Model): abstract = True -class TagsColorsdMixin(models.Model): +class TagsColorsMixin(models.Model): tags_colors = ArrayField(ArrayField(models.TextField(null=True, blank=True), size=2), null=True, blank=True, default=[], verbose_name=_("tags colors")) diff --git a/taiga/projects/utils.py b/taiga/projects/utils.py index fbec4853..12930f8a 100644 --- a/taiga/projects/utils.py +++ b/taiga/projects/utils.py @@ -17,6 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . + def attach_members(queryset, as_field="members_attr"): """Attach a json members representation to each object of the queryset. diff --git a/taiga/projects/validators.py b/taiga/projects/validators.py index 32bafe35..41a1a23e 100644 --- a/taiga/projects/validators.py +++ b/taiga/projects/validators.py @@ -277,9 +277,25 @@ class ProjectTemplateValidator(validators.ModelValidator): ###################################################### -# Project order bulk serializers +# Project order bulk validators ###################################################### class UpdateProjectOrderBulkValidator(ProjectExistsValidator, validators.Validator): project_id = serializers.IntegerField() order = serializers.IntegerField() + + +###################################################### +# Project duplication validator +###################################################### + + +class DuplicateProjectMemberValidator(validators.Validator): + id = serializers.CharField() + + +class DuplicateProjectValidator(validators.Validator): + name = serializers.CharField() + description = serializers.CharField() + is_private = serializers.BooleanField() + users = DuplicateProjectMemberValidator(many=True) diff --git a/taiga/users/services.py b/taiga/users/services.py index 14a3802a..d4d520a7 100644 --- a/taiga/users/services.py +++ b/taiga/users/services.py @@ -582,7 +582,7 @@ def get_voted_list(for_user, from_user, type=None, q=None): ] -def has_available_slot_for_import_new_project(owner, is_private, total_memberships): +def has_available_slot_for_new_project(owner, is_private, total_memberships): if is_private: current_projects = owner.owned_projects.filter(is_private=True).count() max_projects = owner.max_private_projects diff --git a/tests/factories.py b/tests/factories.py index 5d3c65c6..55dafd87 100644 --- a/tests/factories.py +++ b/tests/factories.py @@ -66,6 +66,10 @@ class ProjectTemplateFactory(Factory): priorities = [] severities = [] roles = [] + epic_custom_attributes = [] + us_custom_attributes = [] + task_custom_attributes = [] + issue_custom_attributes = [] default_owner_role = "tester" diff --git a/tests/integration/resources_permissions/test_projects_resource.py b/tests/integration/resources_permissions/test_projects_resource.py index 46059004..de6a7a32 100644 --- a/tests/integration/resources_permissions/test_projects_resource.py +++ b/tests/integration/resources_permissions/test_projects_resource.py @@ -97,18 +97,22 @@ def data(): f.MembershipFactory(project=m.public_project, user=m.project_owner, + role__project=m.public_project, is_admin=True) f.MembershipFactory(project=m.private_project1, user=m.project_owner, + role__project=m.private_project1, is_admin=True) f.MembershipFactory(project=m.private_project2, user=m.project_owner, + role__project=m.private_project2, is_admin=True) f.MembershipFactory(project=m.blocked_project, user=m.project_owner, + role__project=m.blocked_project, is_admin=True) ContentType = apps.get_model("contenttypes", "ContentType") @@ -664,3 +668,33 @@ def test_project_list_with_discover_mode_enabled(client, data): projects_data = json.loads(response.content.decode('utf-8')) assert len(projects_data) == 2 assert response.status_code == 200 + + +def test_project_duplicate(client, data): + public_url = reverse('projects-duplicate', kwargs={"pk": data.public_project.pk}) + private1_url = reverse('projects-duplicate', kwargs={"pk": data.private_project1.pk}) + private2_url = reverse('projects-duplicate', kwargs={"pk": data.private_project2.pk}) + blocked_url = reverse('projects-duplicate', kwargs={"pk": data.blocked_project.pk}) + + users = [ + None, + data.registered_user, + data.project_member_with_perms, + data.project_owner + ] + + data = json.dumps({ + "name": "test", + "description": "description", + "is_private": True, + "users": [] + }) + + results = helper_test_http_method(client, 'post', public_url, data, users) + assert results == [401, 201, 201, 201] + results = helper_test_http_method(client, 'post', private1_url, data, users) + assert results == [401, 201, 201, 201] + results = helper_test_http_method(client, 'post', private2_url, data, users) + assert results == [404, 404, 201, 201] + results = helper_test_http_method(client, 'post', blocked_url, data, users) + assert results == [404, 404, 451, 451] diff --git a/tests/integration/test_projects.py b/tests/integration/test_projects.py index bd4fbac8..e4945150 100644 --- a/tests/integration/test_projects.py +++ b/tests/integration/test_projects.py @@ -33,6 +33,7 @@ from taiga.projects.tasks.models import Task from taiga.projects.issues.models import Issue from taiga.projects.epics.models import Epic from taiga.projects.choices import BLOCKED_BY_DELETING +from taiga.timeline.service import get_project_timeline from .. import factories as f from ..utils import DUMMY_BMP_DATA @@ -2095,3 +2096,182 @@ def test_color_tags_project_fired_on_element_update_respecting_color(): user_story.save() project = Project.objects.get(id=user_story.project.id) assert ["tag", "#123123"] in project.tags_colors + + +def test_duplicate_project(client): + user = f.UserFactory.create() + project = f.ProjectFactory.create( + owner=user, + is_looking_for_people=True, + looking_for_people_note="Looking lookin", + ) + project.tags = ["tag1", "tag2"] + project.tags_colors = [["t1", "#abcbca"], ["t2", "#aaabbb"]] + + project.default_epic_status = f.EpicStatusFactory.create(project=project) + project.default_us_status = f.UserStoryStatusFactory.create(project=project) + project.default_task_status = f.TaskStatusFactory.create(project=project) + project.default_issue_status = f.IssueStatusFactory.create(project=project) + project.default_points = f.PointsFactory.create(project=project) + project.default_issue_type = f.IssueTypeFactory.create(project=project) + project.default_priority = f.PriorityFactory.create(project=project) + project.default_severity = f.SeverityFactory.create(project=project) + + f.EpicCustomAttributeFactory(project=project) + f.UserStoryCustomAttributeFactory(project=project) + f.TaskCustomAttributeFactory(project=project) + f.IssueCustomAttributeFactory(project=project) + + project.save() + + role = f.RoleFactory.create(project=project, permissions=["view_project"]) + f.MembershipFactory.create(project=project, user=user, role=role, is_admin=True) + extra_membership = f.MembershipFactory.create(project=project, is_admin=True, role__project=project) + membership = f.MembershipFactory.create(project=project, role=role) + url = reverse("projects-duplicate", args=(project.id,)) + + data = { + "name": "test", + "description": "description", + "is_private": True, + "users": [{ + "id": extra_membership.user.id + }] + } + + client.login(user) + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 201 + + new_project = Project.objects.get(id=response.data["id"]) + + assert new_project.owner_id == user.id + owner_membership = new_project.memberships.get(user_id=user.id) + assert owner_membership.user_id == user.id + assert owner_membership.is_admin == True + assert project.memberships.get(user_id=extra_membership.user.id).role.slug == extra_membership.role.slug + assert set(project.tags) == set(new_project.tags) + assert set(dict(project.tags_colors).keys()) == set(dict(new_project.tags_colors).keys()) + + attributes = [ + "is_epics_activated", "is_backlog_activated", "is_kanban_activated", "is_wiki_activated", + "is_issues_activated", "videoconferences", "videoconferences_extra_data", + "is_looking_for_people", "looking_for_people_note", "is_private" + ] + + for attr in attributes: + assert getattr(project, attr) == getattr(new_project, attr) + + fk_attributes = [ + "default_epic_status", "default_us_status", "default_task_status", "default_issue_status", + "default_issue_type", "default_points", "default_priority", "default_severity", + ] + + for attr in fk_attributes: + assert getattr(project, attr).name == getattr(new_project, attr).name + + related_attributes = [ + "epic_statuses", "us_statuses", "task_statuses","issue_statuses", + "issue_types", "points", "priorities", "severities", + "epiccustomattributes", "userstorycustomattributes", "taskcustomattributes", "issuecustomattributes", + "roles" + ] + for attr in related_attributes: + from_names = set(getattr(project, attr).all().values_list("name", flat=True)) + to_names = set(getattr(new_project, attr).all().values_list("name", flat=True)) + assert from_names == to_names + + timeline = list(get_project_timeline(new_project)) + assert len(timeline) == 2 + assert timeline[0].event_type == "projects.project.create" + assert timeline[1].event_type == "projects.membership.create" + + +def test_duplicate_private_project_without_enough_private_projects_slots(client): + user = f.UserFactory.create(max_private_projects=0) + project = f.ProjectFactory.create(owner=user) + f.MembershipFactory(user=user, project=project, is_admin=True) + + url = reverse("projects-duplicate", args=(project.id,)) + data = { + "name": "test", + "description": "description", + "is_private": True, + "users": [] + } + + client.login(user) + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 400 + assert "can't have more private projects" in response.data["_error_message"] + assert response["Taiga-Info-Project-Memberships"] == "1" + assert response["Taiga-Info-Project-Is-Private"] == "True" + + +def test_duplicate_private_project_without_enough_memberships_slots(client): + user = f.UserFactory.create(max_memberships_private_projects=1) + project = f.ProjectFactory.create(owner=user) + f.MembershipFactory(user=user, project=project, is_admin=True, role__project=project) + extra_membership = f.MembershipFactory.create(project=project, is_admin=True, role__project=project) + + url = reverse("projects-duplicate", args=(project.id,)) + data = { + "name": "test", + "description": "description", + "is_private": True, + "users": [{ + "id": extra_membership.user_id + }] + } + + client.login(user) + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 400 + assert "current limit of memberships" in response.data["_error_message"] + assert response["Taiga-Info-Project-Memberships"] == "2" + assert response["Taiga-Info-Project-Is-Private"] == "True" + + +def test_duplicate_public_project_without_enough_public_projects_slots(client): + user = f.UserFactory.create(max_public_projects=0) + project = f.ProjectFactory.create(owner=user) + f.MembershipFactory(user=user, project=project, is_admin=True) + + url = reverse("projects-duplicate", args=(project.id,)) + data = { + "name": "test", + "description": "description", + "is_private": False, + "users": [] + } + + client.login(user) + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 400 + assert "can't have more public projects" in response.data["_error_message"] + assert response["Taiga-Info-Project-Memberships"] == "1" + assert response["Taiga-Info-Project-Is-Private"] == "False" + + +def test_duplicate_public_project_without_enough_memberships_slots(client): + user = f.UserFactory.create(max_memberships_public_projects=1) + project = f.ProjectFactory.create(owner=user) + f.MembershipFactory(user=user, project=project, is_admin=True, role__project=project) + extra_membership = f.MembershipFactory.create(project=project, is_admin=True, role__project=project) + + url = reverse("projects-duplicate", args=(project.id,)) + data = { + "name": "test", + "description": "description", + "is_private": False, + "users": [{ + "id": extra_membership.user_id + }] + } + + client.login(user) + response = client.json.post(url, json.dumps(data)) + assert response.status_code == 400 + assert "current limit of memberships" in response.data["_error_message"] + assert response["Taiga-Info-Project-Memberships"] == "2" + assert response["Taiga-Info-Project-Is-Private"] == "False" From fd170b6ca9905366d585ac9afae350450a6f349e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 10 Jan 2017 11:52:26 +0100 Subject: [PATCH 081/144] [i18n] Update locales --- scripts/manage_translations.py | 0 taiga/locale/ca/LC_MESSAGES/django.po | 632 ++++++++------ taiga/locale/de/LC_MESSAGES/django.po | 659 +++++++------- taiga/locale/en/LC_MESSAGES/django.po | 628 ++++++++------ taiga/locale/es/LC_MESSAGES/django.po | 715 +++++++++------- taiga/locale/fi/LC_MESSAGES/django.po | 632 ++++++++------ taiga/locale/fr/LC_MESSAGES/django.po | 675 ++++++++------- taiga/locale/it/LC_MESSAGES/django.po | 953 +++++++++++++-------- taiga/locale/ja/LC_MESSAGES/django.po | 632 ++++++++------ taiga/locale/nb/LC_MESSAGES/django.po | 632 ++++++++------ taiga/locale/nl/LC_MESSAGES/django.po | 632 ++++++++------ taiga/locale/pl/LC_MESSAGES/django.po | 632 ++++++++------ taiga/locale/pt_BR/LC_MESSAGES/django.po | 651 +++++++------- taiga/locale/ru/LC_MESSAGES/django.po | 748 +++++++++------- taiga/locale/sv/LC_MESSAGES/django.po | 632 ++++++++------ taiga/locale/tr/LC_MESSAGES/django.po | 632 ++++++++------ taiga/locale/zh-Hans/LC_MESSAGES/django.po | 848 ++++++++++++------ taiga/locale/zh-Hant/LC_MESSAGES/django.po | 632 ++++++++------ 18 files changed, 6649 insertions(+), 4916 deletions(-) mode change 100644 => 100755 scripts/manage_translations.py diff --git a/scripts/manage_translations.py b/scripts/manage_translations.py old mode 100644 new mode 100755 diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index e8e00410..5006eb67 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-28 10:29+0200\n" -"PO-Revision-Date: 2016-09-20 10:50+0000\n" +"POT-Creation-Date: 2017-01-10 11:50+0100\n" +"PO-Revision-Date: 2017-01-10 10:50+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ca/)\n" @@ -20,15 +20,15 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "El registre públic està deshabilitat" -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "Sistema de registre invàlid" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "Sistema de login invàlid" @@ -48,17 +48,17 @@ msgstr "El token no s'ajusta a cap invitació vàlida" msgid "User is already registered." msgstr "Aquest usuari ja està registrat" -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "" -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Error creant un nou usuari." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Token invàlid" @@ -79,95 +79,95 @@ msgstr "Aquest camp es obligatori" msgid "Invalid value." msgstr "Valor invàlid" -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "'%s' valor deu ser Verdader o Fals" -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "Introdueix un 'slug' vàlid: lletres, nombres, barra baixa o guió." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "Selecciona una opció vàlida. %(value)s no es una opció vàlida." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Introdueix una adreça de correu vàlida-" -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "La data te un format erroni. Utilitza un del següents formats: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "La data te un format erroni. Utilitza un del següents formats: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "L'hora te un format erroni. Utilitza un del següents formats: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Introdueix un nombre complet." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Asegurat que aquest valor es inferior i igual a %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Asegurat que aquest valor es superior o igual a %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "\"%s\" deu ser un float." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Introdueix un nombre." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Asegurat que no hi ha més de %s digits en total." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Asegurat que no hi ha més de %s posicions decimals." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Asegurat que no hi ha més de %s dígits abans del decimal." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "Cap fitxer enviat. Comprova el tipus de codificació en el formulari." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Cap fitxer enviat." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "El fitxer enviat està buit." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -175,11 +175,11 @@ msgstr "" "Asegurat que el nom del fitxer te un màxim de %(max)d caràcters (te " "%(length)d)" -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Per favor envia un fitxer o cancela el checkbox, pero no ambdós." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -188,25 +188,25 @@ msgstr "" "està corrupte." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "La página no es 'last' ni pot ser convertida a un 'int'" -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Pàgina invàlida (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "" @@ -270,7 +270,7 @@ msgstr "" msgid "Permission denied" msgstr "" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "" @@ -349,11 +349,11 @@ msgstr "Precondició errònia." msgid "No room left for more projects." msgstr "" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "" -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "" @@ -362,43 +362,43 @@ msgstr "" msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Segueix-nos a Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Aconsegueix el codi a Github" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Visita la nostra pàgina web" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -744,7 +744,7 @@ msgid "It contain invalid custom fields." msgstr "Conté camps personalitzats invàlids." #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "" @@ -755,13 +755,13 @@ msgstr "" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "Nom" @@ -777,8 +777,8 @@ msgstr "" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "Descripció" @@ -787,36 +787,34 @@ msgstr "Descripció" msgid "Next url" msgstr "" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "Nom complet" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "Adreça d'email" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "Comentari" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -888,9 +886,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "El payload no és un arxiu json vàlid" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "El projecte no existeix" @@ -1146,89 +1144,89 @@ msgstr "Administrar rols" msgid "Privacity" msgstr "" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "Amo" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Arguments incomplets." -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Format d'image invàlid" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "No tens permisos per a veure açò." @@ -1244,18 +1242,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "Projecte" @@ -1270,8 +1268,8 @@ msgstr "Id d'objecte" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1291,12 +1289,12 @@ msgstr "està obsolet " #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "Ordre" @@ -1332,19 +1330,71 @@ msgstr "" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 -msgid "Text" +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings, 2016 # Chris , 2015 # M S, 2015 # Guido Brand, 2015 @@ -20,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-28 10:29+0200\n" -"PO-Revision-Date: 2016-09-20 10:50+0000\n" +"POT-Creation-Date: 2017-01-10 11:50+0100\n" +"PO-Revision-Date: 2017-01-10 10:50+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/de/)\n" @@ -31,15 +32,15 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "Die Registrierung ist für die Öffentlichkeit gesperrrt." -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "Ungültige Registrierungsart" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "Ungültige Loginart" @@ -59,17 +60,17 @@ msgstr "Das Token kann keiner gültigen Einladung zugeordnet werden." msgid "User is already registered." msgstr "Der Benutzer ist schon registriert." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "Dieser Benutzer ist schon ein Mitglied des Projektes." -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Fehler bei der Erstellung des neuen Benutzers." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Ungültiges Token" @@ -92,113 +93,113 @@ msgstr "Das ist ein Pflichtfeld." msgid "Invalid value." msgstr "Ungültiger Wert." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "Der Wert für '%s' muss entweder True/Wahr oder False/Falsch sein." -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Geben Sie einen gültigen 'slug' ein, bestehend aus Buchstaben, Zahlen, " "Unterstrichen oder Bindestrichen." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "Bitte machen Sie eine gültige Auswahl. %(value)s ist nicht verfügbar." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" -msgstr "" +msgstr "Ihre E-Mail Adresse ist nicht erlaubt." -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Geben Sie bitte eine gültige E-Mail Adresse an." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "" "Das Datum hat das falsche Format. Bitte verwenden Sie eines der folgenden " "Formate: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "" "Der Datentyp 'Datetime' hat ein falsches Format. Bitte verwenden Sie eines " "der folgenden Formate: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "" "Die Zeit hat ein falsches Format. Bitte verwenden Sie eines der folgenden " "Formate: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Geben Sie bitte eine ganze Zahl ein." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" "Stellen Sie sicher, dass dieser Wert niedriger oder gleich ist wie " "%(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" "Stellen Sie sicher, dass dieser Wert höher oder gleich ist wie " "%(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "Der Wert für '%s' muss eine Fließkommazahl sein." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Bitte geben Sie eine Zahl ein." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "" "Bitte stellen Sie sicher, dass nicht mehr als %s insgesamt vorhanden sind. " -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "" "Bitte stellen Sie sicher, dass nicht mehr als %s Dezimalstellen vorhanden " "sind." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "" "Stellen Sie sicher, dass nicht mehr als %s Ziffern vor dem Dezimalpunkt " "vorhanden sind." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "" "Es wurde keine Datei übergeben. Prüfen Sie die Kodierung der HTML-Form." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Es wurde keine Datei eingereicht." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "Die eingereichte Datei ist leer." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -206,13 +207,13 @@ msgstr "" "Stellen Sie sicher, dass dieser Dateiname höchstens %(max)d Zeichen hat (er " "hat %(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" "Bitte senden Sie entweder eine Datei oder markieren Sie \"Löschen\", nicht " "beides." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -221,25 +222,25 @@ msgstr "" "haben, ist entweder kein Bild oder defekt." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Blockiertes Element" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Seite ist nicht 'letzte', noch kann diese konvertiert werden." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Ungültige Seite (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Ungültige Berechtigungsdefinition" @@ -305,7 +306,7 @@ msgstr "Nicht gefunden." msgid "Permission denied" msgstr "Zugriff verweigert" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Fehler bei der Serveranmeldung" @@ -384,11 +385,11 @@ msgstr "Voraussetzungsfehler" msgid "No room left for more projects." msgstr "Kein Raum für weitere Projekte." -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Fehler in Filter Parameter Typen." -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project' muss ein Integer-Wert sein." @@ -397,43 +398,43 @@ msgstr "'project' muss ein Integer-Wert sein." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Folgen Sie uns auf Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Holen Sie sich den Source-Code auf GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Besuchen Sie unsere Webseite" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -562,7 +563,7 @@ msgstr "Fehler beim Importieren der User-Stories" #: taiga/export_import/services/store.py:790 msgid "error importing epics" -msgstr "" +msgstr "Fehler beim Importieren der Epics" #: taiga/export_import/services/store.py:794 msgid "error importing tasks" @@ -894,7 +895,7 @@ msgid "It contain invalid custom fields." msgstr "Enthält ungültige Benutzerfelder." #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Der Name für das Projekt ist doppelt vergeben" @@ -905,13 +906,13 @@ msgstr "Authentifizierung erforderlich" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "Name" @@ -927,8 +928,8 @@ msgstr "Web" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "Beschreibung" @@ -937,36 +938,34 @@ msgstr "Beschreibung" msgid "Next url" msgstr "Nächste URL" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "Geheimer Schlüssel für Verschlüsselung der Anwensungs-Token" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "Benutzer" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "Applikation" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "vollständiger Name" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "E-Mail Adresse" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "Kommentar" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -1038,9 +1037,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "Die Nutzlast ist kein gültiges json" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "Das Projekt existiert nicht" @@ -1138,7 +1137,7 @@ msgstr "Meilensteine ansehen" #: taiga/permissions/choices.py:25 taiga/permissions/choices.py:41 msgid "View epic" -msgstr "" +msgstr "Epic ansehen." #: taiga/permissions/choices.py:26 msgid "View user stories" @@ -1174,19 +1173,19 @@ msgstr "Meilenstein löschen" #: taiga/permissions/choices.py:42 msgid "Add epic" -msgstr "" +msgstr "Epic hinzufügen." #: taiga/permissions/choices.py:43 msgid "Modify epic" -msgstr "" +msgstr "Epic ändern." #: taiga/permissions/choices.py:44 msgid "Comment epic" -msgstr "" +msgstr "Epic kommentieren." #: taiga/permissions/choices.py:45 msgid "Delete epic" -msgstr "" +msgstr "Epic löschen." #: taiga/permissions/choices.py:47 msgid "View user story" @@ -1202,7 +1201,7 @@ msgstr "User-Story ändern" #: taiga/permissions/choices.py:50 msgid "Comment user story" -msgstr "" +msgstr "User-Story komentieren." #: taiga/permissions/choices.py:51 msgid "Delete user story" @@ -1218,7 +1217,7 @@ msgstr "Aufgabe ändern" #: taiga/permissions/choices.py:56 msgid "Comment task" -msgstr "" +msgstr "Aufgabe kommentieren." #: taiga/permissions/choices.py:57 msgid "Delete task" @@ -1234,7 +1233,7 @@ msgstr "Ticket ändern" #: taiga/permissions/choices.py:62 msgid "Comment issue" -msgstr "" +msgstr "Ticket kommentieren." #: taiga/permissions/choices.py:63 msgid "Delete issue" @@ -1250,7 +1249,7 @@ msgstr "Wiki Seite ändern" #: taiga/permissions/choices.py:68 msgid "Comment wiki page" -msgstr "" +msgstr "Wiki Seite kommentieren." #: taiga/permissions/choices.py:69 msgid "Delete wiki page" @@ -1296,83 +1295,83 @@ msgstr "Administrator-Rollen" msgid "Privacity" msgstr "" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "Besitzer" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Unvollständige Argumente" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Ungültiges Bildformat" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Unglültiger Templatename" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Ungültige Templatebeschreibung" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "Ungültige Benutzer-Id" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "Der Benutzer existiert nicht" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "Der Benutzer muss bereits Mitglied des Projektes sein" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1380,7 +1379,7 @@ msgstr "" "Das Projekt muss einen Eigentümer haben und mindestens ein Benutzer muss ein " "aktiver Administrator sein" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "Sie haben keine Berechtigungen für diese Ansicht" @@ -1396,18 +1395,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "Nr. unterschreidet sich zwischen dem Objekt und dem Projekt" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "Projekt" @@ -1422,8 +1421,8 @@ msgstr "Objekt Nr." #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1443,12 +1442,12 @@ msgstr "wurde verworfen" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "Reihenfolge" @@ -1484,19 +1483,71 @@ msgstr "Dieses Projekt ist blockiert, weil es der Eigentümer verlassen hat." msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings\n" "Language-Team: Taiga Dev Team \n" @@ -16,15 +16,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "" -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "" @@ -44,17 +44,17 @@ msgstr "" msgid "User is already registered." msgstr "" -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "" -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "" #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "" @@ -75,130 +75,130 @@ msgstr "" msgid "Invalid value." msgstr "" -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "" -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "" -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "" -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "" -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "" -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "" -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "" -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "" -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "" -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "" -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "" -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." msgstr "" -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "" @@ -262,7 +262,7 @@ msgstr "" msgid "Permission denied" msgstr "" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "" @@ -341,11 +341,11 @@ msgstr "" msgid "No room left for more projects." msgstr "" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "" -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "" @@ -354,43 +354,43 @@ msgstr "" msgid "Taiga" msgstr "" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -733,7 +733,7 @@ msgid "It contain invalid custom fields." msgstr "" #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "" @@ -744,13 +744,13 @@ msgstr "" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "" @@ -766,8 +766,8 @@ msgstr "" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "" @@ -776,36 +776,34 @@ msgstr "" msgid "Next url" msgstr "" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -861,9 +859,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "" @@ -1119,89 +1117,89 @@ msgstr "" msgid "Privacity" msgstr "" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "" @@ -1217,18 +1215,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "" @@ -1243,8 +1241,8 @@ msgstr "" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1264,12 +1262,12 @@ msgstr "" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "" @@ -1305,19 +1303,71 @@ msgstr "" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 -msgid "Text" +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings, 2015 # Jesus Marin , 2015 # Jorge Sanchez , 2016 +# José Alejandro Díaz Carmona , 2016 +# Kiko Fernandez-Reyes , 2016 # Luis Sebastian Urrutia Fuentes , 2016 # Renelis Abreu Ramirez , 2016 # Taiga Dev Team , 2015-2016 @@ -17,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-28 10:29+0200\n" -"PO-Revision-Date: 2016-09-20 10:50+0000\n" +"POT-Creation-Date: 2017-01-10 11:50+0100\n" +"PO-Revision-Date: 2017-01-10 10:50+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/es/)\n" @@ -28,15 +30,15 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "El registro público está deshabilitado." -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "Tipo de registro inválido" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "Tipo de login inválido" @@ -56,17 +58,17 @@ msgstr "El token no pertenece a ninguna invitación válida." msgid "User is already registered." msgstr "Este usuario ya está registrado." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "Este usuario ya es miembro del proyecto." -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Error al crear un nuevo usuario " #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Token inválido" @@ -87,107 +89,107 @@ msgstr "Este campo es requerido." msgid "Invalid value." msgstr "Valor inválido." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "El valor para '%s' debe ser True o False." -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Escribe un slug válido que esté formado por letras, números o los símbolos " "de guión o subrayado." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" "Seleccione una opción válida. %(value)s no es una de las opciones " "disponibles." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" -msgstr "" +msgstr "El dominio de tú email no es válido" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Introduzca una dirección de email válida." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "" "La fecha posee un formato inválido. Utiliza alguno de los siguientes " "formatos: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "" "La fecha y hora poseen un formato inválido. Utiliza alguno de los siguientes " "formatos: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "" "El tiempo indicado posee un formato inválido. Utiliza alguno de los " "siguientes formatos: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Introduce un número entero" -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Asegúrate de que el valor es menor o igual a %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Asegúrate de que el valor es mayor o igual a %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "El valor \"%s\" debe ser un número en coma flotante." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Introduce un número." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Asegúrate de que no haya más de %s dígitos en total." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Asegúrate de que no haya más de %s decimales." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "" "Asegúrate de que no haya más de %s dígitos en la parte entera del número." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "" "No se ha adjuntado ningún archivo. Comprueba el encoding en el formulario." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "No se envió el archivo" -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "El archivo enviado está vacío." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -195,36 +197,36 @@ msgstr "" "Asegúrate de que el nombre del fichero contiene menos de %(max)d caracteres " "(ahora tiene %(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Por favor, adjunta un fichero o marca la casilla de vacío, no ambos." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Adjunta una imagen válida. El fichero no es una imagen o está dañada." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Elemento bloqueado" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "La página no es 'last' o no es un número." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Página no válida (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Definición de permiso inválida." @@ -291,7 +293,7 @@ msgstr "No encontrado" msgid "Permission denied" msgstr "Permiso denegado." -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Error en la aplicación del servidor." @@ -370,11 +372,11 @@ msgstr "Error por incumplimiento de precondición" msgid "No room left for more projects." msgstr "No hay espacio para mas proyectos" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Error en los típos de parámetros de filtrado" -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project' debe ser un valor entero." @@ -383,43 +385,43 @@ msgstr "'project' debe ser un valor entero." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Síguenos en Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Copia el código en GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Visita nuestra web" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -547,7 +549,7 @@ msgstr "error importando las historias de usuario" #: taiga/export_import/services/store.py:790 msgid "error importing epics" -msgstr "" +msgstr "error importando epics" #: taiga/export_import/services/store.py:794 msgid "error importing tasks" @@ -874,7 +876,7 @@ msgid "It contain invalid custom fields." msgstr "Contiene attributos personalizados inválidos." #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Nombre duplicado para el proyecto" @@ -885,13 +887,13 @@ msgstr "Se requiere autenticación" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "nombre" @@ -907,8 +909,8 @@ msgstr "web" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "descripción" @@ -917,36 +919,34 @@ msgstr "descripción" msgid "Next url" msgstr "Siguiente URL" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "clave secreta para cifrar los tokens de aplicación" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "usuario" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "aplicación" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "nombre completo" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "dirección de email" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "comentario" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -1017,9 +1017,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "El payload no es un json válido" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "El proyecto no existe" @@ -1043,6 +1043,9 @@ msgid "" "\n" "> {comment_message}" msgstr "" +"Comentario desde {platform}:\n" +"\n" +"> {comment_message}" #: taiga/hooks/event_hooks.py:84 msgid "Invalid issue comment information" @@ -1058,7 +1061,7 @@ msgstr "" #: taiga/hooks/event_hooks.py:107 #, python-brace-format msgid "Issue created from {platform}." -msgstr "" +msgstr "Petición creada desde {platform}." #: taiga/hooks/event_hooks.py:120 msgid "Invalid issue information" @@ -1066,7 +1069,7 @@ msgstr "Información inválida de Issue" #: taiga/hooks/event_hooks.py:149 taiga/hooks/event_hooks.py:171 msgid "unknown user" -msgstr "" +msgstr "usuario desconocido" #: taiga/hooks/event_hooks.py:156 #, python-brace-format @@ -1117,7 +1120,7 @@ msgstr "Ver sprints" #: taiga/permissions/choices.py:25 taiga/permissions/choices.py:41 msgid "View epic" -msgstr "" +msgstr "Ver epic" #: taiga/permissions/choices.py:26 msgid "View user stories" @@ -1153,19 +1156,19 @@ msgstr "Borrar sprint" #: taiga/permissions/choices.py:42 msgid "Add epic" -msgstr "" +msgstr "Añadir epic" #: taiga/permissions/choices.py:43 msgid "Modify epic" -msgstr "" +msgstr "Modificar epic" #: taiga/permissions/choices.py:44 msgid "Comment epic" -msgstr "" +msgstr "Comentar epic" #: taiga/permissions/choices.py:45 msgid "Delete epic" -msgstr "" +msgstr "Borrar epic" #: taiga/permissions/choices.py:47 msgid "View user story" @@ -1181,7 +1184,7 @@ msgstr "Modificar historia de usuario" #: taiga/permissions/choices.py:50 msgid "Comment user story" -msgstr "" +msgstr "Comentar historia de usuario" #: taiga/permissions/choices.py:51 msgid "Delete user story" @@ -1197,7 +1200,7 @@ msgstr "Modificar tarea" #: taiga/permissions/choices.py:56 msgid "Comment task" -msgstr "" +msgstr "Comentar tarea" #: taiga/permissions/choices.py:57 msgid "Delete task" @@ -1213,7 +1216,7 @@ msgstr "Modificar petición" #: taiga/permissions/choices.py:62 msgid "Comment issue" -msgstr "" +msgstr "Comentar en petición" #: taiga/permissions/choices.py:63 msgid "Delete issue" @@ -1229,7 +1232,7 @@ msgstr "Modificar pagina wiki" #: taiga/permissions/choices.py:68 msgid "Comment wiki page" -msgstr "" +msgstr "Comentar en página wiki" #: taiga/permissions/choices.py:69 msgid "Delete wiki page" @@ -1273,85 +1276,85 @@ msgstr "Administrar roles" #: taiga/projects/admin.py:100 msgid "Privacity" -msgstr "" +msgstr "Privacidad" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" -msgstr "" +msgstr "Módulos" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" -msgstr "" +msgstr "Valores por defecto" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" -msgstr "" +msgstr "Actividad" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" -msgstr "" +msgstr "Seguidores" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "Dueño" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." -msgstr "" +msgstr "{count} se hizo público satisfactoriamente" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" -msgstr "" +msgstr "Hacer público" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." -msgstr "" +msgstr "{count} se hizo privado satisfactoriamente" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" -msgstr "" +msgstr "Haz privado" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" -msgstr "" +msgstr "Eliminar seleccionados %(verbose_name_plural)s" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Argumentos incompletos" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Formato de imagen no válido" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Nombre de plantilla invalido" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Descripción de plantilla invalida" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "id de usuario inválido" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "El usuario no existe" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "El usuario debe ser un miembro del proyecto" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1359,7 +1362,7 @@ msgstr "" "El proyecto debe tener un dueño y al menos uno de los usuarios debe ser un " "administrador activo" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "No tienes suficientes permisos para ver esto." @@ -1375,18 +1378,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "El ID de proyecto no coincide entre el adjunto y un proyecto" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "Proyecto" @@ -1401,8 +1404,8 @@ msgstr "id de objeto" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1422,12 +1425,12 @@ msgstr "está desactualizado" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "orden" @@ -1461,21 +1464,73 @@ msgstr "El proyecto esta bloqueado porque el dueño ha salido" #: taiga/projects/choices.py:38 msgid "This project is blocked while it's deleted" +msgstr "Este proyecto esta bloqueado hasta que sea borrado" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings\n" "Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fi/)\n" @@ -21,15 +21,15 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "Julkinen rekisteri on suljettu." -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "väärä rekisterin tyyppi" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "väärä kirjautumistyyppi" @@ -49,17 +49,17 @@ msgstr "Tunniste ei vastaa mihinkään avoimeen kutsuun." msgid "User is already registered." msgstr "Käyttäjä on jo rekisteröitynyt." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "Tämä käyttäjä on jo projektin jäsen." -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Virhe käyttäjän luonnissa." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Väärä tunniste" @@ -81,108 +81,108 @@ msgstr "Pakollinen kenttä." msgid "Invalid value." msgstr "Virheellinen arvo." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "'%s' pitää olla True tai False." -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Anna kelvollinen 'avain' joka koostuu merkeistä, numeroista, alaviivoista ja " "tavuviivoista." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "Valitse kelvollinen valinta. %(value)s ei ole yksi vaihtoehdoista." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Anna voimassaoleva sähköpostiosoite." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "Päivämäärä on väärässä muodossa. Käytä yhtä näistä muodoista: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "Päiväys on väärässä muodossa. Käytä yhtä näistä muodoista: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "Aika on väärässä muodossa. Käytä yhtä näistä muodoista: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Anna kokonaisluku." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Varmista että arvo on korkeintaan %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Varmista että arvo on vähintään %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "\"%s\" pitää olla desimaaliluku." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Anna numero." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Anna korkeintaan %s numeroa yhteensä." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Desimaaleja voi olla korkeintaan %s." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Ennen desimaalipistettä saa olla korkeintaan %s numeroa." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "Tiedostoa ei lähtetty. Varmista merkistö lomakkeella." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Tiedostoa ei lähetetty." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "Tiedosto oli tyhjä." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." msgstr "" "Tiedoston nimi saa olla korkeintaan %(max)d pitkä se on nyt %(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Valitse tiedosto tai Poista valintaneliö, ei molempia." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -191,25 +191,25 @@ msgstr "" "vioittunut." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Estetty elementti" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Sivu ei ole 'viimeinen', ekä sitä pystytä muuntamaan numeroksi." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Virheellinen sivu (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Virheellinen oikeuksien määrittely." @@ -273,7 +273,7 @@ msgstr "Ei löytynyt" msgid "Permission denied" msgstr "Ei käyttöoikeutta" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Palvelinsovelluksen virhe" @@ -352,11 +352,11 @@ msgstr "Precondition error" msgid "No room left for more projects." msgstr "Ei enää tilaa uusille projekteille." -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Error in filter params types." -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project' must be an integer value." @@ -365,43 +365,43 @@ msgstr "'project' must be an integer value." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Seuraa meitä Twitterissä" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Lataa koodi GitHubista" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Vieraile meidän web-sivuilla" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -838,7 +838,7 @@ msgid "It contain invalid custom fields." msgstr "Sisältää vieheellisiä omia kenttiä." #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Nimi on tuplana projektille" @@ -849,13 +849,13 @@ msgstr "" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "nimi" @@ -871,8 +871,8 @@ msgstr "" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "kuvaus" @@ -881,36 +881,34 @@ msgstr "kuvaus" msgid "Next url" msgstr "" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "koko nimi" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "sähköpostiosoite" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "kommentti" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -983,9 +981,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "The payload is not a valid json" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "Projektia ei löydy" @@ -1241,89 +1239,89 @@ msgstr "Hallinnoi rooleja" msgid "Privacity" msgstr "" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "omistaja" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Puutteelliset argumentit" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Väärä kuvaformaatti" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Virheellinen mallipohjan nimi" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Virheellinen mallipohjan kuvaus" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "Sinulla ei ole oikeuksia nähdä tätä." @@ -1339,18 +1337,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "Projekti ID ei vastaa kohdetta ja projektia" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "projekti" @@ -1365,8 +1363,8 @@ msgstr "objekti ID" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1386,12 +1384,12 @@ msgstr "on poistettu" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "order" @@ -1427,19 +1425,71 @@ msgstr "" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 -msgid "Text" +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings, 2016 # Alain Poirier , 2015 # David Barragán , 2015 # Djyp Forest Fortin , 2015 @@ -23,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-28 10:29+0200\n" -"PO-Revision-Date: 2016-09-20 10:50+0000\n" +"POT-Creation-Date: 2017-01-10 11:50+0100\n" +"PO-Revision-Date: 2017-01-10 10:50+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fr/)\n" @@ -34,15 +35,15 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "L'inscription publique est désactivée." -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "type d'inscription invalide" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "type d'identifiant invalide" @@ -62,17 +63,17 @@ msgstr "Le jeton ne correspond à aucune invitation." msgid "User is already registered." msgstr "Cet utilisateur est déjà inscrit." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "L'utilisateur est déjà un membre du projet" -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Erreur à la création du nouvel utilisateur." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Jeton invalide" @@ -94,105 +95,105 @@ msgstr "Ce champ est requis." msgid "Invalid value." msgstr "Valeur invalide." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "La valeur de '%s' doit être soit Vrai soit Faux." -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Entrez un 'slug' valide composé de lettres, chiffres, tirets bas ou traits " "d'union." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" "Sélectionnez une option valide. %(value)s ne fait pas partie des choix " "possibles." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" -msgstr "" +msgstr "Le nom de domaine de votre émail n'est pas autorisé" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Entrez une adresse email valide." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "" "Le format de la date est mauvais. Utilisez un de ces formats à la place: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "" "Le format de l'horodatage est mauvais. Utilisez un de ces formats à la " "place: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "" "Le format de l'heure est mauvais. Utilisez un de ces formats à la place: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Entrez un nombre entier." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" "Assurez-vous que cette valeur est inférieure ou égale à %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" "Assurez-vous que cette valeur est supérieure ou égale à %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "La valeur de \"%s\" doit être un nombre en virgule flottante." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Entrez un nombre." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres au total." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Assurez-vous qu'il n'y a pas plus de %s décimales." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres avant le point." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "Aucun fichier n'a été soumis. Vérifiez l'encodage sur le formulaire. " -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Aucun fichier n'a été soumis." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "Le fichier soumis est vide." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -200,13 +201,13 @@ msgstr "" "Assurez-vous que le nom de fichier comporte au plus %(max)d caractères (il " "en a %(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" "Veuillez soit soumettre un fichier ou cocher la case de remise à zéro, mais " "pas les deux." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -215,27 +216,27 @@ msgstr "" "image ou était une image corrompue." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Élément bloqué" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" "La page n'est pas la \"dernière\", et ne peut pas non plus être convertie en " "entier." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Page invalide (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Définition de permission invalide." @@ -301,7 +302,7 @@ msgstr "Non trouvé" msgid "Permission denied" msgstr "Permission refusée" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Erreur du serveur d'application" @@ -380,11 +381,11 @@ msgstr "Erreur de précondition" msgid "No room left for more projects." msgstr "Limite de projets atteinte." -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Erreur dans les types de paramètres de filtres" -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project' doit être une valeur entière." @@ -393,43 +394,43 @@ msgstr "'project' doit être une valeur entière." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Suivez-nous sur Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Téléchargez le code sur GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Visitez notre site web" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -561,7 +562,7 @@ msgstr "erreur à l'importation des histoires utilisateur" #: taiga/export_import/services/store.py:790 msgid "error importing epics" -msgstr "" +msgstr "Erreur d'importation des épopées" #: taiga/export_import/services/store.py:794 msgid "error importing tasks" @@ -585,7 +586,7 @@ msgstr "erreur lors de l'import des timelines" #: taiga/export_import/services/store.py:832 msgid "unexpected error importing project" -msgstr "" +msgstr "Erreur imprévue à l'importation du projet" #: taiga/export_import/tasks.py:62 taiga/export_import/tasks.py:63 msgid "Error generating project dump" @@ -617,11 +618,11 @@ msgstr "Erreur au chargement du dump du projet" #: taiga/export_import/tasks.py:121 msgid "Error loading your project dump file" -msgstr "" +msgstr "Erreur lors du chargement de votre fichier de vidage de projet" #: taiga/export_import/tasks.py:135 msgid " -- no detail info --" -msgstr "" +msgstr " -- pas informations détaillées --" #: taiga/export_import/templates/emails/dump_project-body-html.jinja:4 #, python-format @@ -870,7 +871,7 @@ msgid "It contain invalid custom fields." msgstr "Contient des champs personnalisés non valides." #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Nom dupliqué pour ce projet" @@ -881,13 +882,13 @@ msgstr "Authentification requise" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "nom" @@ -903,8 +904,8 @@ msgstr "web" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "description" @@ -913,36 +914,34 @@ msgstr "description" msgid "Next url" msgstr "Url suivante" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "Clé secrète pour chiffrer le jeton de l'application" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "utilisateur" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "application" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "Nom complet" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "Adresse email" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "Commentaire" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -1013,9 +1012,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "Le payload n'est pas un json valide" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "Le projet n'existe pas" @@ -1062,7 +1061,7 @@ msgstr "Information incorrecte sur le problème" #: taiga/hooks/event_hooks.py:149 taiga/hooks/event_hooks.py:171 msgid "unknown user" -msgstr "" +msgstr "utilisateur inconnu" #: taiga/hooks/event_hooks.py:156 #, python-brace-format @@ -1113,7 +1112,7 @@ msgstr "Voir les jalons" #: taiga/permissions/choices.py:25 taiga/permissions/choices.py:41 msgid "View epic" -msgstr "" +msgstr "Voir epic" #: taiga/permissions/choices.py:26 msgid "View user stories" @@ -1153,15 +1152,15 @@ msgstr "" #: taiga/permissions/choices.py:43 msgid "Modify epic" -msgstr "" +msgstr "Modifier epic" #: taiga/permissions/choices.py:44 msgid "Comment epic" -msgstr "" +msgstr "Commenter epic" #: taiga/permissions/choices.py:45 msgid "Delete epic" -msgstr "" +msgstr "Supprimer epic" #: taiga/permissions/choices.py:47 msgid "View user story" @@ -1193,7 +1192,7 @@ msgstr "Modifier une tâche" #: taiga/permissions/choices.py:56 msgid "Comment task" -msgstr "" +msgstr "Commenter tâche" #: taiga/permissions/choices.py:57 msgid "Delete task" @@ -1209,7 +1208,7 @@ msgstr "Modifier le problème" #: taiga/permissions/choices.py:62 msgid "Comment issue" -msgstr "" +msgstr "Commenter problème" #: taiga/permissions/choices.py:63 msgid "Delete issue" @@ -1269,85 +1268,85 @@ msgstr "Administrer les rôles" #: taiga/projects/admin.py:100 msgid "Privacity" -msgstr "" +msgstr "Confidentialité" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" -msgstr "" +msgstr "Modules" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" -msgstr "" +msgstr "Les valeurs par défaut" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" -msgstr "" +msgstr "Activité" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" -msgstr "" +msgstr "Fans" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "propriétaire" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" -msgstr "" +msgstr "Rendre publique" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" -msgstr "" +msgstr "Rendre privé" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "arguments manquants" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "format de l'image non valide" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Nom de modèle non valide" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Description du modèle non valide" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "Identifiant utilisateur invalide" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "L'utilisateur n'existe pas" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "L'utilisateur doit déjà être un membre du projet" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1355,7 +1354,7 @@ msgstr "" "Le projet doit avoir un propriétaire et au moins l'un de ses membres doit " "être un administrateur actif." -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "Vous n'avez pas les permissions pour consulter cet élément" @@ -1371,18 +1370,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "L'identifiant du projet de correspond pas entre l'objet et le projet" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "projet" @@ -1397,8 +1396,8 @@ msgstr "identifiant de l'objet" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1418,12 +1417,12 @@ msgstr "est obsolète" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "ordre" @@ -1459,19 +1458,71 @@ msgstr "Ce projet est bloqué car son propriétaire est parti" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings\n" "Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/it/)\n" @@ -26,15 +26,15 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." -msgstr "La registrazione pubblica è disabilitata." +msgstr "Il registro pubblico è disabilitato." -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" -msgstr "Tipo di registrazione non valida" +msgstr "tipo di registro invalido" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "Tipo di login non valido" @@ -54,17 +54,17 @@ msgstr "Il token non corrisponde a nessun invito valido." msgid "User is already registered." msgstr "L'Utente è già registrato." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "Questo utente fa già parte del progetto." -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Errore nella creazione della nuova utenza." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Token non valido" @@ -87,99 +87,99 @@ msgstr "Questo campo è obbligatorio." msgid "Invalid value." msgstr "Valore non valido." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "il valore di '%s' deve essere o Vero o Falso." -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Uno 'slug' valido è composto da lettere, numeri, caratteri di sottolineatura " "o trattini." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" "Seleziona una scelta valida. %(value)s non è fra le scelte disponibili." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" -msgstr "" +msgstr "Il dominio della tua email non e' permesso" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Inserisci un indirizzo e-mail valido." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "La data non ha un formato valido. Usa uno dei formati disponibili: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "L'orario non ha un formato valido. Usa uno dei formati disponibili: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "Formato temporale errato. Usa uno dei seguenti formati: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Inserisci il numero completo." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Assicurati che questo valore sia minore o uguale di %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Assicurati che questo valore sia maggiore o uguale di %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "il valore \"%s\" deve essere un valore \"float\"." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Inserisci un numero." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Assicurati che non ci siano più di %s cifre in totale." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Assicurati che non ci siano più di %s decimali." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Assicurati che non ci siano più di %s cifre prima del punto decimale." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "" "Non è stato caricato alcun file. Controlla il tipo di codifica nella scheda." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Nessun file caricato." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "Il file caricato è vuoto." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -187,12 +187,12 @@ msgstr "" "Assicurati che il nome del file abbia al massimo %(max)d caratteri (ne ha " "%(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" "Carica il file oppure controlla la casella deselezionata. Non entrambi. " -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -201,25 +201,25 @@ msgstr "" "o l'immagine potrebbe essere corrotta. " #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" -msgstr "" +msgstr "Elemento bloccato" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "La pagina non è 'last', né può essere convertita come int." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Pagina (%(page_number)s) invalida: %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Definizione di permesso non valida." @@ -285,7 +285,7 @@ msgstr "Non trovato" msgid "Permission denied" msgstr "Permesso negato" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Errore sul server" @@ -363,13 +363,13 @@ msgstr "Errore di precondizione" #: taiga/base/exceptions.py:219 msgid "No room left for more projects." -msgstr "" +msgstr "Non c'e' piu' spazio per altri progetti." -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Errore nel filtro del tipo di parametri." -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'Progetto' deve essere un valore intero." @@ -378,43 +378,43 @@ msgstr "'Progetto' deve essere un valore intero." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Seguici su Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Prendi il codice su GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Visita il nostro sito" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -440,6 +440,22 @@ msgid "" " \n" " " msgstr "" +"\n" +"Supporto di Taiga:\n" +"%(support_url)s\n" +"
    \n" +"Contattaci:\n" +"\n" +"%(support_email)s\n" +"\n" +"
    \n" +"Mailing list:\n" +"\n" +"%(mailing_list_url)s\n" +"" #: taiga/base/templates/emails/hero-body-html.jinja:6 msgid "You have been Taigatized" @@ -545,7 +561,7 @@ msgstr "Errore nell'importazione delle user story" #: taiga/export_import/services/store.py:790 msgid "error importing epics" -msgstr "" +msgstr "errore di importazione degli epici" #: taiga/export_import/services/store.py:794 msgid "error importing tasks" @@ -569,7 +585,7 @@ msgstr "Errore nell'importazione delle timelines" #: taiga/export_import/services/store.py:832 msgid "unexpected error importing project" -msgstr "" +msgstr "si e' verificato un errore inaspettato importando il progetto" #: taiga/export_import/tasks.py:62 taiga/export_import/tasks.py:63 msgid "Error generating project dump" @@ -594,6 +610,23 @@ msgid "" "TRACE ERROR:\n" "------------" msgstr "" +"\n" +"\n" +"Errore di caricamento del dump di {user_full_name} <{user_email}>:\"\n" +"\n" +"\n" +"RAGIONE:\n" +"-------\n" +"\n" +"{reason}\n" +"\n" +"DETTAGLI:\n" +"--------\n" +"\n" +"{details}\n" +"\n" +"TRACCE DELL'ERRORE:\n" +"------------" #: taiga/export_import/tasks.py:120 msgid "Error loading project dump" @@ -601,11 +634,11 @@ msgstr "Errore nel caricamento del dump di progetto" #: taiga/export_import/tasks.py:121 msgid "Error loading your project dump file" -msgstr "" +msgstr "Errore nel caricamento del dump di progetto" #: taiga/export_import/tasks.py:135 msgid " -- no detail info --" -msgstr "" +msgstr "-- non ci sono informazioni dettagliate --" #: taiga/export_import/templates/emails/dump_project-body-html.jinja:4 #, python-format @@ -916,7 +949,7 @@ msgid "It contain invalid custom fields." msgstr "Contiene campi personalizzati invalidi." #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Il nome del progetto è duplicato" @@ -927,13 +960,13 @@ msgstr "E' richiesta l'autenticazione" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "nome" @@ -949,8 +982,8 @@ msgstr "web" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "descrizione" @@ -959,36 +992,34 @@ msgstr "descrizione" msgid "Next url" msgstr "Url successivo" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "chiave segreta per cifrare i token dell'applicazione" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "utente" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "applicazione" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "Nome completo" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "Inserisci un indirizzo e-mail valido." -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "Commento" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -1065,9 +1096,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "Il carico non è un json valido" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "Il progetto non esiste" @@ -1083,6 +1114,11 @@ msgid "" "\n" "\"{comment_message}\"" msgstr "" +"[@{user_name}] \"Vedi cosa dice il ({user_url} profilo {platform} di " +"@{user_name}\") da [{platform}#{number}]({comment_url} \"Vai al commento" +"\"):\n" +"\n" +"\"{comment_message}\"" #: taiga/hooks/event_hooks.py:71 #, python-brace-format @@ -1091,6 +1127,9 @@ msgid "" "\n" "> {comment_message}" msgstr "" +"Commento Da {platform}:\n" +"\n" +"> {comment_message}" #: taiga/hooks/event_hooks.py:84 msgid "Invalid issue comment information" @@ -1102,11 +1141,13 @@ msgid "" "Issue created by [@{user_name}]({user_url} \"See @{user_name}'s {platform} " "profile\") from [{platform}#{number}]({url} \"Go to issue\")." msgstr "" +"Problema creato da [@{user_name}]({user_url} \"Vedi il profilo {platform} di " +"@{user_name}\") da [{platform}#{number}]({url} \"Vai al problema\")." #: taiga/hooks/event_hooks.py:107 #, python-brace-format msgid "Issue created from {platform}." -msgstr "" +msgstr "Problema creato da {platform}." #: taiga/hooks/event_hooks.py:120 msgid "Invalid issue information" @@ -1114,7 +1155,7 @@ msgstr "Informazione sul problema non valida" #: taiga/hooks/event_hooks.py:149 taiga/hooks/event_hooks.py:171 msgid "unknown user" -msgstr "" +msgstr "utente sconosciuto" #: taiga/hooks/event_hooks.py:156 #, python-brace-format @@ -1124,6 +1165,10 @@ msgid "" "\n" " - Status: **{src_status}** → **{dst_status}**" msgstr "" +"{user_text} ha cambiato lo stato da [{platform} commit]({commit_url} \"Vedi " +"il commit '{commit_id} - {commit_message}'\")\n" +"\n" +"- Status: **{src_status}** → **{dst_status}**" #: taiga/hooks/event_hooks.py:161 #, python-brace-format @@ -1132,6 +1177,9 @@ msgid "" "\n" " - Status: **{src_status}** → **{dst_status}**" msgstr "" +"Cambiato lo stato dal commit {platform}.\n" +"\n" +"- Stato: **{src_status}** → **{dst_status}**" #: taiga/hooks/event_hooks.py:179 #, python-brace-format @@ -1140,12 +1188,16 @@ msgid "" "({commit_url} \"See commit '{commit_id} - {commit_message}'\") " "\"{commit_message}\"" msgstr "" +"Questo {type_name} e' stato citato da {user_text} nel [{platform} commit]" +"({commit_url} \"Vedi il commit commit '{commit_id} - {commit_message}'\") " +"\"{commit_message}\"" #: taiga/hooks/event_hooks.py:184 #, python-brace-format msgid "" "This issue has been mentioned in the {platform} commit \"{commit_message}\"" msgstr "" +"Questo problema e' stato citato nel commit \"{commit_message}\" di {platform}" #: taiga/hooks/event_hooks.py:206 msgid "The referenced element doesn't exist" @@ -1165,7 +1217,7 @@ msgstr "Guarda le milestones" #: taiga/permissions/choices.py:25 taiga/permissions/choices.py:41 msgid "View epic" -msgstr "" +msgstr "Vedi epico" #: taiga/permissions/choices.py:26 msgid "View user stories" @@ -1201,19 +1253,19 @@ msgstr "Elimina la tappa" #: taiga/permissions/choices.py:42 msgid "Add epic" -msgstr "" +msgstr "Aggiungi epico" #: taiga/permissions/choices.py:43 msgid "Modify epic" -msgstr "" +msgstr "Modifica epico" #: taiga/permissions/choices.py:44 msgid "Comment epic" -msgstr "" +msgstr "Commenta epico" #: taiga/permissions/choices.py:45 msgid "Delete epic" -msgstr "" +msgstr "Eliminca epico" #: taiga/permissions/choices.py:47 msgid "View user story" @@ -1229,7 +1281,7 @@ msgstr "Modifica una storia utente" #: taiga/permissions/choices.py:50 msgid "Comment user story" -msgstr "" +msgstr "Commenta la storia dell'utente" #: taiga/permissions/choices.py:51 msgid "Delete user story" @@ -1245,7 +1297,7 @@ msgstr "Modifica il compito" #: taiga/permissions/choices.py:56 msgid "Comment task" -msgstr "" +msgstr "Commenta compito" #: taiga/permissions/choices.py:57 msgid "Delete task" @@ -1261,7 +1313,7 @@ msgstr "Modifica il problema" #: taiga/permissions/choices.py:62 msgid "Comment issue" -msgstr "" +msgstr "Commenta il problema" #: taiga/permissions/choices.py:63 msgid "Delete issue" @@ -1277,7 +1329,7 @@ msgstr "Modifica la pagina wiki" #: taiga/permissions/choices.py:68 msgid "Comment wiki page" -msgstr "" +msgstr "Commenta la pagina wiki" #: taiga/permissions/choices.py:69 msgid "Delete wiki page" @@ -1321,91 +1373,93 @@ msgstr "Ruoli dell'amministratore" #: taiga/projects/admin.py:100 msgid "Privacity" -msgstr "" +msgstr "Privacy" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" -msgstr "" +msgstr "Moduli" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" -msgstr "" +msgstr "Valori di default" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" -msgstr "" +msgstr "Attività" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "proprietario" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." -msgstr "" +msgstr "{count} resi pubblici con successo." -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" -msgstr "" +msgstr "Rendi pubblico" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." -msgstr "" +msgstr "{count} resi privati con successo." -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" -msgstr "" +msgstr "Rendi privato" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" -msgstr "" +msgstr "Cancella selezionati %(verbose_name_plural)s" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Argomento non valido" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Formato dell'immagine non valido" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Il nome del template non è valido" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "La descrizione del template non è valida" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" -msgstr "" +msgstr "id utente non valido" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" -msgstr "" +msgstr "L'utente non esiste" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" -msgstr "" +msgstr "L'utente deve gia' essere un membro del progetto" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" +"Il progetto deve avere un proprietario ed almeno uno dei suoi utenti deve " +"essere un amministratore attivo" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "Non hai il permesso di vedere questo elemento." @@ -1415,24 +1469,24 @@ msgstr "Aggiornamento non parziale non supportato" #: taiga/projects/attachments/api.py:69 msgid "Object id issue isn't exists" -msgstr "" +msgstr "Il problema dell'oggetto id non esiste" #: taiga/projects/attachments/api.py:72 msgid "Project ID not matches between object and project" msgstr "L'ID di progetto non corrisponde tra oggetto e progetto" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "progetto" @@ -1447,8 +1501,8 @@ msgstr "ID dell'oggetto" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1468,12 +1522,12 @@ msgstr "non approvato" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "ordine" @@ -1495,35 +1549,87 @@ msgstr "Talky" #: taiga/projects/choices.py:35 msgid "This project is blocked due to payment failure" -msgstr "" +msgstr "Questo progetto e' bloccato a causa di un falliimento nel pagamento" #: taiga/projects/choices.py:36 msgid "This project is blocked by admin staff" -msgstr "" +msgstr "Questo progetto e' bloccato dallo staff di amministrazione" #: taiga/projects/choices.py:37 msgid "This project is blocked because the owner left" -msgstr "" +msgstr "Questo progetto e' bloccato perche' il proprietario lo ha abbandonato" #: taiga/projects/choices.py:38 msgid "This project is blocked while it's deleted" +msgstr "Questo progetto e' bloccato finche' e' cancellato" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settingsSee epic\n" " " msgstr "" +"\n" +"

    Epico aggiornato

    \n" +"

    Ciao %(user)s,
    %(changer)s ha aggiornato un epico su %(project)s\n" +"

    Epico #%(ref)s %(subject)s

    \n" +"Vedi epico" #: taiga/projects/notifications/templates/emails/epics/epic-change-body-text.jinja:3 #, python-format @@ -2135,6 +2276,10 @@ msgid "" "Hello %(user)s, %(changer)s has updated a epic on %(project)s\n" "See epic #%(ref)s %(subject)s at %(url)s\n" msgstr "" +"\n" +"Epico aggiornato\n" +"Ciao %(user)s, %(changer)s ha aggiornato un epico su %(project)s\n" +"Vedi epico #%(ref)s %(subject)s in %(url)s\n" #: taiga/projects/notifications/templates/emails/epics/epic-change-subject.jinja:1 #, python-format @@ -2142,6 +2287,8 @@ msgid "" "\n" "[%(project)s] Updated the epic #%(ref)s \"%(subject)s\"\n" msgstr "" +"\n" +"[%(project)s] Aggiornato l'epico #%(ref)s \"%(subject)s\"\n" #: taiga/projects/notifications/templates/emails/epics/epic-create-body-html.jinja:4 #, python-format @@ -2156,6 +2303,14 @@ msgid "" "

    The Taiga Team

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

    Nuovo epico creato

    \n" +"

    Ciao %(user)s,
    %(changer)s ha creato un nuovo epico su %(project)s\n" +"

    Epico #%(ref)s %(subject)s

    \n" +"Vedi epico\n" +"

    Il Team di Taiga

    " #: taiga/projects/notifications/templates/emails/epics/epic-create-body-text.jinja:1 #, python-format @@ -2168,6 +2323,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"Nuovo epico creato\n" +"Ciao %(user)s, %(changer)s ha creato un nuovo epico in %(project)s\n" +"Vedi epico #%(ref)s %(subject)s in %(url)s\n" +"\n" +"---\n" +"Il Team di Taiga\n" #: taiga/projects/notifications/templates/emails/epics/epic-create-subject.jinja:1 #, python-format @@ -2175,6 +2337,8 @@ msgid "" "\n" "[%(project)s] Created the epic #%(ref)s \"%(subject)s\"\n" msgstr "" +"\n" +"[%(project)s] Ha creato l'epico #%(ref)s \"%(subject)s\"\n" #: taiga/projects/notifications/templates/emails/epics/epic-delete-body-html.jinja:4 #, python-format @@ -2199,6 +2363,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"Epico cancellato\n" +"Ciao %(user)s, %(changer)s ha cancellato un epico su %(project)s\n" +"Epic #%(ref)s %(subject)s\n" +"\n" +"---\n" +"Il Team di Taiga\n" #: taiga/projects/notifications/templates/emails/epics/epic-delete-subject.jinja:1 #, python-format @@ -2206,6 +2377,8 @@ msgid "" "\n" "[%(project)s] Deleted the epic #%(ref)s \"%(subject)s\"\n" msgstr "" +"\n" +"[%(project)s] Ha cancellato l'epico #%(ref)s \"%(subject)s\"\n" #: taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja:4 #, python-format @@ -3088,40 +3261,50 @@ msgstr "versione" msgid "" "You can't leave the project if you are the owner or there are no more admins" msgstr "" +"Non puoi lasciare il progetto se sei il proprietario o se non ci sono piu' " +"amministratori" -#: taiga/projects/services/members.py:118 +#: taiga/projects/services/members.py:133 msgid "Project without owner" -msgstr "" +msgstr "Progetto senza proprietario" -#: taiga/projects/services/members.py:123 +#: taiga/projects/services/members.py:138 msgid "You have reached your current limit of memberships for private projects" -msgstr "" +msgstr "Sei arrivato al tuo limite attuale di iscrizioni per progetti privati" -#: taiga/projects/services/members.py:127 +#: taiga/projects/services/members.py:142 msgid "You have reached your current limit of memberships for public projects" +msgstr "Sei arrivato al tuo limite attuale di iscrizioni per progetti pubblici" + +#: taiga/projects/services/members.py:148 +msgid "You have reached the current limit of pending memberships" msgstr "" -#: taiga/projects/services/projects.py:94 -#: taiga/projects/services/projects.py:134 taiga/users/services.py:589 +#: taiga/projects/services/projects.py:101 +#: taiga/projects/services/projects.py:141 taiga/users/services.py:589 msgid "You can't have more private projects" -msgstr "" +msgstr "Non puoi avere altri progetti privati" -#: taiga/projects/services/projects.py:98 -#: taiga/projects/services/projects.py:138 taiga/users/services.py:592 +#: taiga/projects/services/projects.py:105 +#: taiga/projects/services/projects.py:145 taiga/users/services.py:592 msgid "" "This project reaches your current limit of memberships for private projects" msgstr "" +"Questo progetto arriva al tuo limite attuale di iscrizioni per progetti " +"privati" -#: taiga/projects/services/projects.py:102 -#: taiga/projects/services/projects.py:142 taiga/users/services.py:596 +#: taiga/projects/services/projects.py:109 +#: taiga/projects/services/projects.py:149 taiga/users/services.py:596 msgid "You can't have more public projects" -msgstr "" +msgstr "Non puoi avere altri progetti pubblici" -#: taiga/projects/services/projects.py:106 -#: taiga/projects/services/projects.py:146 taiga/users/services.py:599 +#: taiga/projects/services/projects.py:113 +#: taiga/projects/services/projects.py:153 taiga/users/services.py:599 msgid "" "This project reaches your current limit of memberships for public projects" msgstr "" +"Questo progetto arriva al tuo limite attuale di iscrizioni per progetti " +"pubblici" #: taiga/projects/services/stats.py:197 msgid "Future sprint" @@ -3133,19 +3316,20 @@ msgstr "Termine di progetto" #: taiga/projects/services/transfer.py:62 #: taiga/projects/services/transfer.py:69 -#: taiga/projects/services/transfer.py:72 taiga/users/api.py:186 -#: taiga/users/api.py:191 +#: taiga/projects/services/transfer.py:72 taiga/users/api.py:193 +#: taiga/users/api.py:198 msgid "Token is invalid" msgstr "Token non valido" #: taiga/projects/services/transfer.py:67 msgid "Token has expired" -msgstr "" +msgstr "Il token e' scaduto" #: taiga/projects/tagging/fields.py:52 #, python-brace-format msgid "Invalid tag '{value}'. The color is not a valid HEX color or null." msgstr "" +"Tag '{value}' non corretto. Il colore non e' un codice HEX corretto o vuoto." #: taiga/projects/tagging/fields.py:55 #, python-brace-format @@ -3153,11 +3337,13 @@ msgid "" "Invalid tag '{value}'. it must be the name or a pair '[\"name\", \"hex color/" "\" | null]'." msgstr "" +"Tag '{value}' non corretto. Deve essere il nome o una coppia '[\"name\", " +"\"hex color/\" | null]'." #: taiga/projects/tagging/fields.py:77 #, python-brace-format msgid "Invalid tag '{value}'. It must be the tag name." -msgstr "" +msgstr "Tag '{value}' non corretto. Deve essere il nome tag" #: taiga/projects/tagging/models.py:27 msgid "tags" @@ -3170,30 +3356,30 @@ msgstr "colori dei tag" #: taiga/projects/tagging/validators.py:47 #: taiga/projects/tagging/validators.py:74 msgid "This tag already exists." -msgstr "" +msgstr "Questo tag esiste gia'." #: taiga/projects/tagging/validators.py:54 #: taiga/projects/tagging/validators.py:81 msgid "The color is not a valid HEX color." -msgstr "" +msgstr "Il colore non e' un codice HEX valido." #: taiga/projects/tagging/validators.py:67 #: taiga/projects/tagging/validators.py:101 #: taiga/projects/tagging/validators.py:114 #: taiga/projects/tagging/validators.py:121 msgid "The tag doesn't exist." -msgstr "" +msgstr "Il tag non esiste." -#: taiga/projects/tasks/api.py:97 taiga/projects/tasks/api.py:106 +#: taiga/projects/tasks/api.py:98 taiga/projects/tasks/api.py:107 msgid "You don't have permissions to set this sprint to this task." msgstr "Non hai i permessi per aggiungere questo sprint a questo compito." -#: taiga/projects/tasks/api.py:100 +#: taiga/projects/tasks/api.py:101 msgid "You don't have permissions to set this user story to this task." msgstr "" "Non hai i permessi per aggiungere questa storia utente a questo compito." -#: taiga/projects/tasks/api.py:103 +#: taiga/projects/tasks/api.py:104 msgid "You don't have permissions to set this status to this task." msgstr "Non hai i permessi per aggiungere questo stato a questo compito." @@ -3211,33 +3397,40 @@ msgstr "è sotto aspirina" #: taiga/projects/tasks/validators.py:59 msgid "Invalid milestone id." -msgstr "" +msgstr "milestone id non valido." #: taiga/projects/tasks/validators.py:70 msgid "Invalid task status id." -msgstr "" +msgstr "id stato attivita' non valido." #: taiga/projects/tasks/validators.py:83 msgid "Invalid user story id." -msgstr "" +msgstr "id storia utente non valido." #: taiga/projects/tasks/validators.py:107 msgid "Invalid task status id. The status must belong to the same project." msgstr "" +"id stato attivita' non valido. Lo stato deve appartenere allo stesso " +"progetto." #: taiga/projects/tasks/validators.py:121 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" +"id storia utente non valido. La storia utente deve appartenere allo stesso " +"progetto." #: taiga/projects/tasks/validators.py:133 msgid "Invalid milestone id. The milestone must belong to the same project." msgstr "" +"id milestone non valido. La milestone deve appartenere allo stesso progetto." #: taiga/projects/tasks/validators.py:150 msgid "" "Invalid task ids. All tasks must belong to the same project and, if it " "exists, to the same status, user story and/or milestone." msgstr "" +"id stati attivita' non validi. Tutte le attivita' devono appartenere allo " +"stesso progetto e, se esiste, allo stesso stato, storia utente e/o milestone." #: taiga/projects/templates/emails/membership_invitation-body-html.jinja:6 #: taiga/projects/templates/emails/membership_invitation-body-text.jinja:4 @@ -3452,13 +3645,15 @@ msgstr "" #: taiga/projects/templates/emails/transfer_accept-body-text.jinja:7 #, python-format msgid "%(new_owner_name)s says:" -msgstr "" +msgstr "%(new_owner_name)s dice:" #: taiga/projects/templates/emails/transfer_accept-body-text.jinja:11 msgid "" "\n" "From now on, your new status for this project will be \"admin\".\n" msgstr "" +"\n" +"Da ora in poi, il tuo nuovo stato per questo progetto sara' \"admin\".\n" #: taiga/projects/templates/emails/transfer_accept-body-text.jinja:16 #: taiga/projects/templates/emails/transfer_reject-body-text.jinja:19 @@ -3468,6 +3663,8 @@ msgid "" "\n" "The Taiga Team\n" msgstr "" +"\n" +"Il Team di Taiga\n" #: taiga/projects/templates/emails/transfer_accept-subject.jinja:1 #, python-format @@ -3475,6 +3672,9 @@ msgid "" "\n" "[%(project)s] Project ownership transfer offer accepted!\n" msgstr "" +"\n" +"[%(project)s] Offerta di trasferimento della proprieta' del progetto " +"accettata!\n" #: taiga/projects/templates/emails/transfer_reject-body-html.jinja:4 #, python-format @@ -3485,6 +3685,10 @@ msgid "" "new project owner for \"%(project_name)s\".

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

    Ciao %(owner_name)s,

    \n" +"

    %(rejecter_name)s ha rifiutato la tua offerta e non diventera' il nuovo " +"proprietario di progetto di \"%(project_name)s\".

    " #: taiga/projects/templates/emails/transfer_reject-body-html.jinja:10 #, python-format @@ -3493,6 +3697,8 @@ msgid "" "

    %(rejecter_name)s says:

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

    %(rejecter_name)s dice:

    " #: taiga/projects/templates/emails/transfer_reject-body-html.jinja:16 msgid "" @@ -3501,11 +3707,14 @@ msgid "" "different person.

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

    Se vuoi, puoi ancora provare a trasferire la proprieta' del progetto ad " +"un'altra persona.

    " #: taiga/projects/templates/emails/transfer_reject-body-html.jinja:21 #: taiga/projects/templates/emails/transfer_reject-body-html.jinja:22 msgid "Request transfer to a different person" -msgstr "" +msgstr "Richiedi trasferimento ad un'altra persona" #: taiga/projects/templates/emails/transfer_reject-body-text.jinja:1 #, python-format @@ -3515,11 +3724,15 @@ msgid "" "%(rejecter_name)s has declined your offer and will not become the new " "project owner for \"%(project_name)s\".\n" msgstr "" +"\n" +"Ciao %(owner_name)s,\n" +"%(rejecter_name)s ha rifiutato la tua offerta e non diventera' il nuovo " +"proprietario di progetto di \"%(project_name)s\".\n" #: taiga/projects/templates/emails/transfer_reject-body-text.jinja:7 #, python-format msgid "%(rejecter_name)s says:" -msgstr "" +msgstr "%(rejecter_name)s dice:" #: taiga/projects/templates/emails/transfer_reject-body-text.jinja:11 msgid "" @@ -3527,10 +3740,14 @@ msgid "" "If you want, you can still try to transfer the project ownership to a " "different person.\n" msgstr "" +"\n" +"\n" +"

    Se vuoi, puoi ancora provare a trasferire la proprieta' del progetto ad " +"un'altra persona.

    \n" #: taiga/projects/templates/emails/transfer_reject-body-text.jinja:15 msgid "Request transfer to a different person:" -msgstr "" +msgstr "Richiedi trasferimento ad un'altra persona" #: taiga/projects/templates/emails/transfer_reject-subject.jinja:1 #, python-format @@ -3538,6 +3755,8 @@ msgid "" "\n" "[%(project)s] Project ownership transfer declined\n" msgstr "" +"\n" +"[%(project)s] Trasferimento della proprieta' del progetto rifiutato\n" #: taiga/projects/templates/emails/transfer_request-body-html.jinja:4 #, python-format @@ -3548,6 +3767,10 @@ msgid "" "\"%(project_name)s\".

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

    Ciao %(owner_name)s,

    \n" +"

    %(requester_name)s ha chiesto di diventare il nuovo proprietario di " +"progetto di \"%(project_name)s\".

    " #: taiga/projects/templates/emails/transfer_request-body-html.jinja:9 msgid "" @@ -3556,11 +3779,14 @@ msgid "" "project transfer from the administration panel.

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

    Per favore, clicca su \"Continua\" se vuoi cominciare il trasferimento di " +"progetto dal pannello di amministrazione.

    " #: taiga/projects/templates/emails/transfer_request-body-html.jinja:14 #: taiga/projects/templates/emails/transfer_start-body-html.jinja:22 msgid "Continue" -msgstr "" +msgstr "Continua" #: taiga/projects/templates/emails/transfer_request-body-text.jinja:1 #, python-format @@ -3570,6 +3796,10 @@ msgid "" "%(requester_name)s has requested to become the project owner for " "\"%(project_name)s\".\n" msgstr "" +"\n" +"Ciao %(owner_name)s,\n" +"%(requester_name)s ha richiesto di diventare il proprietario di progetto per " +"\"%(project_name)s\".\n" #: taiga/projects/templates/emails/transfer_request-body-text.jinja:6 msgid "" @@ -3577,10 +3807,13 @@ msgid "" "Please, go to your project settings if you would like to start the project " "transfer from the administration panel.\n" msgstr "" +"\n" +"Per favore, vai alle impostazioni del tuo progetto se vuoi cominciare il " +"trasferimento di progetto dal pannello di amministrazione.\n" #: taiga/projects/templates/emails/transfer_request-body-text.jinja:10 msgid "Go to your project settings:" -msgstr "" +msgstr "Vai alle tue impostazioni di progetto:" #: taiga/projects/templates/emails/transfer_request-subject.jinja:1 #, python-format @@ -3588,6 +3821,8 @@ msgid "" "\n" "[%(project)s] Project ownership transfer request\n" msgstr "" +"\n" +"[%(project)s] Richiesta di trasferimento della proprieta' del progetto\n" #: taiga/projects/templates/emails/transfer_start-body-html.jinja:4 #, python-format @@ -3598,6 +3833,10 @@ msgid "" "would like you to become the new project owner.

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

    Ciao %(receiver_name)s,

    \n" +"

    %(owner_name)s, il proprietario attuale del progetto \"%(project_name)s\" " +"vorrebbe che tu diventassi il nuovo proprietario di progetto.

    " #: taiga/projects/templates/emails/transfer_start-body-html.jinja:10 #, python-format @@ -3606,6 +3845,8 @@ msgid "" "

    %(owner_name)s says:

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

    %(owner_name)s dice:

    " #: taiga/projects/templates/emails/transfer_start-body-html.jinja:17 msgid "" @@ -3614,6 +3855,9 @@ msgid "" "proposal.

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

    Per favire, clicca su \"Continua\" per accettare o rifiutare questa " +"proposta.

    " #: taiga/projects/templates/emails/transfer_start-body-text.jinja:1 #, python-format @@ -3623,11 +3867,15 @@ msgid "" "%(owner_name)s, the current project owner at \"%(project_name)s\" would like " "you to become the new project owner.\n" msgstr "" +"\n" +"Ciao %(receiver_name)s,\n" +"%(owner_name)s, il proprietario corrente del progetto \"%(project_name)s\" " +"vorrebbe diventare il nuovo proprietario di progetto.\n" #: taiga/projects/templates/emails/transfer_start-body-text.jinja:6 #, python-format msgid "%(owner_name)s says:" -msgstr "" +msgstr "%(owner_name)s dice:" #: taiga/projects/templates/emails/transfer_start-body-text.jinja:11 msgid "" @@ -3635,10 +3883,15 @@ msgid "" "Please, go to the following link to either accept or reject this proposal.\n" msgstr "" +"\n" +"Per favore, vai al seguente link per accettare o rifiutare questa proposta.\n" #: taiga/projects/templates/emails/transfer_start-body-text.jinja:15 msgid "Accept or reject the project ownership transfer:" msgstr "" +"Accetta o rifiuta la richiesta di trasferimento della proprieta' del " +"progetto:" #: taiga/projects/templates/emails/transfer_start-subject.jinja:1 #, python-format @@ -3646,6 +3899,8 @@ msgid "" "\n" "[%(project)s] Project ownership transfer offer\n" msgstr "" +"\n" +"[%(project)s] Offerta di trasferimento della proprieta' del progetto\n" #. Translators: Name of scrum project template. #: taiga/projects/translations.py:30 @@ -3890,38 +4145,30 @@ msgstr "Product Owner" msgid "Stakeholder" msgstr "Stakeholder" -#: taiga/projects/userstories/api.py:124 +#: taiga/projects/userstories/api.py:127 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "Non hai i permessi per aggiungere questo sprint a questa storia utente." -#: taiga/projects/userstories/api.py:128 +#: taiga/projects/userstories/api.py:131 msgid "You don't have permissions to set this status to this user story." msgstr "Non hai i permessi per aggiungere questo stato a questa storia utente." -#: taiga/projects/userstories/api.py:218 +#: taiga/projects/userstories/api.py:221 #, python-brace-format msgid "Invalid role id '{role_id}'" -msgstr "" +msgstr "id ruolo '{role_id}' non valido" -#: taiga/projects/userstories/api.py:225 +#: taiga/projects/userstories/api.py:228 #, python-brace-format msgid "Invalid points id '{points_id}'" -msgstr "" +msgstr "id punti '{points_id}' non valido" -#: taiga/projects/userstories/api.py:240 +#: taiga/projects/userstories/api.py:243 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "Stiamo generando la storia utente #{ref} - {subject}" -#: taiga/projects/userstories/api.py:301 -msgid "ref param is needed" -msgstr "" - -#: taiga/projects/userstories/api.py:304 -msgid "project or project_slug param is needed" -msgstr "" - #: taiga/projects/userstories/models.py:41 msgid "role" msgstr "ruolo" @@ -3936,7 +4183,7 @@ msgstr "ordine dello sprint" #: taiga/projects/userstories/models.py:84 msgid "kanban order" -msgstr "" +msgstr "ordine kanban" #: taiga/projects/userstories/models.py:92 msgid "finish date" @@ -3974,63 +4221,67 @@ msgstr "" msgid "All the user stories must be from the same project" msgstr "" -#: taiga/projects/validators.py:61 +#: taiga/projects/validators.py:63 msgid "There's no project with that id" msgstr "Non c'è nessuno progetto con questo ID" -#: taiga/projects/validators.py:142 -msgid "Email address is already taken" -msgstr "L'indirizzo email è già usato" +#: taiga/projects/validators.py:145 +msgid "The user yet exists in the project" +msgstr "" -#: taiga/projects/validators.py:154 +#: taiga/projects/validators.py:155 msgid "Invalid role for the project" msgstr "Ruolo di progetto non valido" -#: taiga/projects/validators.py:165 +#: taiga/projects/validators.py:170 taiga/projects/validators.py:225 +msgid "The user must be a valid contact" +msgstr "" + +#: taiga/projects/validators.py:191 msgid "The project owner must be admin." msgstr "" -#: taiga/projects/validators.py:169 +#: taiga/projects/validators.py:195 msgid "At least one user must be an active admin for this project." msgstr "" -#: taiga/projects/validators.py:201 +#: taiga/projects/validators.py:240 msgid "Invalid role ids. All roles must belong to the same project." msgstr "" -#: taiga/projects/validators.py:225 +#: taiga/projects/validators.py:264 msgid "Default options" msgstr "Opzioni predefinite" -#: taiga/projects/validators.py:226 +#: taiga/projects/validators.py:265 msgid "User story's statuses" msgstr "Stati della storia utente" -#: taiga/projects/validators.py:227 +#: taiga/projects/validators.py:266 msgid "Points" msgstr "Punti" -#: taiga/projects/validators.py:228 +#: taiga/projects/validators.py:267 msgid "Task's statuses" msgstr "Stati del compito" -#: taiga/projects/validators.py:229 +#: taiga/projects/validators.py:268 msgid "Issue's statuses" msgstr "Stati del problema" -#: taiga/projects/validators.py:230 +#: taiga/projects/validators.py:269 msgid "Issue's types" msgstr "Tipologie del problema" -#: taiga/projects/validators.py:231 +#: taiga/projects/validators.py:270 msgid "Priorities" msgstr "Priorità" -#: taiga/projects/validators.py:232 +#: taiga/projects/validators.py:271 msgid "Severities" msgstr "Criticità" -#: taiga/projects/validators.py:233 +#: taiga/projects/validators.py:272 msgid "Roles" msgstr "Ruoli" @@ -4059,7 +4310,7 @@ msgstr "ultima modificatore" msgid "href" msgstr "href" -#: taiga/timeline/signals.py:63 +#: taiga/timeline/signals.py:65 msgid "Check the history API for the exact diff" msgstr "Controlla le API della storie per la differenza esatta" @@ -4099,54 +4350,54 @@ msgstr "" msgid "Important dates" msgstr "Date importanti" -#: taiga/users/api.py:123 +#: taiga/users/api.py:132 msgid "Duplicated email" msgstr "E-mail duplicata" -#: taiga/users/api.py:125 +#: taiga/users/api.py:134 msgid "Not valid email" msgstr "E-mail non valida" -#: taiga/users/api.py:165 +#: taiga/users/api.py:172 msgid "Invalid username or email" msgstr "Username o e-mail non validi" -#: taiga/users/api.py:174 +#: taiga/users/api.py:181 msgid "Mail sended successful!" msgstr "Mail inviata con successo!" -#: taiga/users/api.py:212 +#: taiga/users/api.py:219 msgid "Current password parameter needed" msgstr "E' necessario il parametro della password corrente" -#: taiga/users/api.py:215 +#: taiga/users/api.py:222 msgid "New password parameter needed" msgstr "E' necessario il parametro della nuovo password" -#: taiga/users/api.py:218 +#: taiga/users/api.py:225 msgid "Invalid password length at least 6 charaters needed" msgstr "Lunghezza della password non valida, sono necessari almeno 6 caratteri" -#: taiga/users/api.py:221 +#: taiga/users/api.py:228 msgid "Invalid current password" msgstr "Password corrente non valida" -#: taiga/users/api.py:268 taiga/users/api.py:274 +#: taiga/users/api.py:275 taiga/users/api.py:281 msgid "" "Invalid, are you sure the token is correct and you didn't use it before?" msgstr "" "Non valido. Sei sicuro che il token sia corretto e che tu non l'abbia già " "usato in precedenza?" -#: taiga/users/api.py:301 taiga/users/api.py:309 taiga/users/api.py:312 +#: taiga/users/api.py:317 taiga/users/api.py:325 taiga/users/api.py:328 msgid "Invalid, are you sure the token is correct?" msgstr "Non valido. Sicuro che il token sia corretto?" -#: taiga/users/models.py:95 +#: taiga/users/models.py:97 msgid "superuser status" msgstr "Stato del super-utente" -#: taiga/users/models.py:96 +#: taiga/users/models.py:98 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -4154,26 +4405,26 @@ msgstr "" "Definisce che questo utente ha tutti i permessi senza assegnarglieli " "esplicitamente." -#: taiga/users/models.py:126 +#: taiga/users/models.py:128 msgid "username" msgstr "nome utente" -#: taiga/users/models.py:127 +#: taiga/users/models.py:129 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "" "Richiede 30 caratteri o meno. Deve comprendere: lettere, numeri e caratteri " "come /./-/_" -#: taiga/users/models.py:130 +#: taiga/users/models.py:132 msgid "Enter a valid username." msgstr "Inserisci un nome utente valido." -#: taiga/users/models.py:133 +#: taiga/users/models.py:135 msgid "active" msgstr "attivo" -#: taiga/users/models.py:134 +#: taiga/users/models.py:136 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -4181,59 +4432,59 @@ msgstr "" "Definisce se questo utente debba essere trattato come attivo. Deseleziona " "questo invece di eliminare gli account." -#: taiga/users/models.py:140 +#: taiga/users/models.py:142 msgid "biography" msgstr "biografia" -#: taiga/users/models.py:143 +#: taiga/users/models.py:145 msgid "photo" msgstr "fotografia" -#: taiga/users/models.py:144 +#: taiga/users/models.py:146 msgid "date joined" msgstr "data di inizio partecipazione" -#: taiga/users/models.py:146 +#: taiga/users/models.py:148 msgid "default language" msgstr "lingua predefinita" -#: taiga/users/models.py:148 +#: taiga/users/models.py:150 msgid "default theme" msgstr "tema predefinito" -#: taiga/users/models.py:150 +#: taiga/users/models.py:152 msgid "default timezone" msgstr "timezone predefinita" -#: taiga/users/models.py:152 +#: taiga/users/models.py:154 msgid "colorize tags" msgstr "colora i tag" -#: taiga/users/models.py:157 +#: taiga/users/models.py:159 msgid "email token" msgstr "token e-mail" -#: taiga/users/models.py:159 +#: taiga/users/models.py:161 msgid "new email address" msgstr "nuovo indirizzo e-mail" -#: taiga/users/models.py:166 +#: taiga/users/models.py:168 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:169 +#: taiga/users/models.py:171 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:172 +#: taiga/users/models.py:174 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:176 +#: taiga/users/models.py:178 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:296 +#: taiga/users/models.py:305 msgid "permissions" msgstr "permessi" diff --git a/taiga/locale/ja/LC_MESSAGES/django.po b/taiga/locale/ja/LC_MESSAGES/django.po index 631738b1..9fe24082 100644 --- a/taiga/locale/ja/LC_MESSAGES/django.po +++ b/taiga/locale/ja/LC_MESSAGES/django.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-28 10:29+0200\n" -"PO-Revision-Date: 2016-11-15 15:50+0000\n" -"Last-Translator: Nikita K \n" +"POT-Creation-Date: 2017-01-10 11:50+0100\n" +"PO-Revision-Date: 2017-01-10 10:50+0000\n" +"Last-Translator: Taiga Dev Team \n" "Language-Team: Japanese (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ja/)\n" "MIME-Version: 1.0\n" @@ -24,15 +24,15 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "パブリックなレジスタは無効です。" -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "このレジスタタイプは無効です。" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "このログインタイプは無効です。" @@ -52,17 +52,17 @@ msgstr "存在しないトークンです。" msgid "User is already registered." msgstr "User は既に登録されています." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "このユーザーは既にプロジェクトに追加されています." -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "新しいユーザを作成中にエラーが発生しました。" #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "トークンが間違っています" @@ -83,100 +83,100 @@ msgstr "このフィールドは必須です." msgid "Invalid value." msgstr "値が正しくありません." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "'%s' は True または False である必要があります." -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "英数文字、アンダースコア、ハイフンを含む正しいスラグを入力してください。" -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" "有効な選択肢を選択してください。%(value)sは選択できる選択肢ではありません。" -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "そのメールドメインは許可されていません。" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "正しいメールアドレスを入力してください." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "" "日付のフォーマットが間違っています。このフォーマットを利用してください。%s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "" "日時のフォーマットが間違っています。このフォーマットを利用してください。%s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "" "時刻のフォーマットが間違っています。このフォーマットを利用してください。%s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "整数を入力してください。" -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "値がこの値以下であることを確認してください。%(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "値がこの値以上であることを確認してください。%(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "\"%s\"は小数である必要があります。" -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "数字を入力してください。" -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "桁数が%s以下であることを確認してください。" -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "小数点以下の桁数は%sより少ないことを確認してください。" -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "整数部分の桁数は%s以下であることを確認してください。" -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "ファイルが送信されませんでした. フォームのエンコードを確認して下さい." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "ファイルが送信されませんでした." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "送信されたファイルは空です." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -184,13 +184,13 @@ msgstr "" "ファイル名の文字数は%(max)d以下であることを確認してください。現在は%(length)d" "字です。" -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" "ファイルをサブミットするか、クリアチェックボックスを入れるか、どちらかだけし" "てください。" -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -199,25 +199,25 @@ msgstr "" "か破損しています。" #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "ブロックされた要素" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "ページは「最後」じゃないか、整数に変換することができません。" -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "このページは無効です。(%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "許可定義は無効です。" @@ -284,7 +284,7 @@ msgstr "見つかりませんでした。" msgid "Permission denied" msgstr "権限がありません。" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "サーバーアプリケーションのエラー" @@ -363,11 +363,11 @@ msgstr "前提条件エラー" msgid "No room left for more projects." msgstr "新しいプロジェクトを作成するスペースがありません。" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "パラメータタイプのフィルターエラー" -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project'は整数である必要があります。" @@ -376,43 +376,43 @@ msgstr "'project'は整数である必要があります。" msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Twitterをフォローする" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "GitHubからコードを入手する" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "Github" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "ホームページに移動" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -885,7 +885,7 @@ msgid "It contain invalid custom fields." msgstr "無効なカスタムフィールドが含まれています。" #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "同じプロジェクト名があります。" @@ -896,13 +896,13 @@ msgstr "認証が必要です。" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "名前" @@ -918,8 +918,8 @@ msgstr "ウェブ" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "説明" @@ -928,36 +928,34 @@ msgstr "説明" msgid "Next url" msgstr "次のURL" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "アプリケーショントークンを暗号化するための秘密鍵" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "ユーザー" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "アプリケーション" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "フルネーム" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "メールアドレス" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "コメント" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -1030,9 +1028,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "ペイロードは有効なjsonではありません。" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "プロジェクトは存在していません。" @@ -1311,83 +1309,83 @@ msgstr "管理者のロール" msgid "Privacity" msgstr "プライバシー" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "モジュール" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "初期値" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "アクティビティ" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "ファン" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "オーナー" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "{count} 公開に成功しました。" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "公開にする" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "{count} プライベートにするのに成功しました。" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "プライベートにする" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "選択中の%(verbose_name_plural)sらを削除する" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "引数は不足している" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "画像形式が正しくありません" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "無効なテンプレート名" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "無効なテンプレートの説明文" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "無効なユーザーID" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "このユーザーは存在しません。" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "ユーザーはプロジェクトのメンバーである必要がある" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1395,7 +1393,7 @@ msgstr "" "プロジェクトにオーナーと、1人以上のアクティブな管理者であるユーザーが必要で" "す。" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "閲覧する権限がありません。" @@ -1411,18 +1409,18 @@ msgstr "オブジェクトIDのイッシューは存在しません。" msgid "Project ID not matches between object and project" msgstr "" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "プロジェクト" @@ -1437,8 +1435,8 @@ msgstr "オブジェクトID" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1458,12 +1456,12 @@ msgstr "は廃止予定である" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "並べ替え" @@ -1499,19 +1497,71 @@ msgstr "このプロジェクトはオーナーの辞退によりブロックさ msgid "This project is blocked while it's deleted" msgstr "このプロジェクトは削除中のためブロックされています。" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/nb/)\n" @@ -19,15 +19,15 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "Offentlig register er deaktivert." -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "ugyldig registertype" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "ugyldig påloggingstype" @@ -47,17 +47,17 @@ msgstr "Poletten samvsarer ikke med noen gyldig invitasjon." msgid "User is already registered." msgstr "Brukeren er allerede registrert." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "Denne brukeren er allerede et medlem i prosjektet." -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Feil ved å lage ny bruker." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Ugyldig polett" @@ -78,110 +78,110 @@ msgstr "Dette feltet er obligatorisk." msgid "Invalid value." msgstr "Ugyldig verdi." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "'%s' verdi må være enten 'True' eller 'False'" -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Skriv inn en gyldig 'slug' bestående av bokstaver, tall, understreker eller " "bindestreker. " -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "Gjør et gyldig valg. %(value)s er ikke et av de tilgjengelige valgene." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Skriv inn en gyldig epostadresse." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "Datoen har feil format. Bruk en av disse formatene istedet: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "Datotid har feil format. Bruk en av disse formatene istedet: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "Tid har feil format. Bruk en av disse formatene istedet: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Skriv inn et heltall." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Sikre at denne verdien er mindre enn eller lik %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Sikre at denne verdien er større enn eller lik %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "\"%s\" verdi må være et desimaltall." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Skriv inn et nummer." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Pass på at det ikke er flere enn %s sifre totalt." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Pass på at det ikke er flere enn %s desimaler." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Pass på at det ikke er flere enn %s siffer før komma." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "Ingen fil ble sendt. Kontroller kodingstypen på skjemaet." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Ingen fil ble sendt." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "Den sendte filen er tom." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." msgstr "" "Sikre at dette filnavnet har på det meste %(max)d tegn (det har %(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" "Vennligst enten send inn en fil eller sjekk den klare sjekkboksen, ikke " "begge deler." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -190,26 +190,26 @@ msgstr "" "et ødelagt bilde." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Blokkert element" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" "Siden er ikke 'sist', og den kan heller ikke konverteres til en integer." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Ugyldig side (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Ugyldig tilgangsdefinisjon." @@ -274,7 +274,7 @@ msgstr "Ikke funnet" msgid "Permission denied" msgstr "Tilgang nektet" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Server programfeil" @@ -353,11 +353,11 @@ msgstr "Forutsetningsfeil" msgid "No room left for more projects." msgstr "Ingen plass igjen til nye prosjekter." -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Feil i filterparameter typer" -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project' må være et heltall" @@ -366,43 +366,43 @@ msgstr "'project' må være et heltall" msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Følg oss på Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Skaff koden på GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Besøk vår webside" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -754,7 +754,7 @@ msgid "It contain invalid custom fields." msgstr "Den inneholder ugyldige egendefinerte feilter" #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Navnet er duplisert for prosjektet" @@ -765,13 +765,13 @@ msgstr "Autentisering kreves" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "navn" @@ -787,8 +787,8 @@ msgstr "web" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "beskrivelse" @@ -797,36 +797,34 @@ msgstr "beskrivelse" msgid "Next url" msgstr "Neste url" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "bruker" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "applikasjon" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "fullt navn" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "epostadresse" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "kommentar" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -898,9 +896,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "Payloaden er ikke gyldig json" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "Prosjektet eksisterer ikke" @@ -1156,83 +1154,83 @@ msgstr "Admin roller" msgid "Privacity" msgstr "" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "eier" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Ufullstendige argumenter" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Ugyldig bildeformat" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Ikke et gyldig malnavn" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Ikke en gyldig malbeskrivelse" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "Ugyldig brukerid" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "Brukeren eksisterer ikke" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "Brukeren må allerede være et medlem i et prosjekt" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1240,7 +1238,7 @@ msgstr "" "Prosjektet må ha en eier og minst en av brukerne må være en aktiv " "administrator" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "Du har ikke tillatelser til å se det." @@ -1256,18 +1254,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "Prosjekt ID matcher ikke mellom objekt og prosjekt" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "prosjekt" @@ -1282,8 +1280,8 @@ msgstr "objektid" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1303,12 +1301,12 @@ msgstr "er foreldet" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "rekkefølge" @@ -1344,19 +1342,71 @@ msgstr "Dette prosjektet er blokkert fordi eieren stakk" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings\n" "Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/nl/)\n" @@ -20,15 +20,15 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "Publieke registratie is uitgeschakeld." -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "ongeldig registratie type" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "ongeldig login type" @@ -48,17 +48,17 @@ msgstr "Token stemt niet overeen met een geldige uitnodiging." msgid "User is already registered." msgstr "Gebruiker is al geregistreerd." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "" -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Fout bij het aanmaken van een nieuwe gebruiker." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Ongeldig token" @@ -79,104 +79,104 @@ msgstr "Dit veld is verplicht." msgid "Invalid value." msgstr "Ongeldige waarde." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "'%s' waarde moet True of False zijn." -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Geef een geldige 'slug' in bestaande uit letters, nummers, underscores of " "koppeltekens." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" "Selecteer een geldige keuze. %(value)s is niet één van de aanwezige " "keuzemogelijkheden." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Voeg een geldig e-mail adres toe." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "" "Datum heeft het verkeerde formaat. Gebruik één van de volgende formaten: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "" "Datum en tijd heeft het verkeerde formaat. Gebruik één van de volgende " "formaten: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "" "Tijd heeft een verkeerd formaat. Gebruik één van de volgende formaten: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Geef een geheel getal in." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Zorg ervoor dat deze waarde minder of gelijk is aan %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Zorg ervoor dat deze waarde groter of gelijk is aan %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "\"%s\" waarde dient een float te zijn." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Geef een getal in." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Zorg ervoor dat er niet meer dan %s nummers in totaal zijn." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Zorg ervoor dat er niet meer dan %s plaatsen na de comma zijn." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Zorg ervoor dat er niet meer dan %s nummers voor de comma staan." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "" "Er was geen bestand aangegeven. Bekijken het type encoding in het formulier." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Er was geen bestand aangegeven." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "Het gegeven bestand is leeg." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -184,13 +184,13 @@ msgstr "" "Zorg ervoor dat deze bestandsnaam maximaal %(max)d tekens lang is (de naam " "heeft %(length)d tekens)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" "Gelieve ofwel een bestand mee te geven ofwel de checkbox aan te tikken, niet " "beide." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -199,25 +199,25 @@ msgstr "" "een afbeelding ofwel een corrupte afbeelding." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Pagina is niet 'last', noch kan het omgezet worden naar een int." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Ongeldige pagina (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Ongeldige definitie van permissie." @@ -282,7 +282,7 @@ msgstr "Niet gevonden" msgid "Permission denied" msgstr "Toestemming geweigerd" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Server applicatie fout" @@ -361,11 +361,11 @@ msgstr "Preconditie fout" msgid "No room left for more projects." msgstr "" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Fout in filter params types." -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project' moet een integer waarde zijn." @@ -374,43 +374,43 @@ msgstr "'project' moet een integer waarde zijn." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Volg ons op Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Haal de code op GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Bezoek onze website" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -784,7 +784,7 @@ msgid "It contain invalid custom fields." msgstr "Het bevat ongeldige eigen velden:" #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Naam gedupliceerd voor het project" @@ -795,13 +795,13 @@ msgstr "" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "naam" @@ -817,8 +817,8 @@ msgstr "" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "omschrijving" @@ -827,36 +827,34 @@ msgstr "omschrijving" msgid "Next url" msgstr "" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "volledige naam" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "e-mail adres" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "commentaar" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -928,9 +926,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "De payload is geen geldige json" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "Het project bestaat niet" @@ -1186,89 +1184,89 @@ msgstr "Admin rollen" msgid "Privacity" msgstr "" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "eigenaar" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Onvolledige argumenten" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Ongeldig afbeelding formaat" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Ongeldige template naam" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Ongeldige template omschrijving" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "Je hebt geen toestamming om dat te bekijken." @@ -1284,18 +1282,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "Project ID van object is niet gelijk aan die van het project" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "project" @@ -1310,8 +1308,8 @@ msgstr "object id" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1331,12 +1329,12 @@ msgstr "is verouderd" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "volgorde" @@ -1372,19 +1370,71 @@ msgstr "" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 -msgid "Text" +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings\n" "Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/pl/)\n" @@ -22,15 +22,15 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "Publiczna rejestracja jest wyłączona" -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "Nieprawidłowy typ rejestracji" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "Nieprawidłowy typ logowania" @@ -50,17 +50,17 @@ msgstr "Token nie zgadza się z żadnym zaproszeniem" msgid "User is already registered." msgstr "Użytkownik już zarejestrowany" -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "" -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Błąd przy tworzeniu użytkownika." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Nieprawidłowy token" @@ -81,98 +81,98 @@ msgstr "To pole jest wymagane." msgid "Invalid value." msgstr "Nieprawidłowa wartość." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "'%s' wartość musi przyjąć True albo False," -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Podaj prawidłowy 'slug' zawierający litery, cyfry, podkreślenia lub myślniki." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" "Dokonał właściwego wyboru. Wartość %(value)s nie jest jedną z dostępnych " "opcji." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Podaj właściwy adres email." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "Zły format. Użyj jednego z tych formatów: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "Zły format. Użyj jednego z tych formatów: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "Zły format. Użyj jednego z tych formatów: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Wpisz cały numer" -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Upewnij się, że wartość jest mniejsza lub równa od %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Upewnij się, że wartość jest większa lub równa od %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "\"%s\" wartość musi być zmiennoprzecinkowa." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Wpisz numer." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Upewnij się że nie podałeś więcej niż %s znaków." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Upewnij się, że nie ma więcej niż %s miejsc po przecinku." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Upewnij się, że nie ma więcej niż %s cyfr przed przecinkiem." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "Plik nie został wysłany. Sprawdź kodowanie znaków w formularzu." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Plik nie został wysłany." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "Wysłany plik jest pusty." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -180,11 +180,11 @@ msgstr "" "Upewnij się, że nazwa pliku ma maksymalnie %(max)d znaków.(Ilość znaków to: " "%(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Proszę wybrać jedną z opcji, nie obie." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -193,25 +193,25 @@ msgstr "" "jest uszkodzony." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Strona nie jest ostatnią i nie może zostać zmieniona na int." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Niewłaściwa strona (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Nieprawidłowa definicja uprawnień." @@ -277,7 +277,7 @@ msgstr "Nie znaleziono" msgid "Permission denied" msgstr "Dostęp zabroniony" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Błąd aplikacji serwera" @@ -356,11 +356,11 @@ msgstr "Błąd warunków wstępnych" msgid "No room left for more projects." msgstr "" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Błąd w parametrach typów filtrów." -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project' musi być wartością typu int." @@ -369,43 +369,43 @@ msgstr "'project' musi być wartością typu int." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Obserwuj nas na Twitterze" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Pobierz kog z GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Odwiedź naszą stronę www" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -852,7 +852,7 @@ msgid "It contain invalid custom fields." msgstr "Zawiera niewłaściwe pola niestandardowe." #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Nazwa projektu zduplikowana" @@ -863,13 +863,13 @@ msgstr "" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "nazwa" @@ -885,8 +885,8 @@ msgstr "web" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "opis" @@ -895,36 +895,34 @@ msgstr "opis" msgid "Next url" msgstr "Następny url" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "użytkownik" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "aplikacja" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "Imię i Nazwisko" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "adres e-mail" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "komentarz" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -996,9 +994,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "Źródło nie jest prawidłowym plikiem json" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "Projekt nie istnieje" @@ -1254,89 +1252,89 @@ msgstr "Administruj rolami" msgid "Privacity" msgstr "" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "właściciel" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Pola niekompletne" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Niepoprawny format obrazka" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Nieprawidłowa nazwa szablonu" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Nieprawidłowy opis szablonu" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "Nie masz uprawnień by to zobaczyć." @@ -1352,18 +1350,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "ID nie pasuje pomiędzy obiektem a projektem" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "projekt" @@ -1378,8 +1376,8 @@ msgstr "id obiektu" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1399,12 +1397,12 @@ msgstr "jest przestarzałe" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "kolejność" @@ -1440,19 +1438,71 @@ msgstr "" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings6 znaków" -#: taiga/users/api.py:221 +#: taiga/users/api.py:228 msgid "Invalid current password" msgstr "Podałeś nieprawidłowe bieżące hasło" -#: taiga/users/api.py:268 taiga/users/api.py:274 +#: taiga/users/api.py:275 taiga/users/api.py:281 msgid "" "Invalid, are you sure the token is correct and you didn't use it before?" msgstr "" "Niepoprawne, jesteś pewien, że token jest poprawny i nie używałeś go " "wcześniej? " -#: taiga/users/api.py:301 taiga/users/api.py:309 taiga/users/api.py:312 +#: taiga/users/api.py:317 taiga/users/api.py:325 taiga/users/api.py:328 msgid "Invalid, are you sure the token is correct?" msgstr "Niepoprawne, jesteś pewien, że token jest poprawny?" -#: taiga/users/models.py:95 +#: taiga/users/models.py:97 msgid "superuser status" msgstr "status SUPERUSER" -#: taiga/users/models.py:96 +#: taiga/users/models.py:98 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -3932,24 +4010,24 @@ msgstr "" "Oznacza, że ten użytkownik posiada wszystkie uprawnienia bez konieczności " "ich przydzielania." -#: taiga/users/models.py:126 +#: taiga/users/models.py:128 msgid "username" msgstr "nazwa użytkownika" -#: taiga/users/models.py:127 +#: taiga/users/models.py:129 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "Wymagane. 30 znaków. Liter, cyfr i znaków /./-/_" -#: taiga/users/models.py:130 +#: taiga/users/models.py:132 msgid "Enter a valid username." msgstr "Wprowadź poprawną nazwę użytkownika" -#: taiga/users/models.py:133 +#: taiga/users/models.py:135 msgid "active" msgstr "aktywny" -#: taiga/users/models.py:134 +#: taiga/users/models.py:136 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -3957,59 +4035,59 @@ msgstr "" "Oznacza, że ten użytkownik ma być traktowany jako aktywny. Możesz to " "odznaczyć zamiast usuwać konto." -#: taiga/users/models.py:140 +#: taiga/users/models.py:142 msgid "biography" msgstr "biografia" -#: taiga/users/models.py:143 +#: taiga/users/models.py:145 msgid "photo" msgstr "zdjęcie" -#: taiga/users/models.py:144 +#: taiga/users/models.py:146 msgid "date joined" msgstr "data dołączenia" -#: taiga/users/models.py:146 +#: taiga/users/models.py:148 msgid "default language" msgstr "domyślny język Taiga" -#: taiga/users/models.py:148 +#: taiga/users/models.py:150 msgid "default theme" msgstr "domyślny szablon Taiga" -#: taiga/users/models.py:150 +#: taiga/users/models.py:152 msgid "default timezone" msgstr "domyśla strefa czasowa" -#: taiga/users/models.py:152 +#: taiga/users/models.py:154 msgid "colorize tags" msgstr "kolory tagów" -#: taiga/users/models.py:157 +#: taiga/users/models.py:159 msgid "email token" msgstr "tokem e-mail" -#: taiga/users/models.py:159 +#: taiga/users/models.py:161 msgid "new email address" msgstr "nowy adres e-mail" -#: taiga/users/models.py:166 +#: taiga/users/models.py:168 msgid "max number of owned private projects" msgstr "" -#: taiga/users/models.py:169 +#: taiga/users/models.py:171 msgid "max number of owned public projects" msgstr "" -#: taiga/users/models.py:172 +#: taiga/users/models.py:174 msgid "max number of memberships for each owned private project" msgstr "" -#: taiga/users/models.py:176 +#: taiga/users/models.py:178 msgid "max number of memberships for each owned public project" msgstr "" -#: taiga/users/models.py:296 +#: taiga/users/models.py:305 msgid "permissions" msgstr "uprawnienia" diff --git a/taiga/locale/pt_BR/LC_MESSAGES/django.po b/taiga/locale/pt_BR/LC_MESSAGES/django.po index 6014decf..60c3b157 100644 --- a/taiga/locale/pt_BR/LC_MESSAGES/django.po +++ b/taiga/locale/pt_BR/LC_MESSAGES/django.po @@ -13,6 +13,7 @@ # Lennon Jesus , 2016 # Mairieli Wessel , 2016 # Marlon Carvalho , 2015 +# Michel Wilhelm , 2016 # pedromvm , 2015 # Renato Prado , 2015 # Thiago Almeida , 2016 @@ -22,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-28 10:29+0200\n" -"PO-Revision-Date: 2016-09-20 10:50+0000\n" +"POT-Creation-Date: 2017-01-10 11:50+0100\n" +"PO-Revision-Date: 2017-01-10 10:50+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/pt_BR/)\n" @@ -33,15 +34,15 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "Registro público está desabilitado. " -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "tipo de registro inválido" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "tipo de login inválido" @@ -61,17 +62,17 @@ msgstr "Esse token não bate com nenhum convite." msgid "User is already registered." msgstr "Este usuário já está registrado." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "O usuário já é membro do projeto." -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Erro ao criar um novo usuário." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Token inválido" @@ -92,97 +93,97 @@ msgstr "Este campo é obrigatório." msgid "Invalid value." msgstr "Valor inválido." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "O valor de '%s' deve ser ou True ou False." -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Entre uma 'slug' válida, consistindo de letras, números, underscores ou " "hífens." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "Escolha uma alternativa válida. %(value)s não está disponível." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Preencha com um e-mail válido." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "A data está no formato errado. Use um desses no lugar: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "Formato da data e hora errado. Use um destes: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "Hora com formato errado. Use um destes: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Insira um número inteiro." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Garanta que o valor é menor ou igual a %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Garanta que o valor é maior ou igual a %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "O valor de \"%s\" deve ser decimal (float)." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Insira um número." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Garanta que não há mais que %s dígitos no total." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Garanta que não há mais que %s casas decimais." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Garanta que não há mais que %s dígitos antes do ponto decimal." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "Nenhum arquivo enviado. Verifique o tipo de codificação no formulário." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Nenhum arquivo enviado." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "O arquivo enviado está vazio." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -190,11 +191,11 @@ msgstr "" "Garanta que o nome do arquivo tem no máximo %(max)d caracteres (no momento " "tem %(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Envie um arquivo ou marque o checkbox \"vazio\", não ambos." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -203,25 +204,25 @@ msgstr "" "está corrompido." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Elemento bloqeado" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Página não é \"última\", nem pode ser convertída para um inteiro." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Página inválida (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Definição de permissão inválida." @@ -287,7 +288,7 @@ msgstr "Não encontrado" msgid "Permission denied" msgstr "Permissão negada" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Erro no servidor da aplicação" @@ -366,11 +367,11 @@ msgstr "Erro de pré-condição" msgid "No room left for more projects." msgstr "" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Erro nos tipos de parâmetros do filtro." -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'projeto' deve ser um valor inteiro." @@ -379,43 +380,43 @@ msgstr "'projeto' deve ser um valor inteiro." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Siga-nos no Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Pegue o código no GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Visite o nosso website" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -883,7 +884,7 @@ msgid "It contain invalid custom fields." msgstr "Contém campos personalizados inválidos" #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Nome duplicado para o projeto" @@ -894,13 +895,13 @@ msgstr "Autenticação necessária" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "Nome" @@ -916,8 +917,8 @@ msgstr "web" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "descrição" @@ -926,36 +927,34 @@ msgstr "descrição" msgid "Next url" msgstr "Próxima url" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "chave secreta para cifrar os tokens da aplicação" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "usuário" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "aplicação" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "nome completo" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "endereço de e-mail" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "comentário" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -1027,9 +1026,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "A carga não é um json válido" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "O projeto não existe" @@ -1076,7 +1075,7 @@ msgstr "Informação de problema inválida" #: taiga/hooks/event_hooks.py:149 taiga/hooks/event_hooks.py:171 msgid "unknown user" -msgstr "" +msgstr "usuário desconhecido" #: taiga/hooks/event_hooks.py:156 #, python-brace-format @@ -1207,7 +1206,7 @@ msgstr "Modificar tarefa" #: taiga/permissions/choices.py:56 msgid "Comment task" -msgstr "" +msgstr "Comentar tarefa" #: taiga/permissions/choices.py:57 msgid "Delete task" @@ -1283,85 +1282,85 @@ msgstr "Funções Admin" #: taiga/projects/admin.py:100 msgid "Privacity" -msgstr "" +msgstr "Privacidade" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" -msgstr "" +msgstr "Módulos" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" -msgstr "" +msgstr "Valores padrão" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" -msgstr "" +msgstr "Atividades" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" -msgstr "" +msgstr "Fãs" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "dono" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Argumentos incompletos" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Formato de imagem inválida" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Nome de template inválido" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Descrição de template inválida" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "Id de usuário inválido" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "O usuário não existe" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "O usuário deve ser um membro do projeto" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1369,7 +1368,7 @@ msgstr "" "O projeto deve ter um dono e pelo menos um dos usuários precisa ser um " "administrador ativo" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "Você não tem permissão para ver isso" @@ -1385,18 +1384,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "ID do projeto não combina entre objeto e projeto" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "projeto" @@ -1411,8 +1410,8 @@ msgstr "identidade de objeto" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1432,12 +1431,12 @@ msgstr "está obsoleto" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "ordem" @@ -1473,19 +1472,71 @@ msgstr "Este projeto está bloqueado porque o proprietário deixou o projeto" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings, 2016 # ilyar, 2016 # ivan tkachenko , 2016 +# Sergey Kustov , 2016 # Марат , 2015 +# Никита Евстропов , 2016 msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-28 10:29+0200\n" -"PO-Revision-Date: 2016-09-20 10:50+0000\n" +"POT-Creation-Date: 2017-01-10 11:50+0100\n" +"PO-Revision-Date: 2017-01-10 10:50+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ru/)\n" @@ -29,15 +31,15 @@ msgstr "" "%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" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "Публичная регистрация отключена." -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "неправильный тип регистрации" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "неправильный тип логина" @@ -57,17 +59,17 @@ msgstr "Токен не подходит ни под одно корректно msgid "User is already registered." msgstr "Пользователь уже зарегистрирован." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "Этот пользователь уже является участником данного проекта" -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Ошибка при создании нового пользователя." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Неверный токен" @@ -88,102 +90,102 @@ msgstr "Это поле обязательно." msgid "Invalid value." msgstr "Неправильное значение." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "значение '%s' должно быть True - верно - или False - ложно." -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Введите корректное 'ссылочное имя' состоящее из букв, чисел, подчёркиваний и " "дефисов." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" "Выберите правильное значение. %(value)s не является одним из доступных " "значений." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Введите правильный адрес email." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "Дата имеет неверный формат. Воспользуйтесь одним из этих форматов: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "" "Дата и время имеют неправильный формат. Воспользуйтесь одним из этих " "форматов: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "" "Время имеет неправильный формат. Воспользуйтесь одним из этих форматов: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Введите целое число." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Убедитесь, что это значение меньше или равно %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Убедитесь, что это значение больше или равно %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "\"%s\" значение должно быть числом с плавающей точкой." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Введите число." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Убедитесь, что здесь всего не больше %s цифр." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Убедитесь, что здесь не больше %s цифр после точкой." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Убедитесь, что здесь не больше %s цифр перед точкой." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "Файл не был отправлен. Проверьте тип кодировки на форме." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Файл не был отправлен." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "Отправленный файл пуст." -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -191,11 +193,11 @@ msgstr "" "Убедитесь, что имя этого файла имеет не больше %(max)d букв (сейчас - " "%(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Пожалуйста, или отправьте файл, или снимите флажок." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -204,25 +206,25 @@ msgstr "" "изображение, либо не корректное изображение." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Заблокированный элемент" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Страница не является 'последней' и не может быть приведена к int." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Неправильная страница (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Неправильное определение разрешения" @@ -287,7 +289,7 @@ msgstr "Не найдено" msgid "Permission denied" msgstr "Доступ запрещён" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Ошибка приложения на сервере" @@ -366,11 +368,11 @@ msgstr "Ошибка предусловия" msgid "No room left for more projects." msgstr "Не осталось места для проектов" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Ошибка в типах фильтров для параметров." -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project' должно быть целым значением." @@ -379,43 +381,43 @@ msgstr "'project' должно быть целым значением." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Следите за нами в Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Скачайте код на GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Посетите наш вебсайт" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -549,7 +551,7 @@ msgstr "ошибка импорта историй от пользователе #: taiga/export_import/services/store.py:790 msgid "error importing epics" -msgstr "" +msgstr "ошибка импорта эпосов" #: taiga/export_import/services/store.py:794 msgid "error importing tasks" @@ -874,7 +876,7 @@ msgid "It contain invalid custom fields." msgstr "Содержит неверные специальные поля" #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Уже есть такое имя для проекта" @@ -885,13 +887,13 @@ msgstr "Необходима аутентификация" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "имя" @@ -907,8 +909,8 @@ msgstr "веб" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "описание" @@ -917,36 +919,34 @@ msgstr "описание" msgid "Next url" msgstr "Следующий url" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "секретный ключ для шифрования токенов приложения" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "пользователь" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "приложение" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "полное имя" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "адрес email" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "комментарий" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -1018,9 +1018,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "Нагрузочный файл не является правильным json-файлом" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "Проект не существует" @@ -1044,6 +1044,9 @@ msgid "" "\n" "> {comment_message}" msgstr "" +"Комментарий из {platform}:\n" +"\n" +"> {comment_message}" #: taiga/hooks/event_hooks.py:84 msgid "Invalid issue comment information" @@ -1059,7 +1062,7 @@ msgstr "" #: taiga/hooks/event_hooks.py:107 #, python-brace-format msgid "Issue created from {platform}." -msgstr "" +msgstr "Запрос создан из {platform}." #: taiga/hooks/event_hooks.py:120 msgid "Invalid issue information" @@ -1067,7 +1070,7 @@ msgstr "Неверная информация о запросе" #: taiga/hooks/event_hooks.py:149 taiga/hooks/event_hooks.py:171 msgid "unknown user" -msgstr "" +msgstr "неизвестный пользователь" #: taiga/hooks/event_hooks.py:156 #, python-brace-format @@ -1118,7 +1121,7 @@ msgstr "Просмотреть вехи" #: taiga/permissions/choices.py:25 taiga/permissions/choices.py:41 msgid "View epic" -msgstr "" +msgstr "Посмотреть эпосы" #: taiga/permissions/choices.py:26 msgid "View user stories" @@ -1154,19 +1157,19 @@ msgstr "Удалить веху" #: taiga/permissions/choices.py:42 msgid "Add epic" -msgstr "" +msgstr "Добавить эпос" #: taiga/permissions/choices.py:43 msgid "Modify epic" -msgstr "" +msgstr "Изменить эпос" #: taiga/permissions/choices.py:44 msgid "Comment epic" -msgstr "" +msgstr "Комментировать эпос" #: taiga/permissions/choices.py:45 msgid "Delete epic" -msgstr "" +msgstr "Удалить эпос" #: taiga/permissions/choices.py:47 msgid "View user story" @@ -1182,7 +1185,7 @@ msgstr "Изменить пользовательскую историю" #: taiga/permissions/choices.py:50 msgid "Comment user story" -msgstr "" +msgstr "Комментировать пользовательскую историю" #: taiga/permissions/choices.py:51 msgid "Delete user story" @@ -1198,7 +1201,7 @@ msgstr "Изменить задачу" #: taiga/permissions/choices.py:56 msgid "Comment task" -msgstr "" +msgstr "Комментировать задачу" #: taiga/permissions/choices.py:57 msgid "Delete task" @@ -1214,7 +1217,7 @@ msgstr "Изменить запрос" #: taiga/permissions/choices.py:62 msgid "Comment issue" -msgstr "" +msgstr "Комментировать запрос" #: taiga/permissions/choices.py:63 msgid "Delete issue" @@ -1230,7 +1233,7 @@ msgstr "Изменить wiki-страницу" #: taiga/permissions/choices.py:68 msgid "Comment wiki page" -msgstr "" +msgstr "Комментировать wiki-страницу" #: taiga/permissions/choices.py:69 msgid "Delete wiki page" @@ -1274,85 +1277,85 @@ msgstr "Управлять ролями" #: taiga/projects/admin.py:100 msgid "Privacity" -msgstr "" +msgstr "Приватность" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" -msgstr "" +msgstr "Модули" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" -msgstr "" +msgstr "Значения по-умолчанию" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" -msgstr "" +msgstr "Активность" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "владелец" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." -msgstr "" +msgstr "{count} успешно переведено в статус публичных." -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" -msgstr "" +msgstr "Сделать публичным" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." -msgstr "" +msgstr "{count} успешно переведено в статус приватных." -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" -msgstr "" +msgstr "Сделать приватным" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" -msgstr "" +msgstr "Удалить выбранные %(verbose_name_plural)s" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Список аргументов неполон" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Неправильный формат изображения" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Неверное название шаблона" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Неверное описание шаблона" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "Неправильный id пользователя" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "Пользователь не существует" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "Пользователь должен быть участником проекта" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" @@ -1360,7 +1363,7 @@ msgstr "" "У проекта должен быть владелец и по крайней мере один пользователь должен " "быть активным администратором" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "У вас нет разрешения на просмотр." @@ -1376,18 +1379,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "Идентификатор проекта не подходит к этому объекту" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "проект" @@ -1402,8 +1405,8 @@ msgstr "идентификатор объекта" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1423,12 +1426,12 @@ msgstr "устаревшее" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "порядок" @@ -1458,25 +1461,77 @@ msgstr "Проект заблокирован администраторами" #: taiga/projects/choices.py:37 msgid "This project is blocked because the owner left" -msgstr "Проект заблокирован, потому-что владелец ушёл" +msgstr "Проект заблокирован, потому что владелец ушёл" #: taiga/projects/choices.py:38 msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settingsThe Taiga Team

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

    Эпос удалён

    Здравствуйте, %(user)s,
    %(changer)s удалил эпос " +"для %(project)s

    Эпос #%(ref)s %(subject)s

    The Taiga " +"Team

    " #: taiga/projects/notifications/templates/emails/epics/epic-delete-body-text.jinja:1 #, python-format @@ -2166,6 +2253,8 @@ msgid "" "\n" "[%(project)s] Deleted the epic #%(ref)s \"%(subject)s\"\n" msgstr "" +"\n" +"[%(project)s] Удален эпос #%(ref)s \"%(subject)s\"\n" #: taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja:4 #, python-format @@ -2911,36 +3000,40 @@ msgid "" msgstr "" "Вы не можете покинуть проект, если вы владелец или нет других администраторов" -#: taiga/projects/services/members.py:118 +#: taiga/projects/services/members.py:133 msgid "Project without owner" -msgstr "" +msgstr "Проект без владельца" -#: taiga/projects/services/members.py:123 +#: taiga/projects/services/members.py:138 msgid "You have reached your current limit of memberships for private projects" msgstr "Вы достигли лимита участников для частного проекта" -#: taiga/projects/services/members.py:127 +#: taiga/projects/services/members.py:142 msgid "You have reached your current limit of memberships for public projects" msgstr "Вы достигли лимита участников для публичного проекта" -#: taiga/projects/services/projects.py:94 -#: taiga/projects/services/projects.py:134 taiga/users/services.py:589 +#: taiga/projects/services/members.py:148 +msgid "You have reached the current limit of pending memberships" +msgstr "" + +#: taiga/projects/services/projects.py:101 +#: taiga/projects/services/projects.py:141 taiga/users/services.py:589 msgid "You can't have more private projects" msgstr "Вы не можете иметь больше частных проектов" -#: taiga/projects/services/projects.py:98 -#: taiga/projects/services/projects.py:138 taiga/users/services.py:592 +#: taiga/projects/services/projects.py:105 +#: taiga/projects/services/projects.py:145 taiga/users/services.py:592 msgid "" "This project reaches your current limit of memberships for private projects" msgstr "В этом частном проекте достигнут лимит участников" -#: taiga/projects/services/projects.py:102 -#: taiga/projects/services/projects.py:142 taiga/users/services.py:596 +#: taiga/projects/services/projects.py:109 +#: taiga/projects/services/projects.py:149 taiga/users/services.py:596 msgid "You can't have more public projects" msgstr "Вы не можете иметь больше публичных проектов" -#: taiga/projects/services/projects.py:106 -#: taiga/projects/services/projects.py:146 taiga/users/services.py:599 +#: taiga/projects/services/projects.py:113 +#: taiga/projects/services/projects.py:153 taiga/users/services.py:599 msgid "" "This project reaches your current limit of memberships for public projects" msgstr "В этом публичном проекте достигнут лимит участников" @@ -2955,8 +3048,8 @@ msgstr "Окончание проекта" #: taiga/projects/services/transfer.py:62 #: taiga/projects/services/transfer.py:69 -#: taiga/projects/services/transfer.py:72 taiga/users/api.py:186 -#: taiga/users/api.py:191 +#: taiga/projects/services/transfer.py:72 taiga/users/api.py:193 +#: taiga/users/api.py:198 msgid "Token is invalid" msgstr "Неверный токен" @@ -2968,6 +3061,8 @@ msgstr "Срок действия токена истёк" #, python-brace-format msgid "Invalid tag '{value}'. The color is not a valid HEX color or null." msgstr "" +"Неверный тэг '{value}'. Цвет должен быть в шестнадцатеричном формате или " +"отсутствовать." #: taiga/projects/tagging/fields.py:55 #, python-brace-format @@ -2975,11 +3070,13 @@ msgid "" "Invalid tag '{value}'. it must be the name or a pair '[\"name\", \"hex color/" "\" | null]'." msgstr "" +"Неверный тэг '{value}'. Это должно быть имя или пара '[\"name\", \"hex color/" +"\" | null]'." #: taiga/projects/tagging/fields.py:77 #, python-brace-format msgid "Invalid tag '{value}'. It must be the tag name." -msgstr "" +msgstr "Неверный тэг '{value}'. Это должно быть имя тэга." #: taiga/projects/tagging/models.py:27 msgid "tags" @@ -2992,30 +3089,30 @@ msgstr "цвета тэгов" #: taiga/projects/tagging/validators.py:47 #: taiga/projects/tagging/validators.py:74 msgid "This tag already exists." -msgstr "" +msgstr "Такой тэг уже существует." #: taiga/projects/tagging/validators.py:54 #: taiga/projects/tagging/validators.py:81 msgid "The color is not a valid HEX color." -msgstr "" +msgstr "Этот некорректный шестнадцатеричный формат для цвета" #: taiga/projects/tagging/validators.py:67 #: taiga/projects/tagging/validators.py:101 #: taiga/projects/tagging/validators.py:114 #: taiga/projects/tagging/validators.py:121 msgid "The tag doesn't exist." -msgstr "" +msgstr "Тэг не существует" -#: taiga/projects/tasks/api.py:97 taiga/projects/tasks/api.py:106 +#: taiga/projects/tasks/api.py:98 taiga/projects/tasks/api.py:107 msgid "You don't have permissions to set this sprint to this task." msgstr "У вас нет прав, чтобы назначить этот спринт для этой задачи." -#: taiga/projects/tasks/api.py:100 +#: taiga/projects/tasks/api.py:101 msgid "You don't have permissions to set this user story to this task." msgstr "" "У вас нет прав, чтобы назначить эту историю от пользователя этой задаче." -#: taiga/projects/tasks/api.py:103 +#: taiga/projects/tasks/api.py:104 msgid "You don't have permissions to set this status to this task." msgstr "У вас нет прав, чтобы установить этот статус для этой задачи." @@ -3033,27 +3130,30 @@ msgstr "- иокаин" #: taiga/projects/tasks/validators.py:59 msgid "Invalid milestone id." -msgstr "" +msgstr "Неверный id вехи" #: taiga/projects/tasks/validators.py:70 msgid "Invalid task status id." -msgstr "" +msgstr "Неверный id статуса задачи" #: taiga/projects/tasks/validators.py:83 msgid "Invalid user story id." -msgstr "" +msgstr "Неверный id пользовательской истории" #: taiga/projects/tasks/validators.py:107 msgid "Invalid task status id. The status must belong to the same project." msgstr "" +"Неверный id статуса задачи. Статус должен принадлежать тому же проекту." #: taiga/projects/tasks/validators.py:121 msgid "Invalid user story id. The user story must belong to the same project." msgstr "" +"Неверный id пользовательской истории. Пользовательская история должна " +"принадлежать тому же проекту." #: taiga/projects/tasks/validators.py:133 msgid "Invalid milestone id. The milestone must belong to the same project." -msgstr "" +msgstr "Неверный id вехи. Веха должна принадлежать тому же проекту." #: taiga/projects/tasks/validators.py:150 msgid "" @@ -3762,39 +3862,31 @@ msgstr "Владелец продукта" msgid "Stakeholder" msgstr "Заинтересованная сторона" -#: taiga/projects/userstories/api.py:124 +#: taiga/projects/userstories/api.py:127 msgid "You don't have permissions to set this sprint to this user story." msgstr "" "У вас нет прав чтобы установить спринт для этой пользовательской истории." -#: taiga/projects/userstories/api.py:128 +#: taiga/projects/userstories/api.py:131 msgid "You don't have permissions to set this status to this user story." msgstr "" "У вас нет прав чтобы установить статус для этой пользовательской истории." -#: taiga/projects/userstories/api.py:218 +#: taiga/projects/userstories/api.py:221 #, python-brace-format msgid "Invalid role id '{role_id}'" -msgstr "" +msgstr "Неверный id роли '{role_id}'" -#: taiga/projects/userstories/api.py:225 +#: taiga/projects/userstories/api.py:228 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "" -#: taiga/projects/userstories/api.py:240 +#: taiga/projects/userstories/api.py:243 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "Генерируется пользовательская история #{ref} - {subject}" -#: taiga/projects/userstories/api.py:301 -msgid "ref param is needed" -msgstr "" - -#: taiga/projects/userstories/api.py:304 -msgid "project or project_slug param is needed" -msgstr "" - #: taiga/projects/userstories/models.py:41 msgid "role" msgstr "роль" @@ -3809,7 +3901,7 @@ msgstr "порядок спринтов" #: taiga/projects/userstories/models.py:84 msgid "kanban order" -msgstr "" +msgstr "порядок kanban" #: taiga/projects/userstories/models.py:92 msgid "finish date" @@ -3828,10 +3920,12 @@ msgstr "Не существует пользовательской истори msgid "" "Invalid user story status id. The status must belong to the same project." msgstr "" +"Неверный id статуса пользовательской истории. Статус должен принадлежать " +"тому же проекту." #: taiga/projects/userstories/validators.py:120 msgid "Invalid milestone id. The milistone must belong to the same project." -msgstr "" +msgstr "Неверный id вехи. Веха должна принадлежать тому же проекту." #: taiga/projects/userstories/validators.py:135 msgid "" @@ -3841,71 +3935,75 @@ msgstr "" #: taiga/projects/userstories/validators.py:159 msgid "The milestone isn't valid for the project" -msgstr "" +msgstr "Это недопустимая веха для проекта" #: taiga/projects/userstories/validators.py:169 msgid "All the user stories must be from the same project" -msgstr "" +msgstr "Все пользовательские истории должны быть из того же проекта" -#: taiga/projects/validators.py:61 +#: taiga/projects/validators.py:63 msgid "There's no project with that id" msgstr "Не существует проекта с таким идентификатором" -#: taiga/projects/validators.py:142 -msgid "Email address is already taken" -msgstr "Этот почтовый адрес уже используется" +#: taiga/projects/validators.py:145 +msgid "The user yet exists in the project" +msgstr "" -#: taiga/projects/validators.py:154 +#: taiga/projects/validators.py:155 msgid "Invalid role for the project" msgstr "Неверная роль для этого проекта" -#: taiga/projects/validators.py:165 +#: taiga/projects/validators.py:170 taiga/projects/validators.py:225 +msgid "The user must be a valid contact" +msgstr "" + +#: taiga/projects/validators.py:191 msgid "The project owner must be admin." msgstr "Владелец проекта должен быть администратором" -#: taiga/projects/validators.py:169 +#: taiga/projects/validators.py:195 msgid "At least one user must be an active admin for this project." msgstr "" "По крайней мере один пользователь должен быть администратором для этого " "проекта" -#: taiga/projects/validators.py:201 +#: taiga/projects/validators.py:240 msgid "Invalid role ids. All roles must belong to the same project." -msgstr "" +msgstr "Неверный id роли. Роль должна принадлежать тому же проекту." -#: taiga/projects/validators.py:225 +#: taiga/projects/validators.py:264 msgid "Default options" msgstr "Параметры по умолчанию" -#: taiga/projects/validators.py:226 +#: taiga/projects/validators.py:265 msgid "User story's statuses" msgstr "Статусу пользовательских историй" -#: taiga/projects/validators.py:227 +#: taiga/projects/validators.py:266 msgid "Points" msgstr "Очки" -#: taiga/projects/validators.py:228 +#: taiga/projects/validators.py:267 msgid "Task's statuses" msgstr "Статусы задачи" -#: taiga/projects/validators.py:229 +#: taiga/projects/validators.py:268 msgid "Issue's statuses" msgstr "Статусы запроса" -#: taiga/projects/validators.py:230 +#: taiga/projects/validators.py:269 msgid "Issue's types" msgstr "Типы запроса" -#: taiga/projects/validators.py:231 +#: taiga/projects/validators.py:270 msgid "Priorities" msgstr "Приоритеты" -#: taiga/projects/validators.py:232 +#: taiga/projects/validators.py:271 msgid "Severities" msgstr "Степени важности" -#: taiga/projects/validators.py:233 +#: taiga/projects/validators.py:272 msgid "Roles" msgstr "Роли" @@ -3934,7 +4032,7 @@ msgstr "последний отредактировавший" msgid "href" msgstr "href" -#: taiga/timeline/signals.py:63 +#: taiga/timeline/signals.py:65 msgid "Check the history API for the exact diff" msgstr "Свертесть с историей API для получения изменений" @@ -3974,133 +4072,133 @@ msgstr "Ограничения" msgid "Important dates" msgstr "Важные даты" -#: taiga/users/api.py:123 +#: taiga/users/api.py:132 msgid "Duplicated email" msgstr "Этот email уже используется" -#: taiga/users/api.py:125 +#: taiga/users/api.py:134 msgid "Not valid email" msgstr "Невалидный email" -#: taiga/users/api.py:165 +#: taiga/users/api.py:172 msgid "Invalid username or email" msgstr "Неверное имя пользователя или e-mail" -#: taiga/users/api.py:174 +#: taiga/users/api.py:181 msgid "Mail sended successful!" msgstr "Письмо успешно отправлено!" -#: taiga/users/api.py:212 +#: taiga/users/api.py:219 msgid "Current password parameter needed" msgstr "Поле \"текущий пароль\" является обязательным" -#: taiga/users/api.py:215 +#: taiga/users/api.py:222 msgid "New password parameter needed" msgstr "Поле \"новый пароль\" является обязательным" -#: taiga/users/api.py:218 +#: taiga/users/api.py:225 msgid "Invalid password length at least 6 charaters needed" msgstr "Неверная длина пароля, требуется как минимум 6 символов" -#: taiga/users/api.py:221 +#: taiga/users/api.py:228 msgid "Invalid current password" msgstr "Неверно указан текущий пароль" -#: taiga/users/api.py:268 taiga/users/api.py:274 +#: taiga/users/api.py:275 taiga/users/api.py:281 msgid "" "Invalid, are you sure the token is correct and you didn't use it before?" msgstr "Неверно, вы уверены что токен правильный и не использовался ранее?" -#: taiga/users/api.py:301 taiga/users/api.py:309 taiga/users/api.py:312 +#: taiga/users/api.py:317 taiga/users/api.py:325 taiga/users/api.py:328 msgid "Invalid, are you sure the token is correct?" msgstr "Неверно, вы уверены что токен правильный?" -#: taiga/users/models.py:95 +#: taiga/users/models.py:97 msgid "superuser status" msgstr "статус суперпользователя" -#: taiga/users/models.py:96 +#: taiga/users/models.py:98 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "Выбранный пользователь имеет все разрешения, ему не чего назначит." -#: taiga/users/models.py:126 +#: taiga/users/models.py:128 msgid "username" msgstr "имя пользователя" -#: taiga/users/models.py:127 +#: taiga/users/models.py:129 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "Обязательно. 30 символов или меньше. Буквы, числа и символы /./-/_" -#: taiga/users/models.py:130 +#: taiga/users/models.py:132 msgid "Enter a valid username." msgstr "Введите корректное имя пользователя." -#: taiga/users/models.py:133 +#: taiga/users/models.py:135 msgid "active" msgstr "активный" -#: taiga/users/models.py:134 +#: taiga/users/models.py:136 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "Выбранный пользователь активен. Отменить выбор для удаления аккаунта." -#: taiga/users/models.py:140 +#: taiga/users/models.py:142 msgid "biography" msgstr "биография" -#: taiga/users/models.py:143 +#: taiga/users/models.py:145 msgid "photo" msgstr "фотография" -#: taiga/users/models.py:144 +#: taiga/users/models.py:146 msgid "date joined" msgstr "когда присоединился" -#: taiga/users/models.py:146 +#: taiga/users/models.py:148 msgid "default language" msgstr "язык по умолчанию" -#: taiga/users/models.py:148 +#: taiga/users/models.py:150 msgid "default theme" msgstr "тема по умолчанию" -#: taiga/users/models.py:150 +#: taiga/users/models.py:152 msgid "default timezone" msgstr "временная зона по умолчанию" -#: taiga/users/models.py:152 +#: taiga/users/models.py:154 msgid "colorize tags" msgstr "установить цвета для тэгов" -#: taiga/users/models.py:157 +#: taiga/users/models.py:159 msgid "email token" msgstr "email токен" -#: taiga/users/models.py:159 +#: taiga/users/models.py:161 msgid "new email address" msgstr "новый email адрес" -#: taiga/users/models.py:166 +#: taiga/users/models.py:168 msgid "max number of owned private projects" msgstr "максимальное число частных проектов" -#: taiga/users/models.py:169 +#: taiga/users/models.py:171 msgid "max number of owned public projects" msgstr "максимальное число публичных проектов" -#: taiga/users/models.py:172 +#: taiga/users/models.py:174 msgid "max number of memberships for each owned private project" msgstr "максимальное число участников для каждого частного проекта" -#: taiga/users/models.py:176 +#: taiga/users/models.py:178 msgid "max number of memberships for each owned public project" msgstr "максимальное число участников для каждого публичного проекта" -#: taiga/users/models.py:296 +#: taiga/users/models.py:305 msgid "permissions" msgstr "разрешения" diff --git a/taiga/locale/sv/LC_MESSAGES/django.po b/taiga/locale/sv/LC_MESSAGES/django.po index 09cbdb49..dc8ba37f 100644 --- a/taiga/locale/sv/LC_MESSAGES/django.po +++ b/taiga/locale/sv/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-28 10:29+0200\n" -"PO-Revision-Date: 2016-09-20 10:50+0000\n" +"POT-Creation-Date: 2017-01-10 11:50+0100\n" +"PO-Revision-Date: 2017-01-10 10:50+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Swedish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/sv/)\n" @@ -19,15 +19,15 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "Publikt register är avvaktiverad." -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "Felaktigt registertyp" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "Invalid inloggningstyp" @@ -47,17 +47,17 @@ msgstr "Förekomsten passar inte invitationen. " msgid "User is already registered." msgstr "Användaren finns redan." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "" -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Ett fel uppstod når användaren skapades. " #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Felaktig förekomst. " @@ -78,99 +78,99 @@ msgstr "Fältet är obligatoriskt." msgid "Invalid value." msgstr "Felaktigt värde. " -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "'%s' värdet måste vara sann eller falskt. " -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Skriv in ett giltigt 'slugg' som består av bokstäver, nummer, understreck " "och bindestreck." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "Välj korrekt. %(value)s är inte ett giltigt val. " -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Skriv in en giltig e-postadress" -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "Felaktigt datumformat. Använd ett av dessa formaten istället: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "Tidsdatum har fel format. Bruk ett av dessa formaten istället: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "Felaktigt tidsformat. Bruk ett av dessa formaten istället: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Skriv ett helt nummer." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Försäkra dig om att värdet är mindre eller lika med %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Försäkra dig om att värdet är större eller lika med %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "\"%s\" värde måste vara flyttal." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Skriv in ett nummer." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Försäkra dig om att det inge är mera än %s siffror i totalen. " -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Försäkra dig om att det inte är mera än %s decimaler." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "" "Försäkra dig om det inte är mera än %s siffror till vänster om " "decimalpunkten." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "Inga filer skickades. Check kodningstypen på formularet. " -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Skickade ingen fil. " -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "Den insända filen är tom. " -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -178,12 +178,12 @@ msgstr "" "Försäkra dig om att filnamnet har som mest %(max)d tecken (det har " "%(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" "Vänligen lämna in en fil eller kontrollera kryssrutan för klar, inte båda." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -192,26 +192,26 @@ msgstr "" "eller en skadad bild." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" "Sidan är inte \"sist\", och inte heller kan den omvandlas till ett heltal." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Felaktig sida (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Ogiltigt definition för behörighet." @@ -276,7 +276,7 @@ msgstr "Hittade inte" msgid "Permission denied" msgstr "Du har inte behöriget" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Serverprogramfel." @@ -355,11 +355,11 @@ msgstr "Förutsättningsfel" msgid "No room left for more projects." msgstr "" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Fel i filterparametertyper." -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'Projektet\" måste vara ett heltal." @@ -368,43 +368,43 @@ msgstr "'Projektet\" måste vara ett heltal." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Följ oss på Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "Få koden på GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Besök vår webbplats" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -751,7 +751,7 @@ msgid "It contain invalid custom fields." msgstr "Innehåller felaktigt anpassad fält." #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Namnet är upprepad för projektet" @@ -762,13 +762,13 @@ msgstr "Verifiering krävs" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "namn" @@ -784,8 +784,8 @@ msgstr "Internet" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "beskrivning" @@ -794,36 +794,34 @@ msgstr "beskrivning" msgid "Next url" msgstr "Nästa länk" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "hemlig nyckel för kryptering av programtecken " - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "användare" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "program" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "hela namnet" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "e-postadress" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "kommentera" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -879,9 +877,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "Datasträngen är inte korrekt json" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "Projektet existerar inte" @@ -1137,89 +1135,89 @@ msgstr "Administratorroller" msgid "Privacity" msgstr "" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "ägare" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Felaktiga argument" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Felaktigt bildformat" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Inget giltigt mallnamn" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Inte giltigt mallbeskrivning" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "Du har inte behörighet att se det. " @@ -1235,18 +1233,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "Projekt-ID stämmer inte mellan objekt och projekt" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "projekt" @@ -1261,8 +1259,8 @@ msgstr "objekt-ID" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1282,12 +1280,12 @@ msgstr "undviks" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "sortera" @@ -1323,19 +1321,71 @@ msgstr "" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +"     %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings\n" "Language-Team: Turkish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/tr/)\n" @@ -21,15 +21,15 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "" -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "geçersiz kayıt tipi" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "geçersiz giriş tipi" @@ -49,17 +49,17 @@ msgstr "Kupon geçerli hiç bir davetle uyuşmuyor." msgid "User is already registered." msgstr "Kullanıcı zaten kayıtlı." -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "Bu kullanızı halihazırda zaten projenin bir üyesi." -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "Yeni kullanıcı oluşturulurken hata meydana geldi." #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "Geçersiz kupon" @@ -81,103 +81,103 @@ msgstr "Bu alan zorunlu." msgid "Invalid value." msgstr "Geçersiz değer." -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "%s' değeri ya Doğru ya da Yanlış olmalıdır." -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Harfler, rakamlar, altçizgi ve kesme işaretinden oluşan geçerli bir 'satır' " "girin." -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" "Geçerli bir seçenek belirleyin. %(value)s değeri mevcut seçenekler arasında " "yok." -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "Geçerli bir e-posta adresi girin." -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "Tarih biçemi yanlış. Belirtilen biçemlerden birini kullanın: %s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "Tarih saat biçemi yanlış. Belirtilen biçemlerden birini kullanın: %s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "Zaman biçemi yanlış. Belirtilen biçemlerden birini kullanın: %s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "Bir tam sayı girin." -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" "Bu değerin %(limit_value)s değerine eşit ya da daha az olduğundan emin olun." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" "Bu değerin %(limit_value)s değerine eşit ya da daha fazla olduğundan emin " "olun." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "\"%s\" değeri kesirli bir sayı olmalıdır." -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "Bir sayın girin." -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Toplamda %s basamaktan fazla olmadığından emin olun." -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "%s ondalık değerinden fazla olmalıdığından emin olun." -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "" "Virgülden önceki rakamların %s basamaktan fazla olmadığından emin olun." -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "Dosya ibraz edilmedi. Formdan kodlama tipini kontrol edin." -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "Dosya ibraz edilmedi." -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "İbraz edilen dosya boş" -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." @@ -185,13 +185,13 @@ msgstr "" "Bu dosya adının en fazla %(max)d karakterden oluştuğundan (uzunluğunun " "%(length)d olduğundan) emin olun" -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" "Lütfen bir dosya ibraz edin ya da onay kutusunu seçmeyin, ikisini birden " "olmaz." -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -200,25 +200,25 @@ msgstr "" "resim dosyası değil." #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "Engellenmiş nesne" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Sayfa 'last'(son) değil, tamsayıya da çevrilemiyor." -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Geçersiz sayfa (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "Geçersiz izin tanımı." @@ -282,7 +282,7 @@ msgstr "Bulunamadı" msgid "Permission denied" msgstr "İzin verilmedi" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "Sunucu uygulaması hatası" @@ -361,11 +361,11 @@ msgstr "Ön şart hatası" msgid "No room left for more projects." msgstr "Daha fazla proje için yer kalmadı." -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "Parametre tipleri filtresinde hata." -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project' değeri numerik olmalı." @@ -374,43 +374,43 @@ msgstr "'project' değeri numerik olmalı." msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "Twitter da bizi takip edin" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "GitHub dan kodu elde edin" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "Web sayfamızı ziyaret edin" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -846,7 +846,7 @@ msgid "It contain invalid custom fields." msgstr "Geçersiz özel alanlar içeriyor." #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "Aynı isimde proje bulunmakta" @@ -857,13 +857,13 @@ msgstr "Kimlik doğrulama gerekli" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "isim" @@ -879,8 +879,8 @@ msgstr "web" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "tanı" @@ -889,36 +889,34 @@ msgstr "tanı" msgid "Next url" msgstr "Sonraki url" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "kullanıcı" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "uygulama" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "tam ad" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "e-posta adresi" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "yorum" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -988,9 +986,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "Proje mevcut değil." @@ -1246,89 +1244,89 @@ msgstr "Yönetici rolleri" msgid "Privacity" msgstr "" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "sahip" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "Eksik parametreq" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "Geçersiz resim biçemi" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "Geçersiz şablon adı" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "Geçersiz şablon tanımı" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "Geçersiz kullanıcı id" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "Kullanıcı mevcut değil" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "Kullanıcı zaten proje üyesi durumunda" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "Görebilmek için yetkiniz yok." @@ -1344,18 +1342,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "Proje ve nesne arasında Proje ID uyuşmazlığı mevcut" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "proje" @@ -1370,8 +1368,8 @@ msgstr "nesne id" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1391,12 +1389,12 @@ msgstr "kaldırıldı" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "sıra" @@ -1432,19 +1430,71 @@ msgstr "Yetkili kalmadığı için proje bloklandı" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings, 2015 # Longyang Zhang , 2015 # Qi Fan , 2016 +# waring id , 2016 # wuwenbin , 2015 # Yang Yu , 2016 # yonee , 2015 @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-28 10:29+0200\n" -"PO-Revision-Date: 2016-11-30 06:50+0000\n" -"Last-Translator: 5791113 \n" +"POT-Creation-Date: 2017-01-10 11:50+0100\n" +"PO-Revision-Date: 2017-01-10 10:50+0000\n" +"Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Simplified (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hans/)\n" "MIME-Version: 1.0\n" @@ -28,15 +29,15 @@ msgstr "" "Language: zh-Hans\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "注册功能未开放" -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "无效的注册类型" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "无效的登录类型" @@ -56,17 +57,17 @@ msgstr "令牌不合法" msgid "User is already registered." msgstr "用户已注册" -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "该用户已经是此项目成员。" -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "无法创建新用户" #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "无效令牌" @@ -87,130 +88,130 @@ msgstr "此字段是必需的。" msgid "Invalid value." msgstr "无效值。" -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "'%s' 值必须为True或False。" -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "输入一个有效的字符，由字母、数字、下划线或横线组成" -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "请选择一个有效的选项。%(value)s 不是一个可用的选项。" -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "不允许您的邮件域名" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "请输入合法的邮件地址。" -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "日期格式错误。使用以下一种格式替代：%s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "日期格式错误。使用以下一种格式替代：%s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "时间格式错误。使用以下一种格式替代：%s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "输入一个整数" -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "确认此数值应小于或等于 %(limit_value)s" -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "确认此数值应大于或等于 %(limit_value)s" -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "'%s' 值必须为 浮点数。" -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "输入一个数字" -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "确保总数不超过%s个数字" -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "确保小数不超过%s位" -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "确保小数点前不超过%s位数字" -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "未提交任何文件。请检查表单的编码类型" -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "没有文件提交" -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "提交的文件是空的" -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." msgstr "确保文件名不超过 %(max)d 个字符 (当前 %(length)d 个)" -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "请提交文件或选中清除复选框，二选一" -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "请上传一张有效的图片。所上传的不是图片或已损坏" #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "冻结的元素" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "页面不是‘最后’一个， 也不能转换成整数。" -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "无效页面 (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "无效的授权定义" @@ -274,7 +275,7 @@ msgstr "找不到" msgid "Permission denied" msgstr "无此权限" -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "服务器端错误" @@ -353,11 +354,11 @@ msgstr "前提条件错误" msgid "No room left for more projects." msgstr "没空间添加新项目了" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "参数类型错误" -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "'project'必须是一个整数值" @@ -366,43 +367,43 @@ msgstr "'project'必须是一个整数值" msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "在推特上关注我们" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "Twitter" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "从Github上获取代码" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "Github" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "访问我们的网站" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -876,7 +877,7 @@ msgid "It contain invalid custom fields." msgstr "包含非法的自定义栏目" #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "项目名称重复" @@ -887,13 +888,13 @@ msgstr "需要身份认证" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "名称" @@ -909,8 +910,8 @@ msgstr "网页" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "描述" @@ -919,36 +920,34 @@ msgstr "描述" msgid "Next url" msgstr "下一个URL" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "密钥" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "用户" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "应用" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "全名" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "邮件地址" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "评论" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -1020,9 +1019,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "内容不是一个合法的JSON" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "项目不存在" @@ -1296,89 +1295,89 @@ msgstr "管理角色" msgid "Privacity" msgstr "私有" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "模块" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "预设值" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "动态" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "粉丝" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "所有者" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "{count} 成功公开。" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "公开" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "{count} 成功的私有。" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "私有" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "删除选中的%(verbose_name_plural)s" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "不完整的参数" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "非法的图片格式" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "非法的模板名称" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "无效的模板说明" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "无效用户ID" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "用户不存在" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "用户必须属于某一个项目" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "该项目必须有一个所有者，至少一个用户必须是一个积极的管理员" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "你无权访问" @@ -1392,20 +1391,20 @@ msgstr "此问题不存在" #: taiga/projects/attachments/api.py:72 msgid "Project ID not matches between object and project" -msgstr "" +msgstr "对象和项目间的项目ID不匹配" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "项目" @@ -1415,13 +1414,13 @@ msgstr "内容类别" #: taiga/projects/attachments/models.py:45 msgid "object id" -msgstr "" +msgstr "对象id" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1441,12 +1440,12 @@ msgstr "已废弃" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "次序" @@ -1482,19 +1481,71 @@ msgstr "这个因为所有者离开被封锁" msgid "This project is blocked while it's deleted" msgstr "这个项目因为删除被封锁" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settingsSee epic\n" " " msgstr "" +"\n" +"

    已更新的史诗

    \n" +"

    你好 %(user)s,
    %(changer)s 已更新史诗在 %(project)s

    \n" +"

    史诗 #%(ref)s %(subject)s

    \n" +"查看史诗" #: taiga/projects/notifications/templates/emails/epics/epic-change-body-text.jinja:3 #, python-format @@ -2154,6 +2239,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"新的史诗已创建\n" +"你好 %(user)s, %(changer)s 创建新的史诗在 %(project)s\n" +"查看史诗#%(ref)s %(subject)s 在 %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/epics/epic-create-subject.jinja:1 #, python-format @@ -2175,6 +2267,11 @@ msgid "" "

    The Taiga Team

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

    史诗已删除

    \n" +"

    你好 %(user)s,
    %(changer)s 已删除史诗在 %(project)s

    \n" +"

    史诗 #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    " #: taiga/projects/notifications/templates/emails/epics/epic-delete-body-text.jinja:1 #, python-format @@ -2187,6 +2284,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"史诗已删除\n" +"你好 %(user)s, %(changer)s 已删除的史诗在 %(project)s\n" +"史诗 #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/epics/epic-delete-subject.jinja:1 #, python-format @@ -2209,6 +2313,12 @@ msgid "" "%(subject)s in Taiga\">See issue\n" " " msgstr "" +"\n" +"

    问题已更新

    \n" +"

    你好 %(user)s,
    %(changer)s 已更新的问题在 %(project)s

    \n" +"

    问题 #%(ref)s %(subject)s

    \n" +"查看问题" #: taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja:3 #, python-format @@ -2218,6 +2328,10 @@ msgid "" "Hello %(user)s, %(changer)s has updated an issue on %(project)s\n" "See issue #%(ref)s %(subject)s at %(url)s\n" msgstr "" +"\n" +"已更新的问题\n" +"你好%(user)s, %(changer)s 已更新问题在 %(project)s\n" +"查看问题 #%(ref)s %(subject)s 在 %(url)s\n" #: taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja:1 #, python-format @@ -2241,6 +2355,13 @@ msgid "" "

    The Taiga Team

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

    新问题已创建

    \n" +"

    你好 %(user)s,
    %(changer)s 已创建新问题在 %(project)s

    \n" +"

    问题 #%(ref)s %(subject)s

    \n" +"" +"查看问题\n" +"

    The Taiga Team

    " #: taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja:1 #, python-format @@ -2253,6 +2374,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"新问题已创建\n" +"你好 %(user)s, %(changer)s 已创建新问题在 %(project)s\n" +"查看问题 #%(ref)s %(subject)s 在t %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja:1 #, python-format @@ -2274,6 +2402,11 @@ msgid "" "

    The Taiga Team

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

    问题已删除

    \n" +"

    你好 %(user)s,
    %(changer)s已删除问题在 %(project)s

    \n" +"

    问题 #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    " #: taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja:1 #, python-format @@ -2286,6 +2419,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"问题已删除\n" +"你好 %(user)s, %(changer)s 已删除问题在 %(project)s\n" +"问题 #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja:1 #, python-format @@ -2308,6 +2448,12 @@ msgid "" "Taiga\">See sprint\n" " " msgstr "" +"\n" +"

    冲刺已更新

    \n" +"

    你好 %(user)s,
    %(changer)s 已更新冲刺在 %(project)s

    \n" +"

    冲刺 %(name)s

    \n" +"查" +"看冲刺" #: taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja:3 #, python-format @@ -2317,6 +2463,10 @@ msgid "" "Hello %(user)s, %(changer)s has updated a sprint on %(project)s\n" "See sprint %(name)s at %(url)s\n" msgstr "" +"\n" +"冲刺已更新\n" +"你好 %(user)s, %(changer)s 已更新冲刺在 %(project)s\n" +"查看冲刺 %(name)s 在 %(url)s\n" #: taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja:1 #, python-format @@ -2340,6 +2490,13 @@ msgid "" "

    The Taiga Team

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

    已创建新冲刺

    \n" +"

    你好 %(user)s,
    %(changer)s 已创建新冲刺在 %(project)s

    \n" +"

    冲刺 %(name)s

    \n" +"查看冲刺\n" +"

    The Taiga Team

    " #: taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja:1 #, python-format @@ -2352,6 +2509,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"已创建新冲刺\n" +"你好 %(user)s, %(changer)s 已创建新冲刺在 %(project)s\n" +"查看冲刺 %(name)s 在 %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja:1 #, python-format @@ -2373,6 +2537,11 @@ msgid "" "

    The Taiga Team

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

    已删除冲刺

    \n" +"

    你好 %(user)s,
    %(changer)s 已删除冲刺在 %(project)s

    \n" +"

    冲刺 %(name)s

    \n" +"

    The Taiga Team

    " #: taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja:1 #, python-format @@ -2385,6 +2554,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"已删除冲刺\n" +"你好 %(user)s, %(changer)s 已删除冲刺在 %(project)s\n" +"冲刺 %(name)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja:1 #, python-format @@ -2407,6 +2583,12 @@ msgid "" "%(subject)s in Taiga\">See task    \n" " " msgstr "" +"\n" +"

    已更新的任务

    \n" +"

    你好 %(user)s,
    %(changer)s 已更新的任务在%(project)s

    \n" +"

    任务 #%(ref)s %(subject)s

    \n" +"查看任务" #: taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja:3 #, python-format @@ -2416,6 +2598,10 @@ msgid "" "Hello %(user)s, %(changer)s has updated a task on %(project)s\n" "See task #%(ref)s %(subject)s at %(url)s\n" msgstr "" +"\n" +"已更新的任务\n" +"你好 %(user)s, %(changer)s 已更新的任务在 %(project)s\n" +"查看任务 #%(ref)s %(subject)s 在 %(url)s\n" #: taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja:1 #, python-format @@ -2439,6 +2625,13 @@ msgid "" "

    The Taiga Team

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

    已创建新任务

    \n" +"

    你好 %(user)s,
    %(changer)s 已创建的新任务在 %(project)s

    \n" +"

    任务 #%(ref)s %(subject)s

    \n" +"" +"查看任务\n" +"

    The Taiga Team

    " #: taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja:1 #, python-format @@ -2451,6 +2644,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"已创建新任务\n" +"你好 %(user)s, %(changer)s 已创建的新任务在%(project)s\n" +"查看任务 #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja:1 #, python-format @@ -2472,6 +2672,11 @@ msgid "" "

    The Taiga Team

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

    已删除的任务

    \n" +"

    你好 %(user)s,
    %(changer)s 已删除的任务在 %(project)s

    \n" +"

    任务 #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    " #: taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja:1 #, python-format @@ -2484,6 +2689,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"已删除的任务\n" +"你好 %(user)s, %(changer)s 已删除的任务在 %(project)s\n" +"任务 #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja:1 #, python-format @@ -2506,6 +2718,12 @@ msgid "" "%(subject)s in Taiga\">See user story\n" " " msgstr "" +"\n" +"

    已更新的用户故事

    \n" +"

    你好 %(user)s,
    %(changer)s 已更新的用户故事在 %(project)s

    \n" +"

    用户故事 #%(ref)s %(subject)s

    \n" +"查看用户故事" #: taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja:3 #, python-format @@ -2515,6 +2733,10 @@ msgid "" "Hello %(user)s, %(changer)s has updated a user story on %(project)s\n" "See user story #%(ref)s %(subject)s at %(url)s\n" msgstr "" +"\n" +"已更新的用户故事\n" +"你好 %(user)s, %(changer)s 已更新的用户故事在 %(project)s\n" +"查看用户故事 #%(ref)s %(subject)s 在 %(url)s\n" #: taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja:1 #, python-format @@ -2538,6 +2760,13 @@ msgid "" "

    The Taiga Team

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

    已创建新的用户故事

    \n" +"

    你好%(user)s,
    %(changer)s 已创建新的用户故事在 %(project)s

    \n" +"

    用户故事 #%(ref)s %(subject)s

    \n" +"查看用户故事\n" +"

    The Taiga Team

    " #: taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja:1 #, python-format @@ -2550,6 +2779,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"已创建新的用户故事\n" +"你好 %(user)s, %(changer)s 已创建新的用户故事在 %(project)s\n" +"查看用户故事 #%(ref)s %(subject)s 在 %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja:1 #, python-format @@ -2571,6 +2807,11 @@ msgid "" "

    The Taiga Team

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

    已删除的用户故事

    \n" +"

    你好 %(user)s,
    %(changer)s 已删除的用户故事在 %(project)s

    \n" +"

    用户故事 #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

    " #: taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja:1 #, python-format @@ -2583,6 +2824,13 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"已删除的用户故事\n" +"你好 %(user)s, %(changer)s已删除的用户故事在 %(project)s\n" +"用户故事 #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja:1 #, python-format @@ -2605,6 +2853,12 @@ msgid "" "\">See Wiki Page\n" " " msgstr "" +"\n" +"

    Wiki 页面已更新

    \n" +"

    你好 %(user)s,
    %(changer)s 已更新的 wiki 页面在 %(project)s

    \n" +"

    Wiki 页面 %(page)s

    \n" +"查看Wiki" +"页面" #: taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja:3 #, python-format @@ -2616,6 +2870,12 @@ msgid "" "\n" "See wiki page %(page)s at %(url)s\n" msgstr "" +"\n" +"Wiki 页面已更新\n" +"\n" +"你好 %(user)s, %(changer)s 已更新的 wiki 页面在 %(project)s\n" +"\n" +"查看 wiki 页面 %(page)s 在 %(url)s\n" #: taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja:1 #, python-format @@ -2639,6 +2899,13 @@ msgid "" "

    The Taiga Team

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

    已创建新的 wiki 页面

    \n" +"

    你好 %(user)s,
    %(changer)s 已创建新的 wiki 页面在 %(project)s

    \n" +"

    Wiki 页面 %(page)s

    \n" +"查看 wiki " +"页面\n" +"

    The Taiga Team

    " #: taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja:1 #, python-format @@ -2653,6 +2920,15 @@ msgid "" "---\n" "The Taiga Team\n" msgstr "" +"\n" +"已创建新的 wiki 页面\n" +"\n" +"你好 %(user)s, %(changer)s 已创建新的 wiki 页面在 %(project)s\n" +"\n" +"查看 wiki 页面 %(page)s 在 %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" #: taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja:1 #, python-format @@ -2738,36 +3014,40 @@ msgid "" "You can't leave the project if you are the owner or there are no more admins" msgstr "因没有其他项目管理者，项目所有者不能离开项目" -#: taiga/projects/services/members.py:118 +#: taiga/projects/services/members.py:133 msgid "Project without owner" msgstr "项目没有所有者" -#: taiga/projects/services/members.py:123 +#: taiga/projects/services/members.py:138 msgid "You have reached your current limit of memberships for private projects" msgstr "你已经达到了私有项目的最大成员数目" -#: taiga/projects/services/members.py:127 +#: taiga/projects/services/members.py:142 msgid "You have reached your current limit of memberships for public projects" msgstr "你已经达到了公开项目的最大成员数目" -#: taiga/projects/services/projects.py:94 -#: taiga/projects/services/projects.py:134 taiga/users/services.py:589 +#: taiga/projects/services/members.py:148 +msgid "You have reached the current limit of pending memberships" +msgstr "" + +#: taiga/projects/services/projects.py:101 +#: taiga/projects/services/projects.py:141 taiga/users/services.py:589 msgid "You can't have more private projects" msgstr "你拥有的私有项目已到上限" -#: taiga/projects/services/projects.py:98 -#: taiga/projects/services/projects.py:138 taiga/users/services.py:592 +#: taiga/projects/services/projects.py:105 +#: taiga/projects/services/projects.py:145 taiga/users/services.py:592 msgid "" "This project reaches your current limit of memberships for private projects" msgstr "该项目已达到你设置的私有项目最大成员数" -#: taiga/projects/services/projects.py:102 -#: taiga/projects/services/projects.py:142 taiga/users/services.py:596 +#: taiga/projects/services/projects.py:109 +#: taiga/projects/services/projects.py:149 taiga/users/services.py:596 msgid "You can't have more public projects" msgstr "你拥有的公开项目已到上限" -#: taiga/projects/services/projects.py:106 -#: taiga/projects/services/projects.py:146 taiga/users/services.py:599 +#: taiga/projects/services/projects.py:113 +#: taiga/projects/services/projects.py:153 taiga/users/services.py:599 msgid "" "This project reaches your current limit of memberships for public projects" msgstr "该项目已达到你设置的公开项目最大成员数" @@ -2782,8 +3062,8 @@ msgstr "项目结束" #: taiga/projects/services/transfer.py:62 #: taiga/projects/services/transfer.py:69 -#: taiga/projects/services/transfer.py:72 taiga/users/api.py:186 -#: taiga/users/api.py:191 +#: taiga/projects/services/transfer.py:72 taiga/users/api.py:193 +#: taiga/users/api.py:198 msgid "Token is invalid" msgstr "令牌无效" @@ -2834,15 +3114,15 @@ msgstr "该颜色不是一个合法的HEX颜色" msgid "The tag doesn't exist." msgstr "该标签不存在" -#: taiga/projects/tasks/api.py:97 taiga/projects/tasks/api.py:106 +#: taiga/projects/tasks/api.py:98 taiga/projects/tasks/api.py:107 msgid "You don't have permissions to set this sprint to this task." msgstr "你无权对这个任务设置该冲刺任务。" -#: taiga/projects/tasks/api.py:100 +#: taiga/projects/tasks/api.py:101 msgid "You don't have permissions to set this user story to this task." msgstr "你无权对这个任务设置该用户故事。" -#: taiga/projects/tasks/api.py:103 +#: taiga/projects/tasks/api.py:104 msgid "You don't have permissions to set this status to this task." msgstr "你无权对这个任务设置该状态。" @@ -3005,6 +3285,12 @@ msgid "" "

    The Taiga Team

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

    你已添加新的项目

    \n" +"

    你好 %(full_name)s,
    你以添加新的项目 %(project)s

    \n" +"跳转至项目\n" +"

    The Taiga Team

    " #: taiga/projects/templates/emails/membership_notification-body-text.jinja:1 #, python-format @@ -3571,37 +3857,29 @@ msgstr "产品所有者" msgid "Stakeholder" msgstr "相关人员" -#: taiga/projects/userstories/api.py:124 +#: taiga/projects/userstories/api.py:127 msgid "You don't have permissions to set this sprint to this user story." msgstr "你无权对这个用户故事设置此冲刺任务。" -#: taiga/projects/userstories/api.py:128 +#: taiga/projects/userstories/api.py:131 msgid "You don't have permissions to set this status to this user story." msgstr "你无权对这个用户故事设置此状态。" -#: taiga/projects/userstories/api.py:218 +#: taiga/projects/userstories/api.py:221 #, python-brace-format msgid "Invalid role id '{role_id}'" msgstr "无效的角色ID '{role_id}'" -#: taiga/projects/userstories/api.py:225 +#: taiga/projects/userstories/api.py:228 #, python-brace-format msgid "Invalid points id '{points_id}'" msgstr "无效的点数ID '{points_id}'" -#: taiga/projects/userstories/api.py:240 +#: taiga/projects/userstories/api.py:243 #, python-brace-format msgid "Generating the user story #{ref} - {subject}" msgstr "生成用户故事#{ref} - {subject}" -#: taiga/projects/userstories/api.py:301 -msgid "ref param is needed" -msgstr "ref 参数必需" - -#: taiga/projects/userstories/api.py:304 -msgid "project or project_slug param is needed" -msgstr "project 或project_slug 参数必需" - #: taiga/projects/userstories/models.py:41 msgid "role" msgstr "角色" @@ -3654,63 +3932,67 @@ msgstr "此里程碑在该项目无效" msgid "All the user stories must be from the same project" msgstr "所有用户故事必须从属于一个同一项目" -#: taiga/projects/validators.py:61 +#: taiga/projects/validators.py:63 msgid "There's no project with that id" msgstr "该ID无对应项目" -#: taiga/projects/validators.py:142 -msgid "Email address is already taken" -msgstr "电子邮件已经被使用" +#: taiga/projects/validators.py:145 +msgid "The user yet exists in the project" +msgstr "" -#: taiga/projects/validators.py:154 +#: taiga/projects/validators.py:155 msgid "Invalid role for the project" msgstr "此角色在该项目无效" -#: taiga/projects/validators.py:165 +#: taiga/projects/validators.py:170 taiga/projects/validators.py:225 +msgid "The user must be a valid contact" +msgstr "" + +#: taiga/projects/validators.py:191 msgid "The project owner must be admin." msgstr "项目所有者必须是管理者" -#: taiga/projects/validators.py:169 +#: taiga/projects/validators.py:195 msgid "At least one user must be an active admin for this project." msgstr "一个项目至少有一名活跃的管理者" -#: taiga/projects/validators.py:201 +#: taiga/projects/validators.py:240 msgid "Invalid role ids. All roles must belong to the same project." msgstr "角色ID无效，所有角色必须属于同一项目" -#: taiga/projects/validators.py:225 +#: taiga/projects/validators.py:264 msgid "Default options" msgstr "默认选项" -#: taiga/projects/validators.py:226 +#: taiga/projects/validators.py:265 msgid "User story's statuses" msgstr "用户故事状态" -#: taiga/projects/validators.py:227 +#: taiga/projects/validators.py:266 msgid "Points" msgstr "点数" -#: taiga/projects/validators.py:228 +#: taiga/projects/validators.py:267 msgid "Task's statuses" msgstr "任务状态" -#: taiga/projects/validators.py:229 +#: taiga/projects/validators.py:268 msgid "Issue's statuses" msgstr "问题状态" -#: taiga/projects/validators.py:230 +#: taiga/projects/validators.py:269 msgid "Issue's types" msgstr "问题类型" -#: taiga/projects/validators.py:231 +#: taiga/projects/validators.py:270 msgid "Priorities" msgstr "优先级" -#: taiga/projects/validators.py:232 +#: taiga/projects/validators.py:271 msgid "Severities" msgstr "严重程度" -#: taiga/projects/validators.py:233 +#: taiga/projects/validators.py:272 msgid "Roles" msgstr "角色" @@ -3737,9 +4019,9 @@ msgstr "最后修改者" #: taiga/projects/wiki/models.py:75 msgid "href" -msgstr "" +msgstr "超链接" -#: taiga/timeline/signals.py:63 +#: taiga/timeline/signals.py:65 msgid "Check the history API for the exact diff" msgstr "检查确切的 diff 的历史记录 API" @@ -3779,133 +4061,133 @@ msgstr "限制" msgid "Important dates" msgstr "重要日期" -#: taiga/users/api.py:123 +#: taiga/users/api.py:132 msgid "Duplicated email" msgstr "重复的邮件地址" -#: taiga/users/api.py:125 +#: taiga/users/api.py:134 msgid "Not valid email" msgstr "无效的邮件地址" -#: taiga/users/api.py:165 +#: taiga/users/api.py:172 msgid "Invalid username or email" msgstr "用户名称或邮件地址无效" -#: taiga/users/api.py:174 +#: taiga/users/api.py:181 msgid "Mail sended successful!" msgstr "邮件发送成功！" -#: taiga/users/api.py:212 +#: taiga/users/api.py:219 msgid "Current password parameter needed" msgstr "输入当前密码" -#: taiga/users/api.py:215 +#: taiga/users/api.py:222 msgid "New password parameter needed" msgstr "输入新密码" -#: taiga/users/api.py:218 +#: taiga/users/api.py:225 msgid "Invalid password length at least 6 charaters needed" msgstr "无效密码，长度至少6位" -#: taiga/users/api.py:221 +#: taiga/users/api.py:228 msgid "Invalid current password" msgstr "当前密码无效" -#: taiga/users/api.py:268 taiga/users/api.py:274 +#: taiga/users/api.py:275 taiga/users/api.py:281 msgid "" "Invalid, are you sure the token is correct and you didn't use it before?" msgstr "无效，请确定令牌正确，之前使用过？" -#: taiga/users/api.py:301 taiga/users/api.py:309 taiga/users/api.py:312 +#: taiga/users/api.py:317 taiga/users/api.py:325 taiga/users/api.py:328 msgid "Invalid, are you sure the token is correct?" msgstr "无效，请确定令牌正确？" -#: taiga/users/models.py:95 +#: taiga/users/models.py:97 msgid "superuser status" msgstr "超级用户状态" -#: taiga/users/models.py:96 +#: taiga/users/models.py:98 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "选定此用户拥有所有权限，而不用显式将他们分配。" -#: taiga/users/models.py:126 +#: taiga/users/models.py:128 msgid "username" msgstr "用户名" -#: taiga/users/models.py:127 +#: taiga/users/models.py:129 msgid "" "Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" msgstr "必填，长度小于30的英文字母、数字、“.”、“-”、“_”" -#: taiga/users/models.py:130 +#: taiga/users/models.py:132 msgid "Enter a valid username." msgstr "输入一个合法的用户名" -#: taiga/users/models.py:133 +#: taiga/users/models.py:135 msgid "active" msgstr "活跃" -#: taiga/users/models.py:134 +#: taiga/users/models.py:136 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "指定是否此用户为活跃用户。取消选择这而不是删除帐户。" -#: taiga/users/models.py:140 +#: taiga/users/models.py:142 msgid "biography" msgstr "个人简介" -#: taiga/users/models.py:143 +#: taiga/users/models.py:145 msgid "photo" msgstr "照片" -#: taiga/users/models.py:144 +#: taiga/users/models.py:146 msgid "date joined" msgstr "加入日期" -#: taiga/users/models.py:146 +#: taiga/users/models.py:148 msgid "default language" msgstr "默认语言" -#: taiga/users/models.py:148 +#: taiga/users/models.py:150 msgid "default theme" msgstr "默认主题" -#: taiga/users/models.py:150 +#: taiga/users/models.py:152 msgid "default timezone" msgstr "默认时区" -#: taiga/users/models.py:152 +#: taiga/users/models.py:154 msgid "colorize tags" msgstr "彩色标签" -#: taiga/users/models.py:157 +#: taiga/users/models.py:159 msgid "email token" msgstr "电子邮件密码" -#: taiga/users/models.py:159 +#: taiga/users/models.py:161 msgid "new email address" msgstr "新邮件地址" -#: taiga/users/models.py:166 +#: taiga/users/models.py:168 msgid "max number of owned private projects" msgstr "最大私有项目数" -#: taiga/users/models.py:169 +#: taiga/users/models.py:171 msgid "max number of owned public projects" msgstr "最大公开项目数" -#: taiga/users/models.py:172 +#: taiga/users/models.py:174 msgid "max number of memberships for each owned private project" msgstr "私有项目最大成员数" -#: taiga/users/models.py:176 +#: taiga/users/models.py:178 msgid "max number of memberships for each owned public project" msgstr "公开项目最大成员数" -#: taiga/users/models.py:296 +#: taiga/users/models.py:305 msgid "permissions" msgstr "权限" diff --git a/taiga/locale/zh-Hant/LC_MESSAGES/django.po b/taiga/locale/zh-Hant/LC_MESSAGES/django.po index fcbeb9ea..d8c18dbb 100644 --- a/taiga/locale/zh-Hant/LC_MESSAGES/django.po +++ b/taiga/locale/zh-Hant/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-28 10:29+0200\n" -"PO-Revision-Date: 2016-09-20 10:50+0000\n" +"POT-Creation-Date: 2017-01-10 11:50+0100\n" +"PO-Revision-Date: 2017-01-10 10:50+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hant/)\n" @@ -22,15 +22,15 @@ msgstr "" "Language: zh-Hant\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: taiga/auth/api.py:102 +#: taiga/auth/api.py:74 msgid "Public register is disabled." msgstr "註冊功能暫不開放" -#: taiga/auth/api.py:135 +#: taiga/auth/api.py:101 msgid "invalid register type" msgstr "無效的註冊類型" -#: taiga/auth/api.py:148 +#: taiga/auth/api.py:117 msgid "invalid login type" msgstr "無效的登入類型" @@ -50,17 +50,17 @@ msgstr "代碼與任何有效的邀請不相符" msgid "User is already registered." msgstr "使用者已被註冊。" -#: taiga/auth/services.py:147 +#: taiga/auth/services.py:140 msgid "This user is already a member of the project." msgstr "使用者已是專案成員" -#: taiga/auth/services.py:173 +#: taiga/auth/services.py:164 msgid "Error on creating new user." msgstr "無法創建新使用者" #: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 -#: taiga/external_apps/services.py:36 taiga/projects/api.py:364 -#: taiga/projects/api.py:385 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 msgid "Invalid token" msgstr "無效的代碼　" @@ -81,130 +81,130 @@ msgstr "此欄位是必要的。" msgid "Invalid value." msgstr "無效的數值" -#: taiga/base/api/fields.py:479 +#: taiga/base/api/fields.py:484 #, python-format msgid "'%s' value must be either True or False." msgstr "'%s' 數值必須為「是」或「否」。" -#: taiga/base/api/fields.py:543 +#: taiga/base/api/fields.py:549 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "輸入有效的代稱，其包括字母,數字,底底線與連字符號" -#: taiga/base/api/fields.py:558 +#: taiga/base/api/fields.py:564 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "請做個有效的選擇。 %(value)s 並不是可以選的選項。" -#: taiga/base/api/fields.py:621 +#: taiga/base/api/fields.py:638 msgid "You email domain is not allowed" msgstr "" -#: taiga/base/api/fields.py:630 +#: taiga/base/api/fields.py:647 msgid "Enter a valid email address." msgstr "輸入無效之電子郵件地址" -#: taiga/base/api/fields.py:672 +#: taiga/base/api/fields.py:689 #, python-format msgid "Date has wrong format. Use one of these formats instead: %s" msgstr "資料格式錯誤，請改用這些格式取代:%s" -#: taiga/base/api/fields.py:736 +#: taiga/base/api/fields.py:753 #, python-format msgid "Datetime has wrong format. Use one of these formats instead: %s" msgstr "日期格式錯誤，請使用這些格式取代:%s" -#: taiga/base/api/fields.py:806 +#: taiga/base/api/fields.py:823 #, python-format msgid "Time has wrong format. Use one of these formats instead: %s" msgstr "時間格式錯誤，請使用這些格式取代:%s" -#: taiga/base/api/fields.py:863 +#: taiga/base/api/fields.py:880 msgid "Enter a whole number." msgstr "輸入一個整數" -#: taiga/base/api/fields.py:864 taiga/base/api/fields.py:917 +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "確認此值小於等於 %(limit_value)s." -#: taiga/base/api/fields.py:865 taiga/base/api/fields.py:918 +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "確認此值大於等於 %(limit_value)s." -#: taiga/base/api/fields.py:895 +#: taiga/base/api/fields.py:912 #, python-format msgid "\"%s\" value must be a float." msgstr "\"%s\" 數值必須為一個浮點數" -#: taiga/base/api/fields.py:916 +#: taiga/base/api/fields.py:933 msgid "Enter a number." msgstr "輸入一組號碼" -#: taiga/base/api/fields.py:919 +#: taiga/base/api/fields.py:936 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "確認全部沒有多於 %s位數　" -#: taiga/base/api/fields.py:920 +#: taiga/base/api/fields.py:937 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "確認沒有多於 %s十進位數　" -#: taiga/base/api/fields.py:921 +#: taiga/base/api/fields.py:938 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "確認在小數點前沒有多於 %s位數　" -#: taiga/base/api/fields.py:988 +#: taiga/base/api/fields.py:1005 msgid "No file was submitted. Check the encoding type on the form." msgstr "無檔案送出，請 確認表格中的編碼 格式" -#: taiga/base/api/fields.py:989 +#: taiga/base/api/fields.py:1006 msgid "No file was submitted." msgstr "無檔案送出" -#: taiga/base/api/fields.py:990 +#: taiga/base/api/fields.py:1007 msgid "The submitted file is empty." msgstr "送出的檔案無內容" -#: taiga/base/api/fields.py:991 +#: taiga/base/api/fields.py:1008 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." msgstr "確認檔案名稱最多有 %(max)d 字元 (它有 %(length)d)." -#: taiga/base/api/fields.py:992 +#: taiga/base/api/fields.py:1009 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "請上傳擋案或是勾選清除方格中二選一" -#: taiga/base/api/fields.py:1032 +#: taiga/base/api/fields.py:1049 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "上傳有效圖片，你所上傳的檔案非圖檔或已損壞" #: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 -#: taiga/hooks/api.py:69 taiga/projects/api.py:396 taiga/projects/api.py:671 -#: taiga/projects/epics/api.py:213 taiga/projects/epics/api.py:292 -#: taiga/projects/issues/api.py:238 taiga/projects/mixins/ordering.py:59 -#: taiga/projects/tasks/api.py:261 taiga/projects/tasks/api.py:287 -#: taiga/projects/userstories/api.py:340 taiga/projects/userstories/api.py:392 -#: taiga/webhooks/api.py:71 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 msgid "Blocked element" msgstr "" -#: taiga/base/api/pagination.py:214 +#: taiga/base/api/pagination.py:228 msgid "Page is not 'last', nor can it be converted to an int." msgstr "頁數不是最後，或者它無法轉成整數　" -#: taiga/base/api/pagination.py:218 +#: taiga/base/api/pagination.py:232 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "無效頁面I (%(page_number)s): %(message)s" -#: taiga/base/api/permissions.py:66 +#: taiga/base/api/permissions.py:65 msgid "Invalid permission definition." msgstr "無效的權限定義　" @@ -268,7 +268,7 @@ msgstr "找不到" msgid "Permission denied" msgstr "許可遭拒絕 " -#: taiga/base/api/views.py:477 +#: taiga/base/api/views.py:492 msgid "Server application error" msgstr "伺服器應用出錯" @@ -347,11 +347,11 @@ msgstr "前提出錯" msgid "No room left for more projects." msgstr "" -#: taiga/base/filters.py:81 taiga/base/filters.py:462 +#: taiga/base/filters.py:81 taiga/base/filters.py:463 msgid "Error in filter params types." msgstr "過濾參數類型出錯" -#: taiga/base/filters.py:135 taiga/base/filters.py:242 +#: taiga/base/filters.py:136 taiga/base/filters.py:243 #: taiga/projects/filters.py:64 msgid "'project' must be an integer value." msgstr "專案須為整數值" @@ -360,43 +360,43 @@ msgstr "專案須為整數值" msgid "Taiga" msgstr "Taiga" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Follow us on Twitter" msgstr "透過推特追踪" -#: taiga/base/templates/emails/base-body-html.jinja:406 +#: taiga/base/templates/emails/base-body-html.jinja:421 #: taiga/base/templates/emails/hero-body-html.jinja:380 #: taiga/base/templates/emails/updates-body-html.jinja:442 msgid "Twitter" msgstr "推特" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "Get the code on GitHub" msgstr "從GitHub取得原始碼" -#: taiga/base/templates/emails/base-body-html.jinja:407 +#: taiga/base/templates/emails/base-body-html.jinja:422 #: taiga/base/templates/emails/hero-body-html.jinja:381 #: taiga/base/templates/emails/updates-body-html.jinja:443 msgid "GitHub" msgstr "GitHub" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Visit our website" msgstr "造訪我們的網站" -#: taiga/base/templates/emails/base-body-html.jinja:408 +#: taiga/base/templates/emails/base-body-html.jinja:423 #: taiga/base/templates/emails/hero-body-html.jinja:382 #: taiga/base/templates/emails/updates-body-html.jinja:444 msgid "Taiga.io" msgstr "Taiga.io" -#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/base-body-html.jinja:438 #: taiga/base/templates/emails/hero-body-html.jinja:397 #: taiga/base/templates/emails/updates-body-html.jinja:459 #, python-format @@ -832,7 +832,7 @@ msgid "It contain invalid custom fields." msgstr "包括無效慣例欄位" #: taiga/export_import/validators/validators.py:245 -#: taiga/projects/validators.py:52 +#: taiga/projects/validators.py:54 msgid "Name duplicated for the project" msgstr "專案的名稱被複製了" @@ -843,13 +843,13 @@ msgstr "要求取得授權" #: taiga/external_apps/models.py:35 #: taiga/projects/custom_attributes/models.py:36 -#: taiga/projects/milestones/models.py:38 taiga/projects/models.py:145 -#: taiga/projects/models.py:512 taiga/projects/models.py:545 -#: taiga/projects/models.py:581 taiga/projects/models.py:603 -#: taiga/projects/models.py:637 taiga/projects/models.py:657 -#: taiga/projects/models.py:677 taiga/projects/models.py:709 -#: taiga/projects/models.py:729 taiga/users/admin.py:54 -#: taiga/users/models.py:292 taiga/webhooks/models.py:29 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 msgid "name" msgstr "姓名" @@ -865,8 +865,8 @@ msgstr "網頁" #: taiga/projects/custom_attributes/models.py:37 #: taiga/projects/epics/models.py:55 #: taiga/projects/history/templatetags/functions.py:25 -#: taiga/projects/issues/models.py:60 taiga/projects/models.py:149 -#: taiga/projects/models.py:733 taiga/projects/tasks/models.py:62 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 #: taiga/projects/userstories/models.py:95 msgid "description" msgstr "描述" @@ -875,36 +875,34 @@ msgstr "描述" msgid "Next url" msgstr "下一個網址" -#: taiga/external_apps/models.py:43 -msgid "secret key for ciphering the application tokens" -msgstr "應用程式的密碼字符數列" - -#: taiga/external_apps/models.py:57 taiga/projects/likes/models.py:31 -#: taiga/projects/notifications/models.py:87 taiga/projects/votes/models.py:52 +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 msgid "user" msgstr "使用者" -#: taiga/external_apps/models.py:61 +#: taiga/external_apps/models.py:59 msgid "application" msgstr "應用程式" -#: taiga/feedback/models.py:25 taiga/users/models.py:137 +#: taiga/feedback/models.py:25 taiga/users/models.py:139 msgid "full name" msgstr "全名" -#: taiga/feedback/models.py:27 taiga/users/models.py:132 +#: taiga/feedback/models.py:27 taiga/users/models.py:134 msgid "email address" msgstr "電子郵件" -#: taiga/feedback/models.py:29 +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 msgid "comment" msgstr "評論" #: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 #: taiga/projects/custom_attributes/models.py:46 #: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 -#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:49 -#: taiga/projects/models.py:156 taiga/projects/models.py:737 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 #: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 #: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 #: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 @@ -973,9 +971,9 @@ msgstr "" msgid "The payload is not a valid json" msgstr "載荷為無效json" -#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:152 -#: taiga/projects/issues/api.py:138 taiga/projects/tasks/api.py:200 -#: taiga/projects/userstories/api.py:273 +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 msgid "The project doesn't exist" msgstr "專案不存在" @@ -1231,89 +1229,89 @@ msgstr "管理員角色" msgid "Privacity" msgstr "" -#: taiga/projects/admin.py:112 +#: taiga/projects/admin.py:111 msgid "Modules" msgstr "" -#: taiga/projects/admin.py:120 +#: taiga/projects/admin.py:119 msgid "Default values" msgstr "" -#: taiga/projects/admin.py:126 +#: taiga/projects/admin.py:125 msgid "Activity" msgstr "" -#: taiga/projects/admin.py:131 +#: taiga/projects/admin.py:130 msgid "Fans" msgstr "" -#: taiga/projects/admin.py:145 taiga/projects/attachments/models.py:39 +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 #: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 -#: taiga/projects/milestones/models.py:43 taiga/projects/models.py:161 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 #: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 #: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 #: taiga/users/admin.py:69 taiga/userstorage/models.py:27 msgid "owner" msgstr "所有者" -#: taiga/projects/admin.py:200 +#: taiga/projects/admin.py:192 #, python-brace-format msgid "{count} successfully made public." msgstr "" -#: taiga/projects/admin.py:201 +#: taiga/projects/admin.py:193 msgid "Make public" msgstr "" -#: taiga/projects/admin.py:215 +#: taiga/projects/admin.py:207 #, python-brace-format msgid "{count} successfully made private." msgstr "" -#: taiga/projects/admin.py:216 +#: taiga/projects/admin.py:208 msgid "Make private" msgstr "" -#: taiga/projects/admin.py:246 +#: taiga/projects/admin.py:238 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: taiga/projects/api.py:150 taiga/users/api.py:237 +#: taiga/projects/api.py:152 taiga/users/api.py:244 msgid "Incomplete arguments" msgstr "不完整參數" -#: taiga/projects/api.py:154 taiga/users/api.py:242 +#: taiga/projects/api.py:156 taiga/users/api.py:249 msgid "Invalid image format" msgstr "無效的圖片檔案" -#: taiga/projects/api.py:215 +#: taiga/projects/api.py:217 msgid "Not valid template name" msgstr "非有效樣板名稱　" -#: taiga/projects/api.py:218 +#: taiga/projects/api.py:220 msgid "Not valid template description" msgstr "無效樣板描述" -#: taiga/projects/api.py:344 +#: taiga/projects/api.py:346 msgid "Invalid user id" msgstr "" -#: taiga/projects/api.py:350 +#: taiga/projects/api.py:352 msgid "The user doesn't exist" msgstr "" -#: taiga/projects/api.py:354 +#: taiga/projects/api.py:356 msgid "The user must be already a project member" msgstr "" -#: taiga/projects/api.py:701 +#: taiga/projects/api.py:777 msgid "" "The project must have an owner and at least one of the users must be an " "active admin" msgstr "" -#: taiga/projects/api.py:735 +#: taiga/projects/api.py:811 msgid "You don't have permisions to see that." msgstr "您無觀看權限" @@ -1329,18 +1327,18 @@ msgstr "" msgid "Project ID not matches between object and project" msgstr "專案ID不符合物件與專案" -#: taiga/projects/attachments/models.py:41 +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 #: taiga/projects/custom_attributes/models.py:43 #: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 -#: taiga/projects/milestones/models.py:45 taiga/projects/models.py:500 -#: taiga/projects/models.py:522 taiga/projects/models.py:559 -#: taiga/projects/models.py:587 taiga/projects/models.py:613 -#: taiga/projects/models.py:643 taiga/projects/models.py:663 -#: taiga/projects/models.py:687 taiga/projects/models.py:715 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 #: taiga/projects/notifications/models.py:74 #: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 #: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 -#: taiga/projects/wiki/models.py:72 taiga/users/models.py:303 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 msgid "project" msgstr "專案" @@ -1355,8 +1353,8 @@ msgstr "物件ID" #: taiga/projects/attachments/models.py:51 #: taiga/projects/custom_attributes/models.py:48 #: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 -#: taiga/projects/milestones/models.py:52 taiga/projects/models.py:159 -#: taiga/projects/models.py:740 taiga/projects/tasks/models.py:51 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 #: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 #: taiga/userstorage/models.py:31 msgid "modified date" @@ -1376,12 +1374,12 @@ msgstr "棄用" #: taiga/projects/attachments/models.py:62 #: taiga/projects/custom_attributes/models.py:41 -#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:58 -#: taiga/projects/models.py:516 taiga/projects/models.py:549 -#: taiga/projects/models.py:583 taiga/projects/models.py:607 -#: taiga/projects/models.py:639 taiga/projects/models.py:659 -#: taiga/projects/models.py:681 taiga/projects/models.py:711 -#: taiga/projects/wiki/models.py:77 taiga/users/models.py:298 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 msgid "order" msgstr "次序" @@ -1417,19 +1415,71 @@ msgstr "" msgid "This project is blocked while it's deleted" msgstr "" -#: taiga/projects/custom_attributes/choices.py:28 +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +"     %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings Date: Thu, 12 Jan 2017 15:51:02 +0100 Subject: [PATCH 082/144] Ignore psd files for thumbnails --- taiga/base/utils/thumbnails.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/taiga/base/utils/thumbnails.py b/taiga/base/utils/thumbnails.py index 64ce2d20..db972d40 100644 --- a/taiga/base/utils/thumbnails.py +++ b/taiga/base/utils/thumbnails.py @@ -35,6 +35,8 @@ def get_thumbnail_url(file_obj, thumbnailer_size): source_extension = os.path.splitext(relative_name)[1][1:] if source_extension == "tiff": return None + if source_extension == "psd": + return None try: path_url = get_thumbnailer(file_obj)[thumbnailer_size].url From 49d4884e8383614bc29e30777940e0be24f86b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 12 Jan 2017 18:26:31 +0100 Subject: [PATCH 083/144] Using psd-tools for psd thumbnail --- requirements.txt | 1 + taiga/base/utils/thumbnails.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index f6ea081a..670e9ace 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,3 +33,4 @@ pyjwkest==1.3.2 python-dateutil==2.6.0 netaddr==0.7.18 serpy==0.1.1 +psd-tools==1.4 diff --git a/taiga/base/utils/thumbnails.py b/taiga/base/utils/thumbnails.py index db972d40..e28aff0c 100644 --- a/taiga/base/utils/thumbnails.py +++ b/taiga/base/utils/thumbnails.py @@ -18,12 +18,22 @@ import os +from psd_tools import PSDImage from django.db.models.fields.files import FieldFile from taiga.base.utils.urls import get_absolute_url from easy_thumbnails.files import get_thumbnailer from easy_thumbnails.exceptions import InvalidImageFormatError +from PIL import Image + + +def psd_image_factory(data, *args): + return PSDImage.from_stream(data).as_PIL() + + +Image.init() +Image.register_open("PSD", psd_image_factory) def get_thumbnail_url(file_obj, thumbnailer_size): @@ -35,8 +45,6 @@ def get_thumbnail_url(file_obj, thumbnailer_size): source_extension = os.path.splitext(relative_name)[1][1:] if source_extension == "tiff": return None - if source_extension == "psd": - return None try: path_url = get_thumbnailer(file_obj)[thumbnailer_size].url From 314c73efe777189cad71217ca5c8a83984136d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 13 Jan 2017 10:16:55 +0100 Subject: [PATCH 084/144] Add changelog about adding support for PSD files thumbnails --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d91736e5..2318a9a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - i18n: - Add japanese (ja) translation. - Add chinese simplified (zh-Hans) translation. +- Add thumbnails for PSD files. ### Misc - API: From 0deeabc3acaa4a24c0faff62762258f5974998c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 16 Jan 2017 17:44:53 +0100 Subject: [PATCH 085/144] [i18n] Fix some typos and upsdate locales --- taiga/locale/ca/LC_MESSAGES/django.po | 12 +++--- taiga/locale/de/LC_MESSAGES/django.po | 14 +++---- taiga/locale/en/LC_MESSAGES/django.po | 10 ++--- taiga/locale/es/LC_MESSAGES/django.po | 14 +++---- taiga/locale/fi/LC_MESSAGES/django.po | 12 +++--- taiga/locale/fr/LC_MESSAGES/django.po | 37 ++++++++++--------- taiga/locale/it/LC_MESSAGES/django.po | 14 +++---- taiga/locale/ja/LC_MESSAGES/django.po | 12 +++--- taiga/locale/nb/LC_MESSAGES/django.po | 14 +++---- taiga/locale/nl/LC_MESSAGES/django.po | 12 +++--- taiga/locale/pl/LC_MESSAGES/django.po | 12 +++--- taiga/locale/pt_BR/LC_MESSAGES/django.po | 12 +++--- taiga/locale/ru/LC_MESSAGES/django.po | 14 +++---- taiga/locale/sv/LC_MESSAGES/django.po | 12 +++--- taiga/locale/tr/LC_MESSAGES/django.po | 12 +++--- taiga/locale/zh-Hans/LC_MESSAGES/django.po | 14 +++---- taiga/locale/zh-Hant/LC_MESSAGES/django.po | 12 +++--- .../contact_notification-body-text.jinja | 2 +- .../migrations/0059_auto_20170116_1633.py | 25 +++++++++++++ taiga/projects/models.py | 4 +- 20 files changed, 148 insertions(+), 122 deletions(-) create mode 100644 taiga/projects/migrations/0059_auto_20170116_1633.py diff --git a/taiga/locale/ca/LC_MESSAGES/django.po b/taiga/locale/ca/LC_MESSAGES/django.po index 5006eb67..59cd9ec1 100644 --- a/taiga/locale/ca/LC_MESSAGES/django.po +++ b/taiga/locale/ca/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-10 11:50+0100\n" -"PO-Revision-Date: 2017-01-10 10:50+0000\n" +"POT-Creation-Date: 2017-01-16 17:35+0100\n" +"PO-Revision-Date: 2017-01-16 16:35+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ca/)\n" @@ -1366,9 +1366,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/de/)\n" @@ -1519,9 +1519,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Taiga Dev Team \n" @@ -1339,9 +1339,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/es/)\n" @@ -1502,9 +1502,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fi/)\n" @@ -1461,9 +1461,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings, 2015 # Djyp Forest Fortin , 2015 # Florent B. , 2015 +# Gary , 2017 # Gautier Ferandelle , 2016 # Laurent Cabaret , 2016 # Louis-Michel Couture , 2015 @@ -24,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-10 11:50+0100\n" -"PO-Revision-Date: 2017-01-10 10:50+0000\n" +"POT-Creation-Date: 2017-01-16 17:35+0100\n" +"PO-Revision-Date: 2017-01-16 16:35+0000\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/fr/)\n" @@ -1494,9 +1495,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/it/)\n" @@ -1599,9 +1599,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Japanese (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ja/)\n" @@ -1533,9 +1533,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/nb/)\n" @@ -1378,9 +1378,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/nl/)\n" @@ -1406,9 +1406,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/pl/)\n" @@ -1474,9 +1474,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/pt_BR/)\n" @@ -1508,9 +1508,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/ru/)\n" @@ -1503,9 +1503,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Swedish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/sv/)\n" @@ -1357,9 +1357,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Turkish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "language/tr/)\n" @@ -1466,9 +1466,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Chinese Simplified (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hans/)\n" @@ -1517,9 +1517,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settings\n" "Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/" "taiga-back/language/zh-Hant/)\n" @@ -1451,9 +1451,9 @@ msgid "" "\n" "You are receiving this message because you are listed as administrator of " "the project titled %(project_name)s. If you don't want members of the Taiga " -"community contacting your project, please update your project settingsupdate your project settings Date: Mon, 16 Jan 2017 18:02:47 +0100 Subject: [PATCH 086/144] [i18n] Add korean locale --- CHANGELOG.md | 1 + settings/common.py | 2 +- taiga/locale/ko/LC_MESSAGES/django.po | 4531 +++++++++++++++++++++++++ 3 files changed, 4533 insertions(+), 1 deletion(-) create mode 100644 taiga/locale/ko/LC_MESSAGES/django.po diff --git a/CHANGELOG.md b/CHANGELOG.md index 2318a9a1..1bb83701 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Duplicate project: allows creating a new project based on the structure of another (status, tags, colors, default values...) - i18n: - Add japanese (ja) translation. + - Add korean (ko) translation. - Add chinese simplified (zh-Hans) translation. - Add thumbnails for PSD files. diff --git a/settings/common.py b/settings/common.py index 6980efb8..0f5911f9 100644 --- a/settings/common.py +++ b/settings/common.py @@ -115,7 +115,7 @@ LANGUAGES = [ #("kk", "Қазақша"), # Kazakh #("km", "ភាសាខ្មែរ"), # Khmer #("kn", "ಕನ್ನಡ"), # Kannada - #("ko", "한국어"), # Korean + ("ko", "한국어"), # Korean #("lb", "Lëtzebuergesch"), # Luxembourgish #("lt", "Lietuvių"), # Lithuanian #("lv", "Latviešu"), # Latvian diff --git a/taiga/locale/ko/LC_MESSAGES/django.po b/taiga/locale/ko/LC_MESSAGES/django.po new file mode 100644 index 00000000..6e8847a2 --- /dev/null +++ b/taiga/locale/ko/LC_MESSAGES/django.po @@ -0,0 +1,4531 @@ +# taiga-back.taiga. +# Copyright (C) 2014-2016 Taiga Dev Team +# This file is distributed under the same license as the taiga-back package. +# +# Translators: +# 안민규 (luasenvy) , 2017 +# mcsong , 2015 +# mcsong , 2015 +msgid "" +msgstr "" +"Project-Id-Version: taiga-back\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-16 17:35+0100\n" +"PO-Revision-Date: 2017-01-16 16:35+0000\n" +"Last-Translator: Taiga Dev Team \n" +"Language-Team: Korean (http://www.transifex.com/taiga-agile-llc/taiga-back/" +"language/ko/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ko\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: taiga/auth/api.py:74 +msgid "Public register is disabled." +msgstr "공개 가입이 비활성화 되었습니다." + +#: taiga/auth/api.py:101 +msgid "invalid register type" +msgstr "유효하지 않은 가입 형태" + +#: taiga/auth/api.py:117 +msgid "invalid login type" +msgstr "유효하지 않은 로그인 형태" + +#: taiga/auth/services.py:76 +msgid "Username is already in use." +msgstr "이미 사용중인 아이디입니다." + +#: taiga/auth/services.py:79 +msgid "Email is already in use." +msgstr "이미 사용중인 이메일입니다. " + +#: taiga/auth/services.py:95 +msgid "Token not matches any valid invitation." +msgstr "토큰과 일치하는 초대가 없습니다." + +#: taiga/auth/services.py:123 +msgid "User is already registered." +msgstr "이미 등록된 사용자입니다. " + +#: taiga/auth/services.py:140 +msgid "This user is already a member of the project." +msgstr "이 사용자는 이미 프로젝트의 회원입니다." + +#: taiga/auth/services.py:164 +msgid "Error on creating new user." +msgstr "사용자를 생성에 에러가 발생했습니다." + +#: taiga/auth/tokens.py:49 taiga/auth/tokens.py:56 +#: taiga/external_apps/services.py:34 taiga/projects/api.py:366 +#: taiga/projects/api.py:387 +msgid "Invalid token" +msgstr "유효하지 않은 토큰" + +#: taiga/auth/validators.py:37 taiga/users/validators.py:44 +msgid "invalid username" +msgstr "유효하지 않은 아이디" + +#: taiga/auth/validators.py:42 taiga/users/validators.py:50 +msgid "" +"Required. 255 characters or fewer. Letters, numbers and /./-/_ characters'" +msgstr "필수. 255자 이하. 문자, 숫자 그리고 /./-/_ 만 사용 가능합니다'" + +#: taiga/base/api/fields.py:294 +msgid "This field is required." +msgstr "필수 입력필드입니다." + +#: taiga/base/api/fields.py:295 taiga/base/api/relations.py:337 +msgid "Invalid value." +msgstr "유효하지 않은 값." + +#: taiga/base/api/fields.py:484 +#, python-format +msgid "'%s' value must be either True or False." +msgstr "'%s' 값은 반드시 True 또는 False이어야 합니다. " + +#: taiga/base/api/fields.py:549 +msgid "" +"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +msgstr "" +"문자, 숫자, 언더 스코어(_)또는 하이픈(-)으로 이루어진 올바른 '슬러그'를 입력" +"하세요." + +#: taiga/base/api/fields.py:564 +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "" +"%(value)s 는 사용 가능한 선택 중 하나가 아닙니다. 올바른 것을 선택하세요." + +#: taiga/base/api/fields.py:638 +msgid "You email domain is not allowed" +msgstr "당신의 이메일 도메인은 허용되지 않았" + +#: taiga/base/api/fields.py:647 +msgid "Enter a valid email address." +msgstr "이메일 주소를 입력하세요." + +#: taiga/base/api/fields.py:689 +#, python-format +msgid "Date has wrong format. Use one of these formats instead: %s" +msgstr "" +"날짜 형식이 잘못되었습니다. %s 대신에 아래의 포맷중에 하나를 사용해 주세요." + +#: taiga/base/api/fields.py:753 +#, python-format +msgid "Datetime has wrong format. Use one of these formats instead: %s" +msgstr "" +"날짜와 시간의 형식이 잘못되었습니다. %s 대신에 아래의 포맷중에 하나를 사용해 " +"주세요." + +#: taiga/base/api/fields.py:823 +#, python-format +msgid "Time has wrong format. Use one of these formats instead: %s" +msgstr "" +"시간 형식이 잘못되었습니다. %s 대신에 아래의 포맷중에 하나를 사용해 주세요." + +#: taiga/base/api/fields.py:880 +msgid "Enter a whole number." +msgstr "번호 전체를 입력하세요" + +#: taiga/base/api/fields.py:881 taiga/base/api/fields.py:934 +#, python-format +msgid "Ensure this value is less than or equal to %(limit_value)s." +msgstr "이 값은 %(limit_value)s 보다 작거나 같아야 합니다." + +#: taiga/base/api/fields.py:882 taiga/base/api/fields.py:935 +#, python-format +msgid "Ensure this value is greater than or equal to %(limit_value)s." +msgstr "" +"이 값은 %(limit_value)s 보다 크거나 같아야 합니다.Ensure this value is " +"greater than or equal to " + +#: taiga/base/api/fields.py:912 +#, python-format +msgid "\"%s\" value must be a float." +msgstr "\"%s\"" + +#: taiga/base/api/fields.py:933 +msgid "Enter a number." +msgstr "숫자를 입력하세요." + +#: taiga/base/api/fields.py:936 +#, python-format +msgid "Ensure that there are no more than %s digits in total." +msgstr "총계는 %s 자릿수가 넘지 않아야 합니다." + +#: taiga/base/api/fields.py:937 +#, python-format +msgid "Ensure that there are no more than %s decimal places." +msgstr "%s 자리 이하 여야합니다." + +#: taiga/base/api/fields.py:938 +#, python-format +msgid "Ensure that there are no more than %s digits before the decimal point." +msgstr "소수점 앞이 %s 자리 이하인지 확인하십시오." + +#: taiga/base/api/fields.py:1005 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "제출된 파일이 없습니다. " + +#: taiga/base/api/fields.py:1006 +msgid "No file was submitted." +msgstr "제출한 파일이 없습니다." + +#: taiga/base/api/fields.py:1007 +msgid "The submitted file is empty." +msgstr "전송된 파일이 비어있습니다." + +#: taiga/base/api/fields.py:1008 +#, python-format +msgid "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr "이 파일 이름의 %(max)d 자 (%(length)d)를 초과하지 않도록하십시오." + +#: taiga/base/api/fields.py:1009 +msgid "Please either submit a file or check the clear checkbox, not both." +msgstr "파일을 제출하거나 모두 지우기 체크박스를 선택하십시오." + +#: taiga/base/api/fields.py:1049 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"유효한 이미지를 업로드하십시오. 업로드 한 파일이 이미지도 아니며 손상된 이미" +"지 또한 아닙니다." + +#: taiga/base/api/mixins.py:284 taiga/base/exceptions.py:211 +#: taiga/hooks/api.py:69 taiga/projects/api.py:401 taiga/projects/api.py:434 +#: taiga/projects/api.py:746 taiga/projects/epics/api.py:200 +#: taiga/projects/epics/api.py:284 taiga/projects/issues/api.py:224 +#: taiga/projects/mixins/ordering.py:59 taiga/projects/tasks/api.py:247 +#: taiga/projects/tasks/api.py:272 taiga/projects/userstories/api.py:322 +#: taiga/projects/userstories/api.py:374 taiga/webhooks/api.py:71 +msgid "Blocked element" +msgstr "차단된 엘리먼트" + +#: taiga/base/api/pagination.py:228 +msgid "Page is not 'last', nor can it be converted to an int." +msgstr "페이지가 '마지막'이 아니며 int로 변환 될 수도 없습니다." + +#: taiga/base/api/pagination.py:232 +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "잘못된 페이지 (%(page_number)s): %(message)s" + +#: taiga/base/api/permissions.py:65 +msgid "Invalid permission definition." +msgstr "권한 정의가 잘못되었습니다." + +#: taiga/base/api/relations.py:247 +#, python-format +msgid "Invalid pk '%s' - object does not exist." +msgstr "잘못된 pk '%s' - 객체가 존재하지 않습니다." + +#: taiga/base/api/relations.py:248 +#, python-format +msgid "Incorrect type. Expected pk value, received %s." +msgstr "pk값을 받을거라 예상했지만 %s 를 받음. 정확하지 않은 형식" + +#: taiga/base/api/relations.py:336 +#, python-format +msgid "Object with %s=%s does not exist." +msgstr "%s = %s의 객체가 존재하지 않습니다." + +#: taiga/base/api/relations.py:372 +msgid "Invalid hyperlink - No URL match" +msgstr "잘못된 하이퍼 링크 - 일치하는 URL 없음" + +#: taiga/base/api/relations.py:373 +msgid "Invalid hyperlink - Incorrect URL match" +msgstr "잘못된 하이퍼 링크 - 잘못된 URL 일치" + +#: taiga/base/api/relations.py:374 +msgid "Invalid hyperlink due to configuration error" +msgstr "구성 오류로 인한 잘못된 하이퍼 링크" + +#: taiga/base/api/relations.py:375 +msgid "Invalid hyperlink - object does not exist." +msgstr "유효하지 않은 하이퍼링크 - 객체가 존재하지 않음." + +#: taiga/base/api/relations.py:376 +#, python-format +msgid "Incorrect type. Expected url string, received %s." +msgstr "url 문자를 받을거라 예상했지만 %s 를 받음. 정확하지 않은 형식" + +#: taiga/base/api/serializers.py:324 +msgid "Invalid data" +msgstr "데이터가 유효하지 않습니다." + +#: taiga/base/api/serializers.py:416 +msgid "No input provided" +msgstr "제공된 입력 없음" + +#: taiga/base/api/serializers.py:579 +msgid "Cannot create a new item, only existing items may be updated." +msgstr "새 항목을 만들 수 없으며 기존 항목 만 수정 할 수 있습니다." + +#: taiga/base/api/serializers.py:590 +msgid "Expected a list of items." +msgstr "예상되는 항목 목록." + +#: taiga/base/api/views.py:126 +msgid "Not found" +msgstr "찾지 못함" + +#: taiga/base/api/views.py:129 +msgid "Permission denied" +msgstr "권한이 없습니다" + +#: taiga/base/api/views.py:492 +msgid "Server application error" +msgstr "서버 애플리케이션 에러" + +#: taiga/base/connectors/exceptions.py:26 +msgid "Connection error." +msgstr "연결 에러" + +#: taiga/base/exceptions.py:79 +msgid "Malformed request." +msgstr "형식에 어긋난 요청." + +#: taiga/base/exceptions.py:84 +msgid "Incorrect authentication credentials." +msgstr "정확하지 않은 인증 자격 증명." + +#: taiga/base/exceptions.py:89 +msgid "Authentication credentials were not provided." +msgstr "인증 자격 증명이 제공되지 않았습니다." + +#: taiga/base/exceptions.py:94 +msgid "You do not have permission to perform this action." +msgstr "이 작업을 할 권한이 없습니다." + +#: taiga/base/exceptions.py:99 +#, python-format +msgid "Method '%s' not allowed." +msgstr "메서드 '%s' 가 허용되지 않았습니다." + +#: taiga/base/exceptions.py:107 +msgid "Could not satisfy the request's Accept header" +msgstr "요청의 Accept 헤더를 만족시킬 수 없습니다." + +#: taiga/base/exceptions.py:116 +#, python-format +msgid "Unsupported media type '%s' in request." +msgstr "요청시 지원되지 않는 미디어 유형 '%s'" + +#: taiga/base/exceptions.py:124 +msgid "Request was throttled." +msgstr "요청이 제한되었습니다." + +#: taiga/base/exceptions.py:125 +#, python-format +msgid "Expected available in %d second%s." +msgstr "%d 초%s에서 사용할 수 있습니다." + +#: taiga/base/exceptions.py:139 +msgid "Unexpected error" +msgstr "알 수 없는 에러" + +#: taiga/base/exceptions.py:151 +msgid "Not found." +msgstr "찾지 못함." + +#: taiga/base/exceptions.py:156 +msgid "Method not supported for this endpoint." +msgstr "이 끝점에서 지원되지 않는 메서드입니다." + +#: taiga/base/exceptions.py:164 taiga/base/exceptions.py:172 +msgid "Wrong arguments." +msgstr "잘못된 인수" + +#: taiga/base/exceptions.py:176 +msgid "Data validation error" +msgstr "데이터 검증 에러" + +#: taiga/base/exceptions.py:188 +msgid "Integrity Error for wrong or invalid arguments" +msgstr "잘못되었거나 유효하지 않은 인수에 대한 무결성 오류" + +#: taiga/base/exceptions.py:195 +msgid "Precondition error" +msgstr "필수조건 오류" + +#: taiga/base/exceptions.py:219 +msgid "No room left for more projects." +msgstr "더 많은 프로젝트를 위한 공간이 남지 않았습니다." + +#: taiga/base/filters.py:81 taiga/base/filters.py:463 +msgid "Error in filter params types." +msgstr "필터 매개 변수 유형에 오류가 있습니다." + +#: taiga/base/filters.py:136 taiga/base/filters.py:243 +#: taiga/projects/filters.py:64 +msgid "'project' must be an integer value." +msgstr "'project'는 반드시 정수이어야 합니다." + +#: taiga/base/templates/emails/base-body-html.jinja:6 +msgid "Taiga" +msgstr "타이가" + +#: taiga/base/templates/emails/base-body-html.jinja:421 +#: taiga/base/templates/emails/hero-body-html.jinja:380 +#: taiga/base/templates/emails/updates-body-html.jinja:442 +msgid "Follow us on Twitter" +msgstr "트위터 팔로우" + +#: taiga/base/templates/emails/base-body-html.jinja:421 +#: taiga/base/templates/emails/hero-body-html.jinja:380 +#: taiga/base/templates/emails/updates-body-html.jinja:442 +msgid "Twitter" +msgstr "트위터" + +#: taiga/base/templates/emails/base-body-html.jinja:422 +#: taiga/base/templates/emails/hero-body-html.jinja:381 +#: taiga/base/templates/emails/updates-body-html.jinja:443 +msgid "Get the code on GitHub" +msgstr "GitHub에서 코드 가져오기" + +#: taiga/base/templates/emails/base-body-html.jinja:422 +#: taiga/base/templates/emails/hero-body-html.jinja:381 +#: taiga/base/templates/emails/updates-body-html.jinja:443 +msgid "GitHub" +msgstr "GitHub" + +#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/hero-body-html.jinja:382 +#: taiga/base/templates/emails/updates-body-html.jinja:444 +msgid "Visit our website" +msgstr "웹 사이트 방문" + +#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/hero-body-html.jinja:382 +#: taiga/base/templates/emails/updates-body-html.jinja:444 +msgid "Taiga.io" +msgstr "Taiga.io" + +#: taiga/base/templates/emails/base-body-html.jinja:438 +#: taiga/base/templates/emails/hero-body-html.jinja:397 +#: taiga/base/templates/emails/updates-body-html.jinja:459 +#, python-format +msgid "" +"\n" +" Taiga Support:\n" +" %(support_url)s\n" +"
    \n" +" Contact us:\n" +" \n" +" %(support_email)s\n" +" \n" +"
    \n" +" Mailing list:\n" +" \n" +" %(mailing_list_url)s\n" +" \n" +" " +msgstr "" +"\n" +" 타이가 지원:\n" +" %(support_url)s\n" +"
    \n" +" 연락처:\n" +" \n" +" %(support_email)s\n" +" \n" +"
    \n" +" 메일링 목록:\n" +" \n" +" %(mailing_list_url)s\n" +" \n" +" " + +#: taiga/base/templates/emails/hero-body-html.jinja:6 +msgid "You have been Taigatized" +msgstr "당신은 타이가화 되었습니다." + +#: taiga/base/templates/emails/hero-body-html.jinja:359 +msgid "" +"\n" +"

    You have been Taigatized!" +"

    \n" +"

    Welcome to Taiga, an Open " +"Source, Agile Project Management Tool

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

    당신은 타이가화 되었습니" +"다!

    \n" +"

    타이가에 오신것을 환영합니" +"다, 오픈소스, 애자일 프로젝트 관리 도구

    \n" +" " + +#: taiga/base/templates/emails/updates-body-html.jinja:6 +msgid "[Taiga] Updates" +msgstr "[타이가] 업데이트" + +#: taiga/base/templates/emails/updates-body-html.jinja:417 +msgid "Updates" +msgstr "업데이트" + +#: taiga/base/templates/emails/updates-body-html.jinja:423 +#, python-format +msgid "" +"\n" +"

    comment:" +"

    \n" +"

    " +"%(comment)s

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

    댓글:" +"

    \n" +"

    " +"%(comment)s

    \n" +" " + +#: taiga/base/templates/emails/updates-body-text.jinja:6 +#, python-format +msgid "" +"\n" +" Comment: %(comment)s\n" +" " +msgstr "" +"\n" +" 댓글: %(comment)s\n" +" " + +#: taiga/export_import/api.py:127 +msgid "We needed at least one role" +msgstr "최소 한 개의 역할이 필요합니다." + +#: taiga/export_import/api.py:323 +msgid "Needed dump file" +msgstr "덤프 파일이 필요함" + +#: taiga/export_import/api.py:333 +msgid "Invalid dump format" +msgstr "잘못된 덤프 포맷" + +#: taiga/export_import/services/store.py:718 +#: taiga/export_import/services/store.py:736 +msgid "error importing project data" +msgstr "프로젝트 데이터를 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:743 +msgid "error importing roles" +msgstr "역할을 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:748 +msgid "error importing memberships" +msgstr "회원을 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:759 +msgid "error importing lists of project attributes" +msgstr "프로젝트 속성 목록을 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:763 +msgid "error importing default project attributes values" +msgstr "기본 프로젝트 속성값을 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:774 +msgid "error importing custom attributes" +msgstr "사용자 정의 속성을 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:778 +msgid "error importing sprints" +msgstr "스프린트를 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:782 +msgid "error importing issues" +msgstr "이슈를 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:786 +msgid "error importing user stories" +msgstr "유저 스토리를 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:790 +msgid "error importing epics" +msgstr "에픽을 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:794 +msgid "error importing tasks" +msgstr "태스크를 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:798 +msgid "error importing wiki pages" +msgstr "위키 페이지를 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:802 +msgid "error importing wiki links" +msgstr "위키 링크를 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:806 +msgid "error importing tags" +msgstr "태그를 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:810 +msgid "error importing timelines" +msgstr "타임라인을 가져오는 중 오류가 발생하였습니다." + +#: taiga/export_import/services/store.py:832 +msgid "unexpected error importing project" +msgstr "예상치 못한 프로젝트 가져 오기 오류가 발생하였습니다." + +#: taiga/export_import/tasks.py:62 taiga/export_import/tasks.py:63 +msgid "Error generating project dump" +msgstr "프로젝트 덤프를 생성하는 중 오류가 발생하였습니다." + +#: taiga/export_import/tasks.py:91 +#, python-brace-format +msgid "" +"\n" +"\n" +"Error loading dump by {user_full_name} <{user_email}>:\"\n" +"\n" +"\n" +"REASON:\n" +"-------\n" +"{reason}\n" +"\n" +"DETAILS:\n" +"--------\n" +"{details}\n" +"\n" +"TRACE ERROR:\n" +"------------" +msgstr "" +"\n" +"\n" +"{user_full_name} <{user_email}> 덤프를 로딩하던중 오류가 발생하였습니다.:\"\n" +"\n" +"\n" +"이유:\n" +"-------\n" +"{reason}\n" +"\n" +"상세정보:\n" +"--------\n" +"{details}\n" +"\n" +"에러 추적:\n" +"------------" + +#: taiga/export_import/tasks.py:120 +msgid "Error loading project dump" +msgstr "프로젝트 덤프를 로드하는 중 오류가 발생하였습니다." + +#: taiga/export_import/tasks.py:121 +msgid "Error loading your project dump file" +msgstr "프로젝트 덤프 파일을 로드하는 중 오류가 발생하였습니다." + +#: taiga/export_import/tasks.py:135 +msgid " -- no detail info --" +msgstr "-- 상세 정보가 없습니다. --" + +#: taiga/export_import/templates/emails/dump_project-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Project dump generated

    \n" +"

    Hello %(user)s,

    \n" +"

    Your dump from project %(project)s has been correctly generated.\n" +"

    You can download it here:

    \n" +" Download the dump file\n" +"

    This file will be deleted on %(deletion_date)s.

    \n" +"

    The Taiga Team

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

    프로젝트 덤프가 생성되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,

    \n" +"

    %(project)s 프로젝트의 덤프가 생성되었습니다.

    \n" +"

    여기서 다운로드 하실 수 있습니다.:

    \n" +" 덤프 파" +"일 다운로드\n" +"

    이 파일은 %(deletion_date)s 에 삭제됩니다.

    \n" +"

    타이가 팀

    \n" +" " + +#: taiga/export_import/templates/emails/dump_project-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your dump from project %(project)s has been correctly generated. You can " +"download it here:\n" +"\n" +"%(url)s\n" +"\n" +"This file will be deleted on %(deletion_date)s.\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"안녕하세요 %(user)s 님,\n" +"\n" +"%(project)s 프로젝트의 덤프가 생성되었습니다. 여기서 다운로드 하실 수 있습니" +"다.:\n" +"\n" +"%(url)s\n" +"\n" +"이 파일은 %(deletion_date)s 에 삭제됩니다.\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/export_import/templates/emails/dump_project-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your project dump has been generated" +msgstr "[%(project)s] 프로젝트 덤프가 생성되었습니다." + +#: taiga/export_import/templates/emails/export_error-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    %(error_message)s

    \n" +"

    Hello %(user)s,

    \n" +"

    Your project %(project)s has not been exported correctly.

    \n" +"

    The Taiga system administrators have been informed.
    Please, try " +"it again or contact with the support team at\n" +" %(support_email)s

    \n" +"

    The Taiga Team

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

    %(error_message)s

    \n" +"

    안녕하세요 %(user)s 님,

    \n" +"

    %(project)s 프로젝트를 내보낼 수 없었습니다.

    \n" +"

    타이가 시스템 관리자에게 알렸습니다.
    다시 시도하거나 지원팀에게 " +"문의해주세요.\n" +" %(support_email)s

    \n" +"

    타이가 팀

    \n" +" " + +#: taiga/export_import/templates/emails/export_error-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"%(error_message)s\n" +"Your project %(project)s has not been exported correctly.\n" +"\n" +"The Taiga system administrators have been informed.\n" +"\n" +"Please, try it again or contact with the support team at %(support_email)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"안녕하세요 %(user)s 님,\n" +"\n" +"%(error_message)s\n" +"%(project)s 프로젝트를 내보낼 수 없었습니다.\n" +"\n" +"타이가 시스템 관리자에게 알렸습니다.\n" +"\n" +"다시 시도하거나 지원팀에게 문의해주세요. %(support_email)s\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/export_import/templates/emails/export_error-subject.jinja:1 +#, python-format +msgid "[%(project)s] %(error_subject)s" +msgstr "[%(project)s] %(error_subject)s" + +#: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    %(error_message)s

    \n" +"

    Hello %(user)s,

    \n" +"

    Your project has not been importer correctly.

    \n" +"

    The Taiga system administrators have been informed.
    Please, try " +"it again or contact with the support team at\n" +" %(support_email)s

    \n" +"

    The Taiga Team

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

    %(error_message)s

    \n" +"

    안녕하세요 %(user)s 님,

    \n" +"

    프로젝트를 가져올 수 없었습니다.

    \n" +"

    타이가 시스템 관리자에게 알렸습니다.
    다시 시도하거나 지원팀에게 " +"문의해주세요.\n" +" %(support_email)s

    \n" +"

    타이가 팀

    \n" +" " + +#: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"%(error_message)s\n" +"\n" +"Your project has not been importer correctly.\n" +"\n" +"The Taiga system administrators have been informed.\n" +"\n" +"Please, try it again or contact with the support team at %(support_email)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"안녕하세요 %(user)s 님\n" +"\n" +"%(error_message)s\n" +"\n" +"프로젝트를 가져올 수 없었습니다.\n" +"\n" +"타이가 시스템 관리자에게 알렸습니다.\n" +"\n" +"다시 시도하거나 지원팀에게 문의해주세요. %(support_email)s\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/export_import/templates/emails/import_error-subject.jinja:1 +#, python-format +msgid "[Taiga] %(error_subject)s" +msgstr "[타이가] %(error_subject)s" + +#: taiga/export_import/templates/emails/load_dump-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Project dump imported

    \n" +"

    Hello %(user)s,

    \n" +"

    Your project dump has been correctly imported.

    \n" +" Go to %(project)s\n" +"

    The Taiga Team

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

    프로젝트 덤프 가져오기 완료

    \n" +"

    안녕하세요 %(user)s 님,

    \n" +"

    프로젝트 덤프를 가져오기 완료하였습니다.

    \n" +" %(project)s 프로젝트로 가기\n" +"

    타이가 팀

    \n" +" " + +#: taiga/export_import/templates/emails/load_dump-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your project dump has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"안녕하세요 %(user)s 님,\n" +"\n" +"프로젝트 덤프를 가져오기 완료하였습니다.\n" +"\n" +"%(project)s 프로젝트를 확인하실 수 있습니다.:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/export_import/templates/emails/load_dump-subject.jinja:1 +#, python-format +msgid "[%(project)s] Your project dump has been imported" +msgstr "[%(project)s] 프로젝트 덤프를 가져오기 하였습니다." + +#: taiga/export_import/validators/fields.py:144 +msgid "{}=\"{}\" not found in this project" +msgstr "{}=\"{}\" 이 프로젝트에서 찾을 수 없습니다." + +#: taiga/export_import/validators/validators.py:150 +#: taiga/projects/custom_attributes/validators.py:109 +msgid "Invalid content. It must be {\"key\": \"value\",...}" +msgstr "잘못된 컨텐츠. 반드시 {\"key\": \"value\",...} 형태이어야 합니다." + +#: taiga/export_import/validators/validators.py:165 +#: taiga/projects/custom_attributes/validators.py:124 +msgid "It contain invalid custom fields." +msgstr "유효하지 않은 사용자 정의 필드를 포함하고 있습니다." + +#: taiga/export_import/validators/validators.py:245 +#: taiga/projects/validators.py:54 +msgid "Name duplicated for the project" +msgstr "프로젝트 이름이 중복되었습니다." + +#: taiga/external_apps/api.py:43 taiga/external_apps/api.py:70 +#: taiga/external_apps/api.py:77 +msgid "Authentication required" +msgstr "인증 필요" + +#: taiga/external_apps/models.py:35 +#: taiga/projects/custom_attributes/models.py:36 +#: taiga/projects/milestones/models.py:37 taiga/projects/models.py:148 +#: taiga/projects/models.py:518 taiga/projects/models.py:551 +#: taiga/projects/models.py:587 taiga/projects/models.py:609 +#: taiga/projects/models.py:643 taiga/projects/models.py:663 +#: taiga/projects/models.py:683 taiga/projects/models.py:715 +#: taiga/projects/models.py:735 taiga/users/admin.py:54 +#: taiga/users/models.py:301 taiga/webhooks/models.py:29 +msgid "name" +msgstr "이름" + +#: taiga/external_apps/models.py:37 +msgid "Icon url" +msgstr "아이콘 url" + +#: taiga/external_apps/models.py:38 +msgid "web" +msgstr "웹" + +#: taiga/external_apps/models.py:39 taiga/projects/attachments/models.py:61 +#: taiga/projects/custom_attributes/models.py:37 +#: taiga/projects/epics/models.py:55 +#: taiga/projects/history/templatetags/functions.py:25 +#: taiga/projects/issues/models.py:60 taiga/projects/models.py:152 +#: taiga/projects/models.py:739 taiga/projects/tasks/models.py:62 +#: taiga/projects/userstories/models.py:95 +msgid "description" +msgstr "설명" + +#: taiga/external_apps/models.py:41 +msgid "Next url" +msgstr "다음 url" + +#: taiga/external_apps/models.py:55 taiga/projects/contact/models.py:26 +#: taiga/projects/likes/models.py:31 taiga/projects/notifications/models.py:87 +#: taiga/projects/votes/models.py:52 +msgid "user" +msgstr "유저" + +#: taiga/external_apps/models.py:59 +msgid "application" +msgstr "어플리케이션" + +#: taiga/feedback/models.py:25 taiga/users/models.py:139 +msgid "full name" +msgstr "성명" + +#: taiga/feedback/models.py:27 taiga/users/models.py:134 +msgid "email address" +msgstr "이메일 주소" + +#: taiga/feedback/models.py:29 taiga/projects/contact/models.py:31 +msgid "comment" +msgstr "댓글" + +#: taiga/feedback/models.py:31 taiga/projects/attachments/models.py:48 +#: taiga/projects/contact/models.py:34 +#: taiga/projects/custom_attributes/models.py:46 +#: taiga/projects/epics/models.py:48 taiga/projects/issues/models.py:52 +#: taiga/projects/likes/models.py:33 taiga/projects/milestones/models.py:48 +#: taiga/projects/models.py:159 taiga/projects/models.py:743 +#: taiga/projects/notifications/models.py:89 taiga/projects/tasks/models.py:48 +#: taiga/projects/userstories/models.py:87 taiga/projects/votes/models.py:54 +#: taiga/projects/wiki/models.py:44 taiga/userstorage/models.py:29 +msgid "created date" +msgstr "생성된 날짜" + +#: taiga/feedback/templates/emails/feedback_notification-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Feedback

    \n" +"

    Taiga has received feedback from %(full_name)s <%(email)s>

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

    피드백

    \n" +"

    타이가가 %(full_name)s <%(email)s>의 피드백을 받았습니다.

    \n" +" " + +#: taiga/feedback/templates/emails/feedback_notification-body-html.jinja:9 +#, python-format +msgid "" +"\n" +"

    Comment

    \n" +"

    %(comment)s

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

    댓글

    \n" +"

    %(comment)s

    \n" +" " + +#: taiga/feedback/templates/emails/feedback_notification-body-html.jinja:18 +#: taiga/projects/admin.py:106 taiga/users/admin.py:120 +msgid "Extra info" +msgstr "추가 정보" + +#: taiga/feedback/templates/emails/feedback_notification-body-text.jinja:1 +#, python-format +msgid "" +"---------\n" +"- From: %(full_name)s <%(email)s>\n" +"---------\n" +"- Comment:\n" +"%(comment)s\n" +"---------" +msgstr "" +"---------\n" +"- 보낸이: %(full_name)s <%(email)s>\n" +"---------\n" +"- 댓글:\n" +"%(comment)s\n" +"---------" + +#: taiga/feedback/templates/emails/feedback_notification-body-text.jinja:8 +msgid "- Extra info:" +msgstr "- 추가 정보:" + +#: taiga/feedback/templates/emails/feedback_notification-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[Taiga] Feedback from %(full_name)s <%(email)s>\n" +msgstr "" +"\n" +"[타이가] %(full_name)s <%(email)s>의 피드백\n" + +#: taiga/hooks/api.py:54 +msgid "The payload is not a valid json" +msgstr "페이로드의 json이 유효하지 않습니다." + +#: taiga/hooks/api.py:63 taiga/projects/epics/api.py:154 +#: taiga/projects/issues/api.py:139 taiga/projects/tasks/api.py:201 +#: taiga/projects/userstories/api.py:276 +msgid "The project doesn't exist" +msgstr "프로젝트가 존재하지 않습니다." + +#: taiga/hooks/api.py:66 +msgid "Bad signature" +msgstr "좋지 않은 기호" + +#: taiga/hooks/event_hooks.py:66 +#, python-brace-format +msgid "" +"[@{user_name}]({user_url} \"See @{user_name}'s {platform} profile\") says in " +"[{platform}#{number}]({comment_url} \"Go to comment\"):\n" +"\n" +"\"{comment_message}\"" +msgstr "" +"[@{user_name}]({user_url} \"@{user_name}'s {platform} 프로필 보기\") 님의 " +"[{platform}#{number}]({comment_url} \"댓글로 가기\") 플랫폼에서 한 말:\n" +"\n" +"\"{comment_message}\"" + +#: taiga/hooks/event_hooks.py:71 +#, python-brace-format +msgid "" +"Comment From {platform}:\n" +"\n" +"> {comment_message}" +msgstr "" +"{platform} 플랫폼으로부터의 댓글:\n" +"\n" +"> {comment_message}" + +#: taiga/hooks/event_hooks.py:84 +msgid "Invalid issue comment information" +msgstr "이슈 댓글 정보가 유효하지 않습니다." + +#: taiga/hooks/event_hooks.py:103 +#, python-brace-format +msgid "" +"Issue created by [@{user_name}]({user_url} \"See @{user_name}'s {platform} " +"profile\") from [{platform}#{number}]({url} \"Go to issue\")." +msgstr "" +"[@{user_name}]({user_url} \"@{user_name}'s {platform} 프로필 보기\") 님의 " +"[{platform}#{number}]({url} \"이슈로 가기\"). 플랫폼으로부터 이슈가 생성되었" +"습니다." + +#: taiga/hooks/event_hooks.py:107 +#, python-brace-format +msgid "Issue created from {platform}." +msgstr "{platform} 플랫폼으로부터 이슈가 생성되었습니다." + +#: taiga/hooks/event_hooks.py:120 +msgid "Invalid issue information" +msgstr "이슈 정보가 유효하지 않습니다." + +#: taiga/hooks/event_hooks.py:149 taiga/hooks/event_hooks.py:171 +msgid "unknown user" +msgstr "알수 없는 유저" + +#: taiga/hooks/event_hooks.py:156 +#, python-brace-format +msgid "" +"{user_text} changed the status from [{platform} commit]({commit_url} \"See " +"commit '{commit_id} - {commit_message}'\")\n" +"\n" +" - Status: **{src_status}** → **{dst_status}**" +msgstr "" +"{user_text} [{platform} commit]({commit_url} \"'{commit_id} - " +"{commit_message}' 댓글 보기\") 의 상태가 변경되었습니다.\n" +"\n" +" - 상태: **{src_status}** → **{dst_status}**" + +#: taiga/hooks/event_hooks.py:161 +#, python-brace-format +msgid "" +"Changed status from {platform} commit.\n" +"\n" +" - Status: **{src_status}** → **{dst_status}**" +msgstr "" +"{platform} 커밋으로부터 상태가 수정되었습니다..\n" +"\n" +" - 상태: **{src_status}** → **{dst_status}**" + +#: taiga/hooks/event_hooks.py:179 +#, python-brace-format +msgid "" +"This {type_name} has been mentioned by {user_text} in the [{platform} commit]" +"({commit_url} \"See commit '{commit_id} - {commit_message}'\") " +"\"{commit_message}\"" +msgstr "" +"[{platform} 커밋] {user_text} ({commit_url} \"'{commit_id} - " +"{commit_message}' 커밋 보기\") \"{commit_message}\" {type_name} 언급됨" + +#: taiga/hooks/event_hooks.py:184 +#, python-brace-format +msgid "" +"This issue has been mentioned in the {platform} commit \"{commit_message}\"" +msgstr "{platform} 커밋에서 이 이슈가 언급되었습니다. \"{commit_message}\"" + +#: taiga/hooks/event_hooks.py:206 +msgid "The referenced element doesn't exist" +msgstr "참조된 엘리먼트가 존재하지 않습니다." + +#: taiga/hooks/event_hooks.py:222 +msgid "The status doesn't exist" +msgstr "상태가 존재하지 않습니다." + +#: taiga/permissions/choices.py:23 taiga/permissions/choices.py:34 +msgid "View project" +msgstr "프로젝트 보기" + +#: taiga/permissions/choices.py:24 taiga/permissions/choices.py:36 +msgid "View milestones" +msgstr "마일스톤 보기" + +#: taiga/permissions/choices.py:25 taiga/permissions/choices.py:41 +msgid "View epic" +msgstr "에픽 보기" + +#: taiga/permissions/choices.py:26 +msgid "View user stories" +msgstr "유저 스토리 보기" + +#: taiga/permissions/choices.py:27 taiga/permissions/choices.py:53 +msgid "View tasks" +msgstr "태스크 보기" + +#: taiga/permissions/choices.py:28 taiga/permissions/choices.py:59 +msgid "View issues" +msgstr "이슈 보기" + +#: taiga/permissions/choices.py:29 taiga/permissions/choices.py:65 +msgid "View wiki pages" +msgstr "위키 페이지 보기" + +#: taiga/permissions/choices.py:30 taiga/permissions/choices.py:71 +msgid "View wiki links" +msgstr "위키 링크 보기" + +#: taiga/permissions/choices.py:37 +msgid "Add milestone" +msgstr "마일스톤 추가" + +#: taiga/permissions/choices.py:38 +msgid "Modify milestone" +msgstr "마일스톤 수정" + +#: taiga/permissions/choices.py:39 +msgid "Delete milestone" +msgstr "마일스톤 삭제" + +#: taiga/permissions/choices.py:42 +msgid "Add epic" +msgstr "에픽 추가" + +#: taiga/permissions/choices.py:43 +msgid "Modify epic" +msgstr "에픽 수정" + +#: taiga/permissions/choices.py:44 +msgid "Comment epic" +msgstr "에픽 댓글" + +#: taiga/permissions/choices.py:45 +msgid "Delete epic" +msgstr "에픽 삭제" + +#: taiga/permissions/choices.py:47 +msgid "View user story" +msgstr "유저 스토리 보기" + +#: taiga/permissions/choices.py:48 +msgid "Add user story" +msgstr "유저 스토리 추가" + +#: taiga/permissions/choices.py:49 +msgid "Modify user story" +msgstr "유저 스토리 수정" + +#: taiga/permissions/choices.py:50 +msgid "Comment user story" +msgstr "유저 스토리 댓글" + +#: taiga/permissions/choices.py:51 +msgid "Delete user story" +msgstr "유저 스토리 삭제" + +#: taiga/permissions/choices.py:54 +msgid "Add task" +msgstr "태스크 추가" + +#: taiga/permissions/choices.py:55 +msgid "Modify task" +msgstr "태스크 수정" + +#: taiga/permissions/choices.py:56 +msgid "Comment task" +msgstr "태스크 댓글" + +#: taiga/permissions/choices.py:57 +msgid "Delete task" +msgstr "태스크 삭제" + +#: taiga/permissions/choices.py:60 +msgid "Add issue" +msgstr "이슈 추가" + +#: taiga/permissions/choices.py:61 +msgid "Modify issue" +msgstr "이슈 수정" + +#: taiga/permissions/choices.py:62 +msgid "Comment issue" +msgstr "이슈 댓글" + +#: taiga/permissions/choices.py:63 +msgid "Delete issue" +msgstr "이슈 삭제" + +#: taiga/permissions/choices.py:66 +msgid "Add wiki page" +msgstr "위키 페이지 추가" + +#: taiga/permissions/choices.py:67 +msgid "Modify wiki page" +msgstr "위키 페이지 수정" + +#: taiga/permissions/choices.py:68 +msgid "Comment wiki page" +msgstr "위키 페이지 댓글" + +#: taiga/permissions/choices.py:69 +msgid "Delete wiki page" +msgstr "위키 페이지 삭제" + +#: taiga/permissions/choices.py:72 +msgid "Add wiki link" +msgstr "위키 링크 추가" + +#: taiga/permissions/choices.py:73 +msgid "Modify wiki link" +msgstr "위키 링크 수정" + +#: taiga/permissions/choices.py:74 +msgid "Delete wiki link" +msgstr "위키 링크 삭제" + +#: taiga/permissions/choices.py:78 +msgid "Modify project" +msgstr "프로젝트 수정" + +#: taiga/permissions/choices.py:79 +msgid "Delete project" +msgstr "프로젝트 삭제" + +#: taiga/permissions/choices.py:80 +msgid "Add member" +msgstr "회원 추가" + +#: taiga/permissions/choices.py:81 +msgid "Remove member" +msgstr "회원 삭제" + +#: taiga/permissions/choices.py:82 +msgid "Admin project values" +msgstr "운영자 프로젝트 값" + +#: taiga/permissions/choices.py:83 +msgid "Admin roles" +msgstr "운영자 역할" + +#: taiga/projects/admin.py:100 +msgid "Privacity" +msgstr "비공개" + +#: taiga/projects/admin.py:111 +msgid "Modules" +msgstr "모듈" + +#: taiga/projects/admin.py:119 +msgid "Default values" +msgstr "기본값" + +#: taiga/projects/admin.py:125 +msgid "Activity" +msgstr "활동" + +#: taiga/projects/admin.py:130 +msgid "Fans" +msgstr "좋아요" + +#: taiga/projects/admin.py:144 taiga/projects/attachments/models.py:39 +#: taiga/projects/epics/models.py:39 taiga/projects/issues/models.py:37 +#: taiga/projects/milestones/models.py:42 taiga/projects/models.py:164 +#: taiga/projects/notifications/models.py:62 taiga/projects/tasks/models.py:39 +#: taiga/projects/userstories/models.py:69 taiga/projects/wiki/models.py:40 +#: taiga/users/admin.py:69 taiga/userstorage/models.py:27 +msgid "owner" +msgstr "소유자" + +#: taiga/projects/admin.py:192 +#, python-brace-format +msgid "{count} successfully made public." +msgstr "{count} 개를 공개로 만드는데 성공하였습니다." + +#: taiga/projects/admin.py:193 +msgid "Make public" +msgstr "공개로 만들기" + +#: taiga/projects/admin.py:207 +#, python-brace-format +msgid "{count} successfully made private." +msgstr "{count} 개를 비공개로 만드는데 성공하였습니다." + +#: taiga/projects/admin.py:208 +msgid "Make private" +msgstr "비공개로 만들기" + +#: taiga/projects/admin.py:238 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "%(verbose_name_plural)s 선택된 것을 삭제" + +#: taiga/projects/api.py:152 taiga/users/api.py:244 +msgid "Incomplete arguments" +msgstr "매개변수가 완전하지 않습니다." + +#: taiga/projects/api.py:156 taiga/users/api.py:249 +msgid "Invalid image format" +msgstr "이미지 형식이 유효하지 않습니다." + +#: taiga/projects/api.py:217 +msgid "Not valid template name" +msgstr "탬플릿 이름이 유효하지 않습니다." + +#: taiga/projects/api.py:220 +msgid "Not valid template description" +msgstr "탬플릿 설명이 유효하지 않습니다." + +#: taiga/projects/api.py:346 +msgid "Invalid user id" +msgstr "사용자 아이디가 유효하지 않습니다." + +#: taiga/projects/api.py:352 +msgid "The user doesn't exist" +msgstr "사용자가 존재하지 않습니다." + +#: taiga/projects/api.py:356 +msgid "The user must be already a project member" +msgstr "프로젝트 회원이어야 합니다." + +#: taiga/projects/api.py:777 +msgid "" +"The project must have an owner and at least one of the users must be an " +"active admin" +msgstr "" +"프로젝트는 반드시 소유자가 있어야하며 사용자 중 적어도 한 명이 활성 관리자이" +"어야 합니다." + +#: taiga/projects/api.py:811 +msgid "You don't have permisions to see that." +msgstr "볼 수 있는 권한이 없습니다." + +#: taiga/projects/attachments/api.py:54 +msgid "Partial updates are not supported" +msgstr "부분 업데이트는 지원되지 않습니다." + +#: taiga/projects/attachments/api.py:69 +msgid "Object id issue isn't exists" +msgstr "객체 아이디의 이슈는 존재하지 않습니다." + +#: taiga/projects/attachments/api.py:72 +msgid "Project ID not matches between object and project" +msgstr "프로젝트 아이디가 객체와 프로젝트간에 알맞지 않습니다." + +#: taiga/projects/attachments/models.py:41 taiga/projects/contact/models.py:29 +#: taiga/projects/custom_attributes/models.py:43 +#: taiga/projects/epics/models.py:37 taiga/projects/issues/models.py:50 +#: taiga/projects/milestones/models.py:44 taiga/projects/models.py:506 +#: taiga/projects/models.py:528 taiga/projects/models.py:565 +#: taiga/projects/models.py:593 taiga/projects/models.py:619 +#: taiga/projects/models.py:649 taiga/projects/models.py:669 +#: taiga/projects/models.py:693 taiga/projects/models.py:721 +#: taiga/projects/notifications/models.py:74 +#: taiga/projects/notifications/models.py:91 taiga/projects/tasks/models.py:43 +#: taiga/projects/userstories/models.py:67 taiga/projects/wiki/models.py:34 +#: taiga/projects/wiki/models.py:72 taiga/users/models.py:312 +msgid "project" +msgstr "프로젝트" + +#: taiga/projects/attachments/models.py:43 +msgid "content type" +msgstr "컨텐츠 형태" + +#: taiga/projects/attachments/models.py:45 +msgid "object id" +msgstr "객체 아이디" + +#: taiga/projects/attachments/models.py:51 +#: taiga/projects/custom_attributes/models.py:48 +#: taiga/projects/epics/models.py:51 taiga/projects/issues/models.py:55 +#: taiga/projects/milestones/models.py:51 taiga/projects/models.py:162 +#: taiga/projects/models.py:746 taiga/projects/tasks/models.py:51 +#: taiga/projects/userstories/models.py:90 taiga/projects/wiki/models.py:47 +#: taiga/userstorage/models.py:31 +msgid "modified date" +msgstr "날짜가 변경되었습니다." + +#: taiga/projects/attachments/models.py:56 +msgid "attached file" +msgstr "파일이 첨부되었습니다." + +#: taiga/projects/attachments/models.py:58 +msgid "sha1" +msgstr "sha1" + +#: taiga/projects/attachments/models.py:60 +msgid "is deprecated" +msgstr "지원안함" + +#: taiga/projects/attachments/models.py:62 +#: taiga/projects/custom_attributes/models.py:41 +#: taiga/projects/epics/models.py:101 taiga/projects/milestones/models.py:57 +#: taiga/projects/models.py:522 taiga/projects/models.py:555 +#: taiga/projects/models.py:589 taiga/projects/models.py:613 +#: taiga/projects/models.py:645 taiga/projects/models.py:665 +#: taiga/projects/models.py:687 taiga/projects/models.py:717 +#: taiga/projects/wiki/models.py:77 taiga/users/models.py:307 +msgid "order" +msgstr "순서" + +#: taiga/projects/choices.py:23 +msgid "AppearIn" +msgstr "AppearIn" + +#: taiga/projects/choices.py:24 +msgid "Jitsi" +msgstr "Jitsi" + +#: taiga/projects/choices.py:25 +msgid "Custom" +msgstr "사용자 정의" + +#: taiga/projects/choices.py:26 +msgid "Talky" +msgstr "Talky" + +#: taiga/projects/choices.py:35 +msgid "This project is blocked due to payment failure" +msgstr "이 프로젝트는 결제 실패로 인해 차단되었습니다." + +#: taiga/projects/choices.py:36 +msgid "This project is blocked by admin staff" +msgstr "관리자에 의해 프로젝트가 차단되었습니다." + +#: taiga/projects/choices.py:37 +msgid "This project is blocked because the owner left" +msgstr "소유자가 남아 있어 프로젝트가 차단되었습니다." + +#: taiga/projects/choices.py:38 +msgid "This project is blocked while it's deleted" +msgstr "이 프로젝트는 삭제되는 동안 차단됩니다." + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:10 +#, python-format +msgid "" +"\n" +" %(full_name)s has " +"written to %(project_name)s\n" +" " +msgstr "" +"\n" +" %(full_name)s 님께서 " +"%(project_name)s 프로젝트에 글을 남겼습니다.\n" +" " + +#: taiga/projects/contact/templates/emails/contact_notification-body-html.jinja:20 +#, python-format +msgid "" +"\n" +" You are receiving this message because you are listed as " +"administrator of the project titled %(project_name)s. If you don't want " +"members of the Taiga community contacting your project, please update your project settings to prevent " +"such contacts. Regular communications amongst members of the project will " +"not be affected.\n" +" " +msgstr "" +"\n" +"이 메시지는 %(project_name)s 이름의 프로젝트 관리자로 되어있어 수신되었습니" +"다. 타이가 커뮤니티의 회원이 귀하의 프로젝트에 연락하기를 원치 않으시면, 프로젝트 설정 변경을 통해 차단하실 수 " +"있습니다. 프로젝트 회원간의 연락은 영향을 받지 않습니다." + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"%(full_name)s has written to %(project_name)s\n" +msgstr "" +"\n" +"%(full_name)s 님께서 %(project_name)s 프로젝트에 글을 남겼습니다.\n" + +#: taiga/projects/contact/templates/emails/contact_notification-body-text.jinja:7 +#, python-format +msgid "" +"\n" +"You are receiving this message because you are listed as administrator of " +"the project titled %(project_name)s. If you don't want members of the Taiga " +"community contacting your project, please update your project settings in " +"%(project_settings_url)s to prevent such contacts. Regular communications " +"amongst members of the project will not be affected.\n" +msgstr "" + +#: taiga/projects/contact/templates/emails/contact_notification-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[Taiga] %(full_name)s has sent a message to the project %(project_name)s\n" +msgstr "" +"\n" +"[Taiga] %(full_name)s 님께서 %(project_name)s 프로젝트에 메시지를 보냈습니" +"다.\n" + +#: taiga/projects/custom_attributes/choices.py:29 +msgid "Text" +msgstr "텍스트" + +#: taiga/projects/custom_attributes/choices.py:30 +msgid "Multi-Line Text" +msgstr "여러 줄의 텍스트" + +#: taiga/projects/custom_attributes/choices.py:31 +msgid "Rich text" +msgstr "서식있는 텍스트" + +#: taiga/projects/custom_attributes/choices.py:32 +msgid "Date" +msgstr "날짜" + +#: taiga/projects/custom_attributes/choices.py:33 +msgid "Url" +msgstr "Url" + +#: taiga/projects/custom_attributes/models.py:40 +#: taiga/projects/issues/models.py:45 +msgid "type" +msgstr "형태" + +#: taiga/projects/custom_attributes/models.py:95 +msgid "values" +msgstr "값" + +#: taiga/projects/custom_attributes/models.py:105 +msgid "epic" +msgstr "에픽" + +#: taiga/projects/custom_attributes/models.py:121 +#: taiga/projects/tasks/models.py:35 taiga/projects/userstories/models.py:38 +msgid "user story" +msgstr "유저 스토리" + +#: taiga/projects/custom_attributes/models.py:137 +msgid "task" +msgstr "태스크" + +#: taiga/projects/custom_attributes/models.py:153 +msgid "issue" +msgstr "이슈" + +#: taiga/projects/custom_attributes/validators.py:58 +msgid "Already exists one with the same name." +msgstr "이미 동일한 이름이 존재합니다." + +#: taiga/projects/epics/api.py:94 +msgid "You don't have permissions to set this status to this epic." +msgstr "이 에픽의 상태를 설정할 권한이 없습니다." + +#: taiga/projects/epics/models.py:35 taiga/projects/issues/models.py:35 +#: taiga/projects/tasks/models.py:37 taiga/projects/userstories/models.py:62 +msgid "ref" +msgstr "참조" + +#: taiga/projects/epics/models.py:42 taiga/projects/issues/models.py:39 +#: taiga/projects/tasks/models.py:41 taiga/projects/userstories/models.py:72 +msgid "status" +msgstr "상태" + +#: taiga/projects/epics/models.py:45 +msgid "epics order" +msgstr "에픽 순서" + +#: taiga/projects/epics/models.py:54 taiga/projects/issues/models.py:59 +#: taiga/projects/tasks/models.py:55 taiga/projects/userstories/models.py:94 +msgid "subject" +msgstr "제목" + +#: taiga/projects/epics/models.py:58 taiga/projects/models.py:526 +#: taiga/projects/models.py:561 taiga/projects/models.py:617 +#: taiga/projects/models.py:647 taiga/projects/models.py:667 +#: taiga/projects/models.py:691 taiga/projects/models.py:719 +#: taiga/users/models.py:141 +msgid "color" +msgstr "색" + +#: taiga/projects/epics/models.py:61 taiga/projects/issues/models.py:63 +#: taiga/projects/tasks/models.py:65 taiga/projects/userstories/models.py:98 +msgid "assigned to" +msgstr "할당됨" + +#: taiga/projects/epics/models.py:63 taiga/projects/userstories/models.py:100 +msgid "is client requirement" +msgstr "고객 요구 사항" + +#: taiga/projects/epics/models.py:65 taiga/projects/userstories/models.py:102 +msgid "is team requirement" +msgstr "팀 요구 사항" + +#: taiga/projects/epics/models.py:69 +msgid "user stories" +msgstr "유저 스토리" + +#: taiga/projects/epics/validators.py:37 +msgid "There's no epic with that id" +msgstr "아이디를 가진 에픽이 없습니다." + +#: taiga/projects/history/api.py:93 +msgid "comment is required" +msgstr "comment가 필수입니다." + +#: taiga/projects/history/api.py:96 +msgid "deleted comments can't be edited" +msgstr "삭제된 댓글은 수정할 수 없습니다." + +#: taiga/projects/history/api.py:130 +msgid "Comment already deleted" +msgstr "댓글이 이미 삭제되었습니다." + +#: taiga/projects/history/api.py:151 +msgid "Comment not deleted" +msgstr "댓글이 삭제되지 않았습니다." + +#: taiga/projects/history/choices.py:31 +msgid "Change" +msgstr "수정" + +#: taiga/projects/history/choices.py:32 +msgid "Create" +msgstr "생성" + +#: taiga/projects/history/choices.py:33 +msgid "Delete" +msgstr "삭제" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:23 +#, python-format +msgid "%(role)s role points" +msgstr "%(role)s 역할 포인트" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:26 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:131 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:134 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:157 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:211 +msgid "from" +msgstr "보낸이" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:32 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:142 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:145 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:163 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:188 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:217 +msgid "to" +msgstr "받는이" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:44 +msgid "Added new attachment" +msgstr "새로운 첨부파일이 추가되었습니다." + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:62 +msgid "Updated attachment" +msgstr "첨부파일이 수정되었습니다." + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:68 +msgid "deprecated" +msgstr "지원하지 않음" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:70 +msgid "not deprecated" +msgstr "아직 지원중임" + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:86 +msgid "Deleted attachment" +msgstr "첨부파일이 삭제되었습니다." + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:105 +msgid "added" +msgstr "추가되었습니다." + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:110 +msgid "removed" +msgstr "삭제되었습니다." + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:135 +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:146 +#: taiga/projects/services/stats.py:55 taiga/projects/services/stats.py:56 +msgid "Unassigned" +msgstr "할당되지 않았습니다." + +#: taiga/projects/history/templates/emails/includes/fields_diff-html.jinja:230 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:87 +msgid "-deleted-" +msgstr "-삭제되었습니다-" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +msgid "to:" +msgstr "받는이:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:21 +msgid "from:" +msgstr "보낸이:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:27 +msgid "Added" +msgstr "추가되었습니다." + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:34 +msgid "Changed" +msgstr "수정되었습니다." + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:41 +msgid "Deleted" +msgstr "삭제되었습니다." + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:55 +msgid "added:" +msgstr "추가되었습니다:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:58 +msgid "removed:" +msgstr "삭제되었습니다:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:63 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:80 +msgid "From:" +msgstr "보낸이:" + +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:64 +#: taiga/projects/history/templates/emails/includes/fields_diff-text.jinja:81 +msgid "To:" +msgstr "받는이:" + +#: taiga/projects/history/templatetags/functions.py:26 +#: taiga/projects/wiki/models.py:38 +msgid "content" +msgstr "컨텐츠" + +#: taiga/projects/history/templatetags/functions.py:27 +#: taiga/projects/mixins/blocked.py:33 +msgid "blocked note" +msgstr "차단된 노트" + +#: taiga/projects/history/templatetags/functions.py:28 +msgid "sprint" +msgstr "스프린트" + +#: taiga/projects/issues/api.py:157 +msgid "You don't have permissions to set this sprint to this issue." +msgstr "이 이슈의 스프린트를 설정할 권한이 없습니다." + +#: taiga/projects/issues/api.py:161 +msgid "You don't have permissions to set this status to this issue." +msgstr "이 이슈의 상태를 설정할 권한이 없습니다." + +#: taiga/projects/issues/api.py:165 +msgid "You don't have permissions to set this severity to this issue." +msgstr "이 이슈의 심각도를 설정할 권한이 없습니다." + +#: taiga/projects/issues/api.py:169 +msgid "You don't have permissions to set this priority to this issue." +msgstr "이 우선 순위의 형태를 설정할 권한이 없습니다." + +#: taiga/projects/issues/api.py:173 +msgid "You don't have permissions to set this type to this issue." +msgstr "이 이슈에 형태를 설정할 권한이 없습니다." + +#: taiga/projects/issues/models.py:41 +msgid "severity" +msgstr "심각도" + +#: taiga/projects/issues/models.py:43 +msgid "priority" +msgstr "우선 순위" + +#: taiga/projects/issues/models.py:48 taiga/projects/tasks/models.py:46 +#: taiga/projects/userstories/models.py:65 +msgid "milestone" +msgstr "마일스톤" + +#: taiga/projects/issues/models.py:57 taiga/projects/tasks/models.py:53 +msgid "finished date" +msgstr "종료된 날짜" + +#: taiga/projects/issues/models.py:66 taiga/projects/tasks/models.py:70 +#: taiga/projects/userstories/models.py:109 +msgid "external reference" +msgstr "외부 참조" + +#: taiga/projects/likes/models.py:36 +msgid "Like" +msgstr "좋아요" + +#: taiga/projects/likes/models.py:37 +msgid "Likes" +msgstr "좋아요" + +#: taiga/projects/milestones/models.py:40 taiga/projects/models.py:150 +#: taiga/projects/models.py:520 taiga/projects/models.py:553 +#: taiga/projects/models.py:611 taiga/projects/models.py:685 +#: taiga/projects/models.py:737 taiga/projects/wiki/models.py:36 +#: taiga/users/admin.py:58 taiga/users/models.py:303 +msgid "slug" +msgstr "슬러그" + +#: taiga/projects/milestones/models.py:45 +msgid "estimated start date" +msgstr "예측 시작일" + +#: taiga/projects/milestones/models.py:46 +msgid "estimated finish date" +msgstr "예측 종료일" + +#: taiga/projects/milestones/models.py:53 taiga/projects/models.py:524 +#: taiga/projects/models.py:557 taiga/projects/models.py:615 +#: taiga/projects/models.py:689 +msgid "is closed" +msgstr "완료됨" + +#: taiga/projects/milestones/models.py:55 +msgid "disponibility" +msgstr "가용성" + +#: taiga/projects/milestones/models.py:79 +msgid "The estimated start must be previous to the estimated finish." +msgstr "예측 시작은 반드시 예측 종료보다 이전이어야 합니다." + +#: taiga/projects/milestones/validators.py:33 +msgid "There's no milestone with that id" +msgstr "아이디를 가진 마일스톤이 없습니다." + +#: taiga/projects/mixins/blocked.py:31 +msgid "is blocked" +msgstr "차단됨" + +#: taiga/projects/mixins/by_ref.py:32 +msgid "ref param is needed" +msgstr "ref 매개변수가 필요합니다." + +#: taiga/projects/mixins/by_ref.py:35 +msgid "project or project__slug param is needed" +msgstr "project 또는 project__slug 매개변수가 필요합니다." + +#: taiga/projects/mixins/ordering.py:49 +#, python-brace-format +msgid "'{param}' parameter is mandatory" +msgstr "'{param}' 매개변수는 필수입니다." + +#: taiga/projects/mixins/ordering.py:53 +msgid "'project' parameter is mandatory" +msgstr "'project' 매개변수는 필수입니다." + +#: taiga/projects/models.py:79 +msgid "email" +msgstr "이메일" + +#: taiga/projects/models.py:81 +msgid "create at" +msgstr "생성일" + +#: taiga/projects/models.py:83 taiga/users/models.py:156 +msgid "token" +msgstr "토큰" + +#: taiga/projects/models.py:89 +msgid "invitation extra text" +msgstr "초대장 추가 문자" + +#: taiga/projects/models.py:92 taiga/projects/models.py:741 +msgid "user order" +msgstr "유저 순서" + +#: taiga/projects/models.py:108 +msgid "The user is already member of the project" +msgstr "이미 프로젝트의 일원입니다." + +#: taiga/projects/models.py:115 +msgid "default epic status" +msgstr "기본 에픽 상태" + +#: taiga/projects/models.py:119 +msgid "default US status" +msgstr "기본 유저 스토리 상태" + +#: taiga/projects/models.py:122 +msgid "default points" +msgstr "기본 포인트" + +#: taiga/projects/models.py:126 +msgid "default task status" +msgstr "기본 태스크 상태" + +#: taiga/projects/models.py:129 +msgid "default priority" +msgstr "기본 우선순위" + +#: taiga/projects/models.py:132 +msgid "default severity" +msgstr "기본 심각도" + +#: taiga/projects/models.py:136 +msgid "default issue status" +msgstr "기본 이슈 상태" + +#: taiga/projects/models.py:140 +msgid "default issue type" +msgstr "기본 이슈 형태" + +#: taiga/projects/models.py:156 +msgid "logo" +msgstr "로고" + +#: taiga/projects/models.py:166 +msgid "members" +msgstr "회원" + +#: taiga/projects/models.py:169 +msgid "total of milestones" +msgstr "마일스톤 합계" + +#: taiga/projects/models.py:170 +msgid "total story points" +msgstr "총 스토리 포인트" + +#: taiga/projects/models.py:172 taiga/projects/models.py:751 +msgid "active contact" +msgstr "연락처 활성" + +#: taiga/projects/models.py:174 taiga/projects/models.py:753 +msgid "active epics panel" +msgstr "에픽 활성" + +#: taiga/projects/models.py:176 taiga/projects/models.py:755 +msgid "active backlog panel" +msgstr "백로그 활성" + +#: taiga/projects/models.py:178 taiga/projects/models.py:757 +msgid "active kanban panel" +msgstr "칸반 활성" + +#: taiga/projects/models.py:180 taiga/projects/models.py:759 +msgid "active wiki panel" +msgstr "위키 활성" + +#: taiga/projects/models.py:182 taiga/projects/models.py:761 +msgid "active issues panel" +msgstr "이슈 활성" + +#: taiga/projects/models.py:185 taiga/projects/models.py:768 +msgid "videoconference system" +msgstr "화상회의 시스템" + +#: taiga/projects/models.py:187 taiga/projects/models.py:770 +msgid "videoconference extra data" +msgstr "화상회의 추가 데이터" + +#: taiga/projects/models.py:193 +msgid "creation template" +msgstr "탬플릿 생성" + +#: taiga/projects/models.py:196 taiga/users/admin.py:62 +msgid "is private" +msgstr "비공개" + +#: taiga/projects/models.py:198 +msgid "anonymous permissions" +msgstr "익명 사용자 권한" + +#: taiga/projects/models.py:200 +msgid "user permissions" +msgstr "사용자 권한" + +#: taiga/projects/models.py:203 +msgid "is featured" +msgstr "추천됨" + +#: taiga/projects/models.py:206 taiga/projects/models.py:763 +msgid "is looking for people" +msgstr "구인중" + +#: taiga/projects/models.py:208 taiga/projects/models.py:765 +msgid "looking for people note" +msgstr "" + +#: taiga/projects/models.py:222 +msgid "project transfer token" +msgstr "프로젝트 이전 토큰" + +#: taiga/projects/models.py:226 +msgid "blocked code" +msgstr "코드 차단됨" + +#: taiga/projects/models.py:229 taiga/projects/notifications/models.py:66 +msgid "updated date time" +msgstr "날짜 시간 수정됨" + +#: taiga/projects/models.py:232 taiga/projects/models.py:244 +#: taiga/projects/votes/models.py:30 +msgid "count" +msgstr "개수" + +#: taiga/projects/models.py:235 +msgid "fans last week" +msgstr "지난 주의 좋아요" + +#: taiga/projects/models.py:238 +msgid "fans last month" +msgstr "지난 달의 좋아요" + +#: taiga/projects/models.py:241 +msgid "fans last year" +msgstr "작년의 좋아요" + +#: taiga/projects/models.py:248 +msgid "activity last week" +msgstr "지난 주의 활동" + +#: taiga/projects/models.py:252 +msgid "activity last month" +msgstr "지난 달의 활동" + +#: taiga/projects/models.py:256 +msgid "activity last year" +msgstr "작년의 활동" + +#: taiga/projects/models.py:507 +msgid "modules config" +msgstr "모듈 설정" + +#: taiga/projects/models.py:559 +msgid "is archived" +msgstr "보관됨" + +#: taiga/projects/models.py:563 +msgid "work in progress limit" +msgstr "작업 진행 한계" + +#: taiga/projects/models.py:591 taiga/userstorage/models.py:33 +msgid "value" +msgstr "값" + +#: taiga/projects/models.py:749 +msgid "default owner's role" +msgstr "소유자의 기본 역할" + +#: taiga/projects/models.py:772 +msgid "default options" +msgstr "기본 옵션" + +#: taiga/projects/models.py:773 +msgid "epic statuses" +msgstr "에픽 상태" + +#: taiga/projects/models.py:774 +msgid "us statuses" +msgstr "유저 스토리 상태" + +#: taiga/projects/models.py:775 taiga/projects/userstories/models.py:44 +#: taiga/projects/userstories/models.py:77 +msgid "points" +msgstr "포인트" + +#: taiga/projects/models.py:776 +msgid "task statuses" +msgstr "태스크 상태" + +#: taiga/projects/models.py:777 +msgid "issue statuses" +msgstr "이슈 상태" + +#: taiga/projects/models.py:778 +msgid "issue types" +msgstr "이슈 형태" + +#: taiga/projects/models.py:779 +msgid "priorities" +msgstr "우선순위" + +#: taiga/projects/models.py:780 +msgid "severities" +msgstr "심각도" + +#: taiga/projects/models.py:781 +msgid "roles" +msgstr "역할" + +#: taiga/projects/models.py:782 +msgid "epic custom attributes" +msgstr "에픽 사용자 정의 속성" + +#: taiga/projects/models.py:783 +msgid "us custom attributes" +msgstr "유저 스토리 사용자 정의 속성" + +#: taiga/projects/models.py:784 +msgid "task custom attributes" +msgstr "태스크 사용자 정의 속성" + +#: taiga/projects/models.py:785 +msgid "issue custom attributes" +msgstr "이슈 사용자 정의 속성" + +#: taiga/projects/notifications/choices.py:30 +msgid "Involved" +msgstr "관련됨" + +#: taiga/projects/notifications/choices.py:31 +msgid "All" +msgstr "모두" + +#: taiga/projects/notifications/choices.py:32 +msgid "None" +msgstr "없음" + +#: taiga/projects/notifications/models.py:64 +msgid "created date time" +msgstr "날짜 시간 생성됨" + +#: taiga/projects/notifications/models.py:68 +msgid "history entries" +msgstr "내역 항목" + +#: taiga/projects/notifications/models.py:71 +msgid "notify users" +msgstr "사용자 알림" + +#: taiga/projects/notifications/models.py:93 +#: taiga/projects/notifications/models.py:94 +msgid "Watched" +msgstr "구독됨" + +#: taiga/projects/notifications/services.py:65 +#: taiga/projects/notifications/services.py:79 +msgid "Notify exists for specified user and project" +msgstr "지정된 사용자 및 프로젝트에 대한 알림이 있습니다." + +#: taiga/projects/notifications/services.py:436 +msgid "Invalid value for notify level" +msgstr "알림 수준의 값이 유효하지 않습니다." + +#: taiga/projects/notifications/templates/emails/epics/epic-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Epic updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a epic on %(project)s\n" +"

    Epic #%(ref)s %(subject)s

    \n" +" See epic\n" +" " +msgstr "" +"\n" +"

    에픽이 수정되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 에픽을 수정하셨습니다.

    \n" +"

    #%(ref)s %(subject)s 에픽

    \n" +" 에픽 보기" + +#: taiga/projects/notifications/templates/emails/epics/epic-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Epic updated\n" +"Hello %(user)s, %(changer)s has updated a epic on %(project)s\n" +"See epic #%(ref)s %(subject)s at %(url)s\n" +msgstr "" +"\n" +"에픽이 수정되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 에픽을 수정" +"하셨습니다.\n" +"#%(ref)s %(subject)s 에픽 보기 %(url)s\n" + +#: taiga/projects/notifications/templates/emails/epics/epic-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the epic #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s %(subject)s 에픽이 수정되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/epics/epic-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New epic created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new epic on " +"%(project)s

    \n" +"

    Epic #%(ref)s %(subject)s

    \n" +" See epic\n" +"

    The Taiga Team

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

    새로운 에픽이 생성되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"에 새로운 에픽을 생성하셨습니다.

    \n" +"

    #%(ref)s %(subject)s 에픽

    \n" +" 에픽 보기\n" +"

    타이가 팀

    " + +#: taiga/projects/notifications/templates/emails/epics/epic-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New epic created\n" +"Hello %(user)s, %(changer)s has created a new epic on %(project)s\n" +"See epic #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"새로운 에픽이 생성되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트에 새로운 에픽" +"이 생성하셨습니다.\n" +"#%(ref)s %(subject)s 에픽 보기 %(url)s\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/epics/epic-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the epic #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s %(subject)s 에픽이 생성되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/epics/epic-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Epic deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a epic on %(project)s\n" +"

    Epic #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

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

    에픽이 삭제되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 에픽을 삭제하셨습니다.

    \n" +"

    #%(ref)s %(subject)s 에픽

    \n" +"

    타이가 팀

    " + +#: taiga/projects/notifications/templates/emails/epics/epic-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Epic deleted\n" +"Hello %(user)s, %(changer)s has deleted a epic on %(project)s\n" +"Epic #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"에픽이 삭제되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 에픽을 삭제" +"하셨습니다.\n" +"#%(ref)s %(subject)s 에픽\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/epics/epic-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the epic #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s %(subject)s 에픽이 삭제되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Issue updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated an issue on %(project)s\n" +"

    Issue #%(ref)s %(subject)s

    \n" +" See issue\n" +" " +msgstr "" +"\n" +"

    이슈가 수정되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 이슈를 수정하셨습니다.

    \n" +"

    #%(ref)s %(subject)s 이슈

    \n" +" 이슈 보기" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Issue updated\n" +"Hello %(user)s, %(changer)s has updated an issue on %(project)s\n" +"See issue #%(ref)s %(subject)s at %(url)s\n" +msgstr "" +"\n" +"이슈가 수정되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 이슈를 수정" +"하셨습니다.\n" +"#%(ref)s %(subject)s 이슈 보기 %(url)s\n" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s %(subject)s 이슈가 수정되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New issue created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new issue on " +"%(project)s

    \n" +"

    Issue #%(ref)s %(subject)s

    \n" +" See issue\n" +"

    The Taiga Team

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

    새로운 이슈가 생성되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"에 새로운 이슈를 생성하셨습니다.

    \n" +"

    #%(ref)s %(subject)s 이슈

    \n" +" 이슈 보기\n" +"

    타이가 팀

    " + +#: taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New issue created\n" +"Hello %(user)s, %(changer)s has created a new issue on %(project)s\n" +"See issue #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"새로운 이슈가 생성되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트에 새로운 이슈" +"를 생성하셨습니다.\n" +"#%(ref)s %(subject)s 이슈 보기 %(url)s\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s %(subject)s 이슈가 생성되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Issue deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted an issue on %(project)s\n" +"

    Issue #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

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

    이슈가 삭제되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 이슈를 삭제하셨습니다.

    \n" +"

    #%(ref)s %(subject)s 이슈

    \n" +"

    타이가 팀

    " + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Issue deleted\n" +"Hello %(user)s, %(changer)s has deleted an issue on %(project)s\n" +"Issue #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"이슈가 수정되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 이슈를 삭제" +"하셨습니다.\n" +"#%(ref)s %(subject)s 이슈\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s %(subject)s 이슈가 삭제되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Sprint updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated an sprint on " +"%(project)s

    \n" +"

    Sprint %(name)s

    \n" +" See sprint\n" +" " +msgstr "" +"\n" +"

    스프린트가 수정되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 스프린트를 수정하셨습니다.

    \n" +"

    %(name)s 스프린트

    \n" +" 스프린트 보기\n" +"

    타이가 팀

    " + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Sprint updated\n" +"Hello %(user)s, %(changer)s has updated a sprint on %(project)s\n" +"See sprint %(name)s at %(url)s\n" +msgstr "" +"\n" +"스프린트가 수정되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 스프린트를 " +"수정하셨습니다.\n" +"%(name)s 스프린트 보기 %(url)s\n" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the sprint \"%(milestone)s\"\n" +msgstr "" +"\n" +"[%(project)s] \"%(milestone)s\" 스프린트가 수정되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New sprint created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new sprint on " +"%(project)s

    \n" +"

    Sprint %(name)s

    \n" +" See " +"sprint\n" +"

    The Taiga Team

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

    스프린트가 생성되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"에 새로운 스프린트를 생성하셨습니다.

    \n" +"

    %(name)s 스프린트

    \n" +" 스" +"프린트 보기\n" +"

    타이가 팀

    " + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New sprint created\n" +"Hello %(user)s, %(changer)s has created a new sprint on %(project)s\n" +"See sprint %(name)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"새로운 스프린트가 생성되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트에 새로운 스프" +"린트를 생성하셨습니다.\n" +"%(name)s 스프린트 보기 %(url)s\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the sprint \"%(milestone)s\"\n" +msgstr "" +"\n" +"[%(project)s] \"%(milestone)s\" 스프린트가 생성되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Sprint deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted an sprint on " +"%(project)s

    \n" +"

    Sprint %(name)s

    \n" +"

    The Taiga Team

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

    스프린트가 삭제되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 스프린트를 삭제하셨습니다.

    \n" +"

    %(name)s 스프린트

    \n" +"

    타이가 팀

    \n" +" " + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Sprint deleted\n" +"Hello %(user)s, %(changer)s has deleted an sprint on %(project)s\n" +"Sprint %(name)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"스프린트가 삭제되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 스프린트를 " +"삭제하셨습니다.\n" +"%(name)s 스프린트\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the Sprint \"%(milestone)s\"\n" +msgstr "" +"\n" +"[%(project)s] \"%(milestone)s\" 스프린트가 삭제되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Task updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a task on %(project)s\n" +"

    Task #%(ref)s %(subject)s

    \n" +" See task\n" +" " +msgstr "" +"\n" +"

    태스크가 수정되었습니다

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 태스크를 수정하셨습니다.

    \n" +"

    #%(ref)s %(subject)s 태스크

    \n" +" 태스크 보기" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Task updated\n" +"Hello %(user)s, %(changer)s has updated a task on %(project)s\n" +"See task #%(ref)s %(subject)s at %(url)s\n" +msgstr "" +"\n" +"태스크가 수정되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 태스크를 수" +"정하셨습니다.\n" +"#%(ref)s %(subject)s 태스크 보기 %(url)s\n" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the task #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s \"%(subject)s\" 태스크가 수정되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New task created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new task on " +"%(project)s

    \n" +"

    Task #%(ref)s %(subject)s

    \n" +" See task\n" +"

    The Taiga Team

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

    새로운 태스크가 생성되었습니다

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"에 새로운 태스크를 생성하셨습니다.

    \n" +"

    태스크 #%(ref)s %(subject)s

    \n" +" 태스크 보기\n" +"

    타이가 팀

    " + +#: taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New task created\n" +"Hello %(user)s, %(changer)s has created a new task on %(project)s\n" +"See task #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"태스크가 생성되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트에 새로운 태스" +"크를 생성하셨습니다.\n" +"#%(ref)s %(subject)s 태스크 보기 %(url)s\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the task #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s \"%(subject)s\" 태스크가 생성되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Task deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a task on %(project)s\n" +"

    Task #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

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

    태스크가 삭제되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 태스크를 삭제하셨습니다.

    \n" +"

    #%(ref)s %(subject)s 태스크

    \n" +"

    타이가 팀

    \n" +" " + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Task deleted\n" +"Hello %(user)s, %(changer)s has deleted a task on %(project)s\n" +"Task #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"태스크가 삭제되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 태스크를 삭" +"제하셨습니다.\n" +"#%(ref)s %(subject)s 태스크\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the task #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s \"%(subject)s\" 태스크가 삭제되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    User Story updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a user story on " +"%(project)s

    \n" +"

    User Story #%(ref)s %(subject)s

    \n" +" See user story\n" +" " +msgstr "" +"\n" +"

    유저 스토리가 수정되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 유저 스토리를 수정하셨습니다.

    \n" +"

    #%(ref)s %(subject)s 유저 스토리

    \n" +" 유저 스토리 보기\n" +" " + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"User story updated\n" +"Hello %(user)s, %(changer)s has updated a user story on %(project)s\n" +"See user story #%(ref)s %(subject)s at %(url)s\n" +msgstr "" +"\n" +"유저 스토리가 수정되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 유저 스토리" +"를 수정하셨습니다.\n" +"#%(ref)s %(subject)s 유저 스토리 보기 %(url)s\n" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the US #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s \"%(subject)s\" 유저 스토리가 수정되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New user story created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new user story on " +"%(project)s

    \n" +"

    User Story #%(ref)s %(subject)s

    \n" +" See user story\n" +"

    The Taiga Team

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

    새로운 유저 스토리가 생성되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"에 새로운 유저 스토리를 생성하셨습니다.

    \n" +"

    #%(ref)s %(subject)s 유저 스토리

    \n" +" 유저 스토리 보기\n" +"

    타이가 팀

    \n" +"\n" +" " + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New user story created\n" +"Hello %(user)s, %(changer)s has created a new user story on %(project)s\n" +"See user story #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"새로운 유저 스토리가 생성되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트에 새로운 유" +"저 스토리를 생성하셨습니다.\n" +"#%(ref)s %(subject)s 유저 스토리 보기 %(url)s\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the US #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s \"%(subject)s\" 유저 스토리가 생성되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    User Story deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a user story on " +"%(project)s

    \n" +"

    User Story #%(ref)s %(subject)s

    \n" +"

    The Taiga Team

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

    유저 스토리가 삭제되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 유저 스토리를 삭제하셨습니다.s

    \n" +"

    #%(ref)s %(subject)s 유저 스토리

    \n" +"

    타이가 팀

    " + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"User Story deleted\n" +"Hello %(user)s, %(changer)s has deleted a user story on %(project)s\n" +"User Story #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"유저 스토리가 삭제되었습니다.\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 유저 스토리" +"를 삭제하셨습니다.\n" +"#%(ref)s %(subject)s 유저 스토리\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the US #%(ref)s \"%(subject)s\"\n" +msgstr "" +"\n" +"[%(project)s] #%(ref)s \"%(subject)s\" 유저 스토리가 삭제되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Wiki Page updated

    \n" +"

    Hello %(user)s,
    %(changer)s has updated a wiki page on " +"%(project)s

    \n" +"

    Wiki page %(page)s

    \n" +" See Wiki Page\n" +" " +msgstr "" +"\n" +"

    위키 페이지가 수정되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 위키 페이지를 수정하셨습니다.

    \n" +"

    %(page)s 위키 페이지

    \n" +" " +"위키 페이지 보기\n" +" " + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Wiki Page updated\n" +"\n" +"Hello %(user)s, %(changer)s has updated a wiki page on %(project)s\n" +"\n" +"See wiki page %(page)s at %(url)s\n" +msgstr "" +"\n" +"위키 페이지가 수정되었습니다.\n" +"\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 위키 페이지" +"를 수정하셨습니다.\n" +"\n" +"%(page)s 위키 페이지 보기 %(url)s\n" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the Wiki Page \"%(page)s\"\n" +msgstr "" +"\n" +"[%(project)s] \"%(page)s\" 위키 페이지가 수정되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    New wiki page created

    \n" +"

    Hello %(user)s,
    %(changer)s has created a new wiki page on " +"%(project)s

    \n" +"

    Wiki page %(page)s

    \n" +" See " +"wiki page\n" +"

    The Taiga Team

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

    새로운 위키 페이지가 생성되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s %(project)s 프로젝트에 새로" +"운 위키 페이지가 생성되었습니다.

    \n" +"

    %(page)s 위키 페이지

    \n" +" 위키 " +"페이지 보기\n" +"

    타이가 팀

    \n" +" " + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New wiki page created\n" +"\n" +"Hello %(user)s, %(changer)s has created a new wiki page on %(project)s\n" +"\n" +"See wiki page %(page)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"새로운 위키 페이지가 생성되었습니다.\n" +"\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트에 새로운 위" +"키 페이지를 생성하셨습니다.\n" +"\n" +"%(page)s 위키 페이지보기 %(url)s\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the Wiki Page \"%(page)s\"\n" +msgstr "" +"\n" +"[%(project)s] \"%(page)s\" 위키 페이지가 생성되었습니다.\n" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Wiki page deleted

    \n" +"

    Hello %(user)s,
    %(changer)s has deleted a wiki page on " +"%(project)s

    \n" +"

    Wiki page %(page)s

    \n" +"

    The Taiga Team

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

    위키 페이지가 삭제되었습니다.

    \n" +"

    안녕하세요 %(user)s 님,
    %(changer)s 님께서 %(project)s 프로젝트" +"의 위키 페이지를 삭제하셨습니다.

    \n" +"

    %(page)s 위키 페이지

    \n" +"

    타이가 팀

    \n" +" " + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Wiki page deleted\n" +"\n" +"Hello %(user)s, %(changer)s has deleted a wiki page on %(project)s\n" +"\n" +"Wiki page %(page)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"위키 페이지가 삭제되었습니다.\n" +"\n" +"안녕하세요 %(user)s 님, %(changer)s 님께서 %(project)s 프로젝트의 위키 페이지" +"를 삭제하셨습니다.\n" +"\n" +"%(page)s 위키 페이지\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the Wiki Page \"%(page)s\"\n" +msgstr "" +"\n" +"[%(project)s] \"%(page)s\" 위키 페이지가 삭제되었습니다.\n" + +#: taiga/projects/notifications/validators.py:48 +msgid "Watchers contains invalid users" +msgstr "구독중인 사람들중에 유효하지 않은 사용자가 포함되어 있습니다." + +#: taiga/projects/occ/mixins.py:37 +msgid "The version must be an integer" +msgstr "버전은 반드시 정수이어야 합니다." + +#: taiga/projects/occ/mixins.py:60 +msgid "The version parameter is not valid" +msgstr "버전 매개변수가 유효하지 않습니다." + +#: taiga/projects/occ/mixins.py:76 +msgid "The version doesn't match with the current one" +msgstr "현재 버전과 일치하지 않습니다." + +#: taiga/projects/occ/mixins.py:95 +msgid "version" +msgstr "버전" + +#: taiga/projects/permissions.py:44 +msgid "" +"You can't leave the project if you are the owner or there are no more admins" +msgstr "당신이 소유자이거나 다른 관리자가 없다면 프로젝트를 떠날 수 없습니다." + +#: taiga/projects/services/members.py:133 +msgid "Project without owner" +msgstr "소유자 없는 프로젝트" + +#: taiga/projects/services/members.py:138 +msgid "You have reached your current limit of memberships for private projects" +msgstr "당신의 현재 비공개 프로젝트 최대 수용 인원수에 도달하였습니다." + +#: taiga/projects/services/members.py:142 +msgid "You have reached your current limit of memberships for public projects" +msgstr "당신의 현재 공공 프로젝트 최대 수용 인원수에 도달하였습니다." + +#: taiga/projects/services/members.py:148 +msgid "You have reached the current limit of pending memberships" +msgstr "당신의 현재 최대 보류중 회원수 제한에 도달하였습니다." + +#: taiga/projects/services/projects.py:101 +#: taiga/projects/services/projects.py:141 taiga/users/services.py:589 +msgid "You can't have more private projects" +msgstr "더 이상의 비공개 프로젝트를 소유하실 수 없습니다." + +#: taiga/projects/services/projects.py:105 +#: taiga/projects/services/projects.py:145 taiga/users/services.py:592 +msgid "" +"This project reaches your current limit of memberships for private projects" +msgstr "" +"이 프로젝트는 당신의 비공개 프로젝트 최대 수용 인원수에 도달하였습니다." + +#: taiga/projects/services/projects.py:109 +#: taiga/projects/services/projects.py:149 taiga/users/services.py:596 +msgid "You can't have more public projects" +msgstr "더 이상의 공공 프로젝트를 소유하실 수 없습니다." + +#: taiga/projects/services/projects.py:113 +#: taiga/projects/services/projects.py:153 taiga/users/services.py:599 +msgid "" +"This project reaches your current limit of memberships for public projects" +msgstr "이 프로젝트는 당신의 공공 프로젝트 최대 수용 인원수에 도달하였습니다." + +#: taiga/projects/services/stats.py:197 +msgid "Future sprint" +msgstr "앞으로의 스프린트" + +#: taiga/projects/services/stats.py:217 +msgid "Project End" +msgstr "프로젝트 종료" + +#: taiga/projects/services/transfer.py:62 +#: taiga/projects/services/transfer.py:69 +#: taiga/projects/services/transfer.py:72 taiga/users/api.py:193 +#: taiga/users/api.py:198 +msgid "Token is invalid" +msgstr "토큰이 유효하지 않습니다." + +#: taiga/projects/services/transfer.py:67 +msgid "Token has expired" +msgstr "토큰이 만료되었습니다." + +#: taiga/projects/tagging/fields.py:52 +#, python-brace-format +msgid "Invalid tag '{value}'. The color is not a valid HEX color or null." +msgstr "" +"'{value}' 태그는 유효하지 않습니다. 색이 유효하지 않은 HEX색 이거나 null 입니" +"다." + +#: taiga/projects/tagging/fields.py:55 +#, python-brace-format +msgid "" +"Invalid tag '{value}'. it must be the name or a pair '[\"name\", \"hex color/" +"\" | null]'." +msgstr "" +"'{value}' 태그는 유효하지 않습니다. 이름이나 쌍을 이루어야 합니다. '[\"name" +"\", \"hex color/\" | null]'." + +#: taiga/projects/tagging/fields.py:77 +#, python-brace-format +msgid "Invalid tag '{value}'. It must be the tag name." +msgstr "'{value}' 태그는 유효하지 않습니다. 태그 이름이어야 합니다." + +#: taiga/projects/tagging/models.py:27 +msgid "tags" +msgstr "태그" + +#: taiga/projects/tagging/models.py:35 +msgid "tags colors" +msgstr "태그 색" + +#: taiga/projects/tagging/validators.py:47 +#: taiga/projects/tagging/validators.py:74 +msgid "This tag already exists." +msgstr "이 태그는 이미 존재합니다." + +#: taiga/projects/tagging/validators.py:54 +#: taiga/projects/tagging/validators.py:81 +msgid "The color is not a valid HEX color." +msgstr "색이 유효하지 않은 HEX색 입니다." + +#: taiga/projects/tagging/validators.py:67 +#: taiga/projects/tagging/validators.py:101 +#: taiga/projects/tagging/validators.py:114 +#: taiga/projects/tagging/validators.py:121 +msgid "The tag doesn't exist." +msgstr "태그가 존재하지 않습니다." + +#: taiga/projects/tasks/api.py:98 taiga/projects/tasks/api.py:107 +msgid "You don't have permissions to set this sprint to this task." +msgstr "이 태스크의 스프린트를 설정할 권한이 없습니다." + +#: taiga/projects/tasks/api.py:101 +msgid "You don't have permissions to set this user story to this task." +msgstr "이 태스크의 유저 스토리를 설정할 권한이 없습니다." + +#: taiga/projects/tasks/api.py:104 +msgid "You don't have permissions to set this status to this task." +msgstr "이 태스크의 상태를 설정할 권한이 없습니다." + +#: taiga/projects/tasks/models.py:58 +msgid "us order" +msgstr "유저 스토리 순서" + +#: taiga/projects/tasks/models.py:60 +msgid "taskboard order" +msgstr "태스크보드 순서" + +#: taiga/projects/tasks/models.py:68 +msgid "is iocaine" +msgstr "아이오케인 입니다." + +#: taiga/projects/tasks/validators.py:59 +msgid "Invalid milestone id." +msgstr "마일스톤 아이디가 유효하지 않습니다." + +#: taiga/projects/tasks/validators.py:70 +msgid "Invalid task status id." +msgstr "태스크 상태 아이디가 유효하지 않습니다." + +#: taiga/projects/tasks/validators.py:83 +msgid "Invalid user story id." +msgstr "유저 스토리 아이디가 유효하지 않습니다." + +#: taiga/projects/tasks/validators.py:107 +msgid "Invalid task status id. The status must belong to the same project." +msgstr "" +"태스크 상태 아이디가 유효하지 않습니다. 상태는 반드시 같은 프로젝트에 속해야 " +"합니다." + +#: taiga/projects/tasks/validators.py:121 +msgid "Invalid user story id. The user story must belong to the same project." +msgstr "" +"유저 스토리 아이디가 유효하지 않습니다. 유저 스토리는 반드시 같은 프로젝트에 " +"속해야 합니다." + +#: taiga/projects/tasks/validators.py:133 +msgid "Invalid milestone id. The milestone must belong to the same project." +msgstr "" +"마일스톤 아이디가 유효하지 않습니다. 마일스톤은 반드시 같은 프로젝트에 속해" +"야 합니다." + +#: taiga/projects/tasks/validators.py:150 +msgid "" +"Invalid task ids. All tasks must belong to the same project and, if it " +"exists, to the same status, user story and/or milestone." +msgstr "" +"태스크 아이디가 유효하지 않습니다. 모든 태스크는 반드시 동일한 프로젝트에 속" +"해야하며, 만약 존재한다면, 같은 상태, 마일스톤이거나 상태, 유저 스토리, 마일" +"스톤이어야 합니다." + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:6 +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:4 +msgid "someone" +msgstr "누군가" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:11 +#, python-format +msgid "" +"\n" +"

    You have been invited to Taiga!

    \n" +"

    Hi! %(full_name)s has sent you an invitation to join project " +"%(project)s in Taiga.
    Taiga is a Free, open Source Agile Project " +"Management Tool.

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

    타이가로 초대되었습니다!

    \n" +"

    안녕하세요! %(full_name)s 님이 타이가에서 관리되고 있는 %(project)s 프로젝트에 참여해달라는 초대장을 보냈습니다.
    타이가는 무료이며 오픈" +"소스인 애자일 프로젝트 관리 툴입니다.

    \n" +" " + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:17 +#, python-format +msgid "" +"\n" +"

    And now a few words from the jolly good fellow or sistren
    " +"who thought so kindly as to invite you

    \n" +"

    %(extra)s

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

    당신을 친히 초대할만큼
    유쾌하고 좋은 동료들이나 여자사람친" +"구들의 몇 마디

    \n" +"

    %(extra)s

    \n" +" " + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:24 +msgid "Accept your invitation to Taiga" +msgstr "타이가로의 초대를 수락합니다." + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:24 +msgid "Accept your invitation" +msgstr "초대를 수락합니다." + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:25 +msgid "The Taiga Team" +msgstr "타이가 팀" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:6 +#, python-format +msgid "" +"\n" +"You, or someone you know, has invited you to Taiga\n" +"\n" +"Hi! %(full_name)s has sent you an invitation to join a project called " +"%(project)s which is being managed on Taiga, a Free, open Source Agile " +"Project Management Tool.\n" +msgstr "" +"\n" +"당신, 또는 당신을 아는 누군가가 타이가로 당신을 초대했습니다.\n" +"\n" +"안녕하세요! %(full_name)s 님이 타이가에서 관리되고 있는 %(project)s 프로젝트" +"에 참여해달라는 초대장을 보냈습니다. 무료이며 오픈소스인 애자일 프로젝트 관" +"리 툴입니다.\n" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:12 +#, python-format +msgid "" +"\n" +"And now a few words from the jolly good fellow or sistren who thought so " +"kindly as to invite you:\n" +"\n" +"%(extra)s\n" +" " +msgstr "" +"\n" +"당신을 친히 초대할만큼 유쾌하고 좋은 동료들이나 여자사람친구들의 몇 마디:\n" +"\n" +"%(extra)s\n" +" " + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:18 +msgid "Accept your invitation to Taiga following this link:" +msgstr "타이가로의 초대를 수락하려면 이 링크를 따라가십시오:" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:20 +msgid "" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/projects/templates/emails/membership_invitation-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[Taiga] Invitation to join to the project '%(project)s'\n" +msgstr "" +"\n" +"[타이가] '%(project)s' 프로젝트로 초대하는 초대장\n" + +#: taiga/projects/templates/emails/membership_notification-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    You have been added to a project

    \n" +"

    Hello %(full_name)s,
    you have been added to the project " +"%(project)s

    \n" +" Go to " +"project\n" +"

    The Taiga Team

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

    당신은 새로운 프로젝트를 추가하셨습니다.

    \n" +"

    안녕하세요 %(full_name)s 님,
    당신은 %(project)s 프로젝트를 새로 " +"추가하셨습니다.

    \n" +" 프로젝" +"트로 이동\n" +"

    타이가 팀

    " + +#: taiga/projects/templates/emails/membership_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"You have been added to a project\n" +"Hello %(full_name)s,you have been added to the project %(project)s\n" +"\n" +"See project at %(url)s\n" +msgstr "" +"\n" +"당신은 새로운 프로젝트를 추가하셨습니다.\n" +"안녕하세요 %(full_name)s 님, 당신은 %(project)s 프로젝트를 새로 추가하셨습니" +"다.\n" +"\n" +"%(url)s 에서 확인하세요.\n" + +#: taiga/projects/templates/emails/membership_notification-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[Taiga] Added to the project '%(project)s'\n" +msgstr "" +"\n" +"[타이가] '%(project)s' 프로젝트가 추가되었습니다.\n" + +#: taiga/projects/templates/emails/transfer_accept-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(old_owner_name)s,

    \n" +"

    %(new_owner_name)s has accepted your offer and will become the " +"new project owner for \"%(project_name)s\".

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

    안녕하세요 %(old_owner_name)s 님,

    \n" +"

    %(new_owner_name)s 님께서 당신의 제안을 받아들여 " +"\"%(project_name)s\" 프로젝트의 새로운 소유자가 되었습니다.\n" +"

    \n" +" " + +#: taiga/projects/templates/emails/transfer_accept-body-html.jinja:10 +#, python-format +msgid "

    %(new_owner_name)s says:

    " +msgstr "

    %(new_owner_name)s 님의 말:

    " + +#: taiga/projects/templates/emails/transfer_accept-body-html.jinja:14 +msgid "" +"\n" +"

    From now on, your new status for this project will be \"admin\".\n" +" " +msgstr "" +"\n" +"

    이제부터, 이 프로젝트에서 당신의 새로운 지위는 \"관리자\"가 될 것" +"입니다.

    \n" +" " + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(old_owner_name)s,\n" +"%(new_owner_name)s has accepted your offer and will become the new project " +"owner for \"%(project_name)s\".\n" +msgstr "" +"\n" +"안녕하세요 %(old_owner_name)s 님,\n" +"%(new_owner_name)s 님께서 당신의 제안을 받아들여 \"%(project_name)s\" 프로젝" +"트의 새로운 소유자가 되었습니다.\n" + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:7 +#, python-format +msgid "%(new_owner_name)s says:" +msgstr "%(new_owner_name)s 님의 말:" + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:11 +msgid "" +"\n" +"From now on, your new status for this project will be \"admin\".\n" +msgstr "" +"\n" +"이제부터, 이 프로젝트에서 당신의 새로운 지위는 \"관리자\"가 될 것입니다.\n" + +#: taiga/projects/templates/emails/transfer_accept-body-text.jinja:16 +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:19 +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:13 +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:18 +msgid "" +"\n" +"The Taiga Team\n" +msgstr "" +"\n" +"타이가 팀\n" + +#: taiga/projects/templates/emails/transfer_accept-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer offer accepted!\n" +msgstr "" +"\n" +"[%(project)s] 프로젝트 소유권 이전 승인!\n" + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(owner_name)s,

    \n" +"

    %(rejecter_name)s has declined your offer and will not become the " +"new project owner for \"%(project_name)s\".

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

    안녕하세요 %(owner_name)s 님,

    \n" +"

    %(rejecter_name)s 님께서 \"%(project_name)s\" 프로젝트의 새로운 소" +"유자가 되지 않겠냐는 당신의 제안을 거절하셨습니다.

    \n" +" " + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:10 +#, python-format +msgid "" +"\n" +"

    %(rejecter_name)s says:

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

    %(rejecter_name)s 님의 말:

    \n" +" " + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:16 +msgid "" +"\n" +"

    If you want, you can still try to transfer the project ownership to a " +"different person.

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

    원한다면 프로젝트 소유권을 다른 사람에게 이전 할 수 있습니다.

    \n" +" " + +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:21 +#: taiga/projects/templates/emails/transfer_reject-body-html.jinja:22 +msgid "Request transfer to a different person" +msgstr "다른 사람에게 이전 요청" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(owner_name)s,\n" +"%(rejecter_name)s has declined your offer and will not become the new " +"project owner for \"%(project_name)s\".\n" +msgstr "" +"\n" +"안녕하세요 %(owner_name)s 님,\n" +"%(rejecter_name)s 님께서 \"%(project_name)s\" 프로젝트의 새로운 소유자가 되" +"지 않겠냐는 당신의 제안을 거절하셨습니다.\n" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:7 +#, python-format +msgid "%(rejecter_name)s says:" +msgstr "%(rejecter_name)s 님의 말:" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:11 +msgid "" +"\n" +"If you want, you can still try to transfer the project ownership to a " +"different person.\n" +msgstr "" +"\n" +"원한다면 프로젝트 소유권을 다른 사람에게 이전 할 수 있습니다.\n" + +#: taiga/projects/templates/emails/transfer_reject-body-text.jinja:15 +msgid "Request transfer to a different person:" +msgstr "다른 사람에게 이전 요청:" + +#: taiga/projects/templates/emails/transfer_reject-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer declined\n" +msgstr "" +"\n" +"[%(project)s] 프로젝트 소유권 이전 거절\n" + +#: taiga/projects/templates/emails/transfer_request-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(owner_name)s,

    \n" +"

    %(requester_name)s has requested to become the project owner for " +"\"%(project_name)s\".

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

    안녕하세요 %(owner_name)s 님,\n" +"

    \n" +"

    %(requester_name)s 님께서 \"%(project_name)s\" 프로젝트의 소유자" +"가 되고 싶다고 요청하였습니다.

    \n" +" " + +#: taiga/projects/templates/emails/transfer_request-body-html.jinja:9 +msgid "" +"\n" +"

    Please, click on \"Continue\" if you would like to start the " +"project transfer from the administration panel.

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

    관리자 패널에서 프로젝트 이전을 하고 싶으시다면 \"계속\"을 클릭해" +"주세요.

    \n" +" " + +#: taiga/projects/templates/emails/transfer_request-body-html.jinja:14 +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:22 +msgid "Continue" +msgstr "계속" + +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(owner_name)s,\n" +"%(requester_name)s has requested to become the project owner for " +"\"%(project_name)s\".\n" +msgstr "" +"\n" +"안녕하세요 %(owner_name)s 님,\n" +"%(requester_name)s 님께서 \"%(project_name)s\" 프로젝트의 소유자가 되고 싶다" +"고 요청하였습니다.\n" + +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:6 +msgid "" +"\n" +"Please, go to your project settings if you would like to start the project " +"transfer from the administration panel.\n" +msgstr "" +"\n" +"관리자 패널에서 프로젝트 이전을 시작하고 싶으시면 프로젝트 설정으로 이동하세" +"요.\n" + +#: taiga/projects/templates/emails/transfer_request-body-text.jinja:10 +msgid "Go to your project settings:" +msgstr "프로젝트 설정으로 이동:" + +#: taiga/projects/templates/emails/transfer_request-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer request\n" +msgstr "" +"\n" +"[%(project)s] 프로젝트 소유권 이전 요청\n" + +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Hi %(receiver_name)s,

    \n" +"

    %(owner_name)s, the current project owner at \"%(project_name)s\" " +"would like you to become the new project owner.

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

    안녕하세요 %(receiver_name)s 님,

    \n" +"

    \"%(project_name)s\" 프로젝트의 현재 소유자 %(owner_name)s 입니" +"다. 새로운 프로젝트 소유자가 되고 싶지 않으신가요?

    \n" +" " + +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:10 +#, python-format +msgid "" +"\n" +"

    %(owner_name)s says:

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

    %(owner_name)s 님의 말:

    \n" +" " + +#: taiga/projects/templates/emails/transfer_start-body-html.jinja:17 +msgid "" +"\n" +"

    Please, click on \"Continue\" to either accept or reject this " +"proposal.

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

    이 요청을 수락하거나 거절하시려면 \"계속\"를 클릭하세요.

    \n" +" " + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hi %(receiver_name)s,\n" +"%(owner_name)s, the current project owner at \"%(project_name)s\" would like " +"you to become the new project owner.\n" +msgstr "" +"\n" +"안녕하세요 %(receiver_name)s 님,\n" +"\"%(project_name)s\" 프로젝트의 현재 소유자 %(owner_name)s 입니다. 새로운 프" +"로젝트 소유자가 되고 싶지 않으신가요?\n" + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:6 +#, python-format +msgid "%(owner_name)s says:" +msgstr "%(owner_name)s 님의 말:" + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:11 +msgid "" +"\n" +"Please, go to the following link to either accept or reject this proposal.\n" +msgstr "" +"\n" +"이 제안을 수락하거나 거부하려면 다음 링크로 이동하세요.

    \n" + +#: taiga/projects/templates/emails/transfer_start-body-text.jinja:15 +msgid "Accept or reject the project ownership transfer:" +msgstr "프로젝트 소유권 이전을 수락하거나 거부하세요.:" + +#: taiga/projects/templates/emails/transfer_start-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Project ownership transfer offer\n" +msgstr "" +"\n" +"[%(project)s] 프로젝트 소유권 이전 제안\n" + +#. Translators: Name of scrum project template. +#: taiga/projects/translations.py:30 +msgid "Scrum" +msgstr "스크럼" + +#. Translators: Description of scrum project template. +#: taiga/projects/translations.py:32 +msgid "" +"The agile product backlog in Scrum is a prioritized features list, " +"containing short descriptions of all functionality desired in the product. " +"When applying Scrum, it's not necessary to start a project with a lengthy, " +"upfront effort to document all requirements. The Scrum product backlog is " +"then allowed to grow and change as more is learned about the product and its " +"customers" +msgstr "" +"스크럼의 애자일 제품 백 로그는 제품에 필요한 모든 기능의 간략한 설명이 포함" +"된 우선 순위 기능 목록입니다. 스크럼을 적용 할 때 모든 요구 사항을 문서화하" +"기 위해 오랜 시간을 투자하며 프로젝트를 시작할 필요가 없습니다. 스크럼 제품 " +"백 로그는 제품과 고객에 대해 더 많이 알게되면 확대되고 변경 될 수 있습니다." + +#. Translators: Name of kanban project template. +#: taiga/projects/translations.py:35 +msgid "Kanban" +msgstr "칸반" + +#. Translators: Description of kanban project template. +#: taiga/projects/translations.py:37 +msgid "" +"Kanban is a method for managing knowledge work with an emphasis on just-in-" +"time delivery while not overloading the team members. In this approach, the " +"process, from definition of a task to its delivery to the customer, is " +"displayed for participants to see and team members pull work from a queue." +msgstr "" +"칸반은 팀 구성원에게 과부하가 아닌 정시 전달에 중점을 둔 지식 작업 관리 방식" +"입니다. 이 작업 방식은 태스크 정의로부터 고객에게 전달될 때까지 참여자들이 " +"볼 수 있도록 표시되고 팀 구성원이 대기열로부터 일을 가져올 수 있습니다." + +#. Translators: User story point value (value = undefined) +#: taiga/projects/translations.py:45 +msgid "?" +msgstr "?" + +#. Translators: User story point value (value = 0) +#: taiga/projects/translations.py:47 +msgid "0" +msgstr "0" + +#. Translators: User story point value (value = 0.5) +#: taiga/projects/translations.py:49 +msgid "1/2" +msgstr "1/2" + +#. Translators: User story point value (value = 1) +#: taiga/projects/translations.py:51 +msgid "1" +msgstr "1" + +#. Translators: User story point value (value = 2) +#: taiga/projects/translations.py:53 +msgid "2" +msgstr "2" + +#. Translators: User story point value (value = 3) +#: taiga/projects/translations.py:55 +msgid "3" +msgstr "3" + +#. Translators: User story point value (value = 5) +#: taiga/projects/translations.py:57 +msgid "5" +msgstr "5" + +#. Translators: User story point value (value = 8) +#: taiga/projects/translations.py:59 +msgid "8" +msgstr "8" + +#. Translators: User story point value (value = 10) +#: taiga/projects/translations.py:61 +msgid "10" +msgstr "10" + +#. Translators: User story point value (value = 13) +#: taiga/projects/translations.py:63 +msgid "13" +msgstr "13" + +#. Translators: User story point value (value = 20) +#: taiga/projects/translations.py:65 +msgid "20" +msgstr "20" + +#. Translators: User story point value (value = 40) +#: taiga/projects/translations.py:67 +msgid "40" +msgstr "40" + +#. Translators: User story status +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:75 taiga/projects/translations.py:98 +#: taiga/projects/translations.py:114 +msgid "New" +msgstr "신규" + +#. Translators: User story status +#: taiga/projects/translations.py:78 +msgid "Ready" +msgstr "준비" + +#. Translators: User story status +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:81 taiga/projects/translations.py:100 +#: taiga/projects/translations.py:116 +msgid "In progress" +msgstr "작업중" + +#. Translators: User story status +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:84 taiga/projects/translations.py:102 +#: taiga/projects/translations.py:118 +msgid "Ready for test" +msgstr "테스트 준비 끝" + +#. Translators: User story status +#: taiga/projects/translations.py:87 +msgid "Done" +msgstr "완료됨" + +#. Translators: User story status +#: taiga/projects/translations.py:90 +msgid "Archived" +msgstr "보관됨" + +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:104 taiga/projects/translations.py:120 +msgid "Closed" +msgstr "완료됨" + +#. Translators: Task status +#. Translators: Issue status +#: taiga/projects/translations.py:106 taiga/projects/translations.py:122 +msgid "Needs Info" +msgstr "정보 필요" + +#. Translators: Issue status +#: taiga/projects/translations.py:124 +msgid "Postponed" +msgstr "지연됨" + +#. Translators: Issue status +#: taiga/projects/translations.py:126 +msgid "Rejected" +msgstr "거부됨" + +#. Translators: Issue type +#: taiga/projects/translations.py:134 +msgid "Bug" +msgstr "버그" + +#. Translators: Issue type +#: taiga/projects/translations.py:136 +msgid "Question" +msgstr "질문" + +#. Translators: Issue type +#: taiga/projects/translations.py:138 +msgid "Enhancement" +msgstr "개선" + +#. Translators: Issue priority +#: taiga/projects/translations.py:146 +msgid "Low" +msgstr "낮음" + +#. Translators: Issue priority +#. Translators: Issue severity +#: taiga/projects/translations.py:148 taiga/projects/translations.py:161 +msgid "Normal" +msgstr "일반" + +#. Translators: Issue priority +#: taiga/projects/translations.py:150 +msgid "High" +msgstr "높음" + +#. Translators: Issue severity +#: taiga/projects/translations.py:157 +msgid "Wishlist" +msgstr "희망사항" + +#. Translators: Issue severity +#: taiga/projects/translations.py:159 +msgid "Minor" +msgstr "부가적" + +#. Translators: Issue severity +#: taiga/projects/translations.py:163 +msgid "Important" +msgstr "중요" + +#. Translators: Issue severity +#: taiga/projects/translations.py:165 +msgid "Critical" +msgstr "치명적" + +#. Translators: User role +#: taiga/projects/translations.py:172 +msgid "UX" +msgstr "UX" + +#. Translators: User role +#: taiga/projects/translations.py:174 +msgid "Design" +msgstr "디자인" + +#. Translators: User role +#: taiga/projects/translations.py:176 +msgid "Front" +msgstr "프론트" + +#. Translators: User role +#: taiga/projects/translations.py:178 +msgid "Back" +msgstr "이전" + +#. Translators: User role +#: taiga/projects/translations.py:180 +msgid "Product Owner" +msgstr "제품 소유자" + +#. Translators: User role +#: taiga/projects/translations.py:182 +msgid "Stakeholder" +msgstr "이해관계자" + +#: taiga/projects/userstories/api.py:127 +msgid "You don't have permissions to set this sprint to this user story." +msgstr "이 유저 스토리를 스프린트에 설정할 권한이 없습니다." + +#: taiga/projects/userstories/api.py:131 +msgid "You don't have permissions to set this status to this user story." +msgstr "이 유저 스토리의 상태를 설정할 권한이 없습니다." + +#: taiga/projects/userstories/api.py:221 +#, python-brace-format +msgid "Invalid role id '{role_id}'" +msgstr "'{role_id}' 역할 아이디는 유효하지 않습니다." + +#: taiga/projects/userstories/api.py:228 +#, python-brace-format +msgid "Invalid points id '{points_id}'" +msgstr "'{points_id}' 포인트 아이디는 유효하지 않습니다." + +#: taiga/projects/userstories/api.py:243 +#, python-brace-format +msgid "Generating the user story #{ref} - {subject}" +msgstr "유저 스토리 생성 #{ref} - {subject}" + +#: taiga/projects/userstories/models.py:41 +msgid "role" +msgstr "역할" + +#: taiga/projects/userstories/models.py:80 +msgid "backlog order" +msgstr "백로그 순서" + +#: taiga/projects/userstories/models.py:82 +msgid "sprint order" +msgstr "스프린트 순서" + +#: taiga/projects/userstories/models.py:84 +msgid "kanban order" +msgstr "칸반 순서" + +#: taiga/projects/userstories/models.py:92 +msgid "finish date" +msgstr "종료일" + +#: taiga/projects/userstories/models.py:107 +msgid "generated from issue" +msgstr "이슈로부터 생성됨" + +#: taiga/projects/userstories/validators.py:43 +msgid "There's no user story with that id" +msgstr "아이디를 가진 유저 스토리가 없습니다." + +#: taiga/projects/userstories/validators.py:82 +#: taiga/projects/userstories/validators.py:108 +msgid "" +"Invalid user story status id. The status must belong to the same project." +msgstr "" +"유저 스토리 상태 아이디가 유효하지 않습니다. 상태는 반드시 동일한 프로젝트에 " +"속해야 합니다." + +#: taiga/projects/userstories/validators.py:120 +msgid "Invalid milestone id. The milistone must belong to the same project." +msgstr "" +"마일스톤 아이디가 유효하지 않습니다. 마일스톤은 반드시 같은 프로젝트에 속해" +"야 합니다." + +#: taiga/projects/userstories/validators.py:135 +msgid "" +"Invalid user story ids. All stories must belong to the same project and, if " +"it exists, to the same status and milestone." +msgstr "" +"유저 스토리 아이디가 유효하지 않습니다. 모든 유저 스토리는 반드시 같은 프로젝" +"트에 속해야 하고, 존재한다면, 같은 상태와 마일스톤을 가져야 합니다." + +#: taiga/projects/userstories/validators.py:159 +msgid "The milestone isn't valid for the project" +msgstr "마일스톤은 프로젝트에 유효하지 않습니다." + +#: taiga/projects/userstories/validators.py:169 +msgid "All the user stories must be from the same project" +msgstr "모든 유저 스토리는 반드시 동일한 프로젝트에 속해야 합니다." + +#: taiga/projects/validators.py:63 +msgid "There's no project with that id" +msgstr "아이디가 있는 프로젝트가 없습니다." + +#: taiga/projects/validators.py:145 +msgid "The user yet exists in the project" +msgstr "이 프로젝트에는 아직 사용자가 없습니다." + +#: taiga/projects/validators.py:155 +msgid "Invalid role for the project" +msgstr "프로젝트에 유효하지 않은 역할입니다." + +#: taiga/projects/validators.py:170 taiga/projects/validators.py:225 +msgid "The user must be a valid contact" +msgstr "사용자는 반드시 유효한 연락처이어야 합니다." + +#: taiga/projects/validators.py:191 +msgid "The project owner must be admin." +msgstr "프로젝트 소유자는 반드시 관리자이어야 합니다." + +#: taiga/projects/validators.py:195 +msgid "At least one user must be an active admin for this project." +msgstr "이 프로젝트의 최소 한 명의 사용자는 활성된 관리자이어야 합니다." + +#: taiga/projects/validators.py:240 +msgid "Invalid role ids. All roles must belong to the same project." +msgstr "" +"유효하지 않은 역할 아이디입니다. 모든 역할은 반드시 동일한 프로젝트에 속해야 " +"합니다." + +#: taiga/projects/validators.py:264 +msgid "Default options" +msgstr "기본 옵션" + +#: taiga/projects/validators.py:265 +msgid "User story's statuses" +msgstr "유저 스토리 상태" + +#: taiga/projects/validators.py:266 +msgid "Points" +msgstr "포인트" + +#: taiga/projects/validators.py:267 +msgid "Task's statuses" +msgstr "태스크 상태" + +#: taiga/projects/validators.py:268 +msgid "Issue's statuses" +msgstr "이슈 상태" + +#: taiga/projects/validators.py:269 +msgid "Issue's types" +msgstr "이슈 형태" + +#: taiga/projects/validators.py:270 +msgid "Priorities" +msgstr "우선순위" + +#: taiga/projects/validators.py:271 +msgid "Severities" +msgstr "심각도" + +#: taiga/projects/validators.py:272 +msgid "Roles" +msgstr "역할" + +#: taiga/projects/votes/models.py:33 taiga/projects/votes/models.py:34 +#: taiga/projects/votes/models.py:58 +msgid "Votes" +msgstr "투표" + +#: taiga/projects/votes/models.py:57 +msgid "Vote" +msgstr "투표" + +#: taiga/projects/wiki/api.py:77 +msgid "'content' parameter is mandatory" +msgstr "'content' 매개변수는 필수입니다." + +#: taiga/projects/wiki/api.py:80 +msgid "'project_id' parameter is mandatory" +msgstr "'project_id' 매개변수는 필수입니다." + +#: taiga/projects/wiki/models.py:42 +msgid "last modifier" +msgstr "마지막 수정자" + +#: taiga/projects/wiki/models.py:75 +msgid "href" +msgstr "href" + +#: taiga/timeline/signals.py:65 +msgid "Check the history API for the exact diff" +msgstr "확실한 차이점을 보려면 API 내역을 확인하십시오." + +#: taiga/users/admin.py:39 +msgid "Project Member" +msgstr "프로젝트 회원" + +#: taiga/users/admin.py:40 +msgid "Project Members" +msgstr "프로젝트 회원" + +#: taiga/users/admin.py:50 +msgid "id" +msgstr "아이디" + +#: taiga/users/admin.py:81 +msgid "Project Ownership" +msgstr "프로젝트 소유권" + +#: taiga/users/admin.py:82 +msgid "Project Ownerships" +msgstr "프로젝트 소유권" + +#: taiga/users/admin.py:119 +msgid "Personal info" +msgstr "개인정보" + +#: taiga/users/admin.py:122 +msgid "Permissions" +msgstr "권한" + +#: taiga/users/admin.py:123 +msgid "Restrictions" +msgstr "제한 사항" + +#: taiga/users/admin.py:125 +msgid "Important dates" +msgstr "중요한 날짜" + +#: taiga/users/api.py:132 +msgid "Duplicated email" +msgstr "중복된 이메일" + +#: taiga/users/api.py:134 +msgid "Not valid email" +msgstr "유효하지 않은 이메일" + +#: taiga/users/api.py:172 +msgid "Invalid username or email" +msgstr "아이디 또는 이메일이 유효하지 않습니다." + +#: taiga/users/api.py:181 +msgid "Mail sended successful!" +msgstr "성공적으로 메일을 전송했습니다!" + +#: taiga/users/api.py:219 +msgid "Current password parameter needed" +msgstr "현재 비밀번호 매개변수가 필요합니다." + +#: taiga/users/api.py:222 +msgid "New password parameter needed" +msgstr "새로운 비밀번호 매개변수가 필요합니다." + +#: taiga/users/api.py:225 +msgid "Invalid password length at least 6 charaters needed" +msgstr "" +"비밀번호의 길이가 유효하지 않습니다. 최소한 6자가 필요합니다.\n" +"Invalid password length at least 6 charaters needed" + +#: taiga/users/api.py:228 +msgid "Invalid current password" +msgstr "현재 비밀번호는 유효하지 않습니다.Invalid current password" + +#: taiga/users/api.py:275 taiga/users/api.py:281 +msgid "" +"Invalid, are you sure the token is correct and you didn't use it before?" +msgstr "유효하지 않음, 토큰이 정확하고 이전에 사용하지 않았습니까?" + +#: taiga/users/api.py:317 taiga/users/api.py:325 taiga/users/api.py:328 +msgid "Invalid, are you sure the token is correct?" +msgstr "유효하지 않음, 토큰이 정확합니까?are you sure the token is correct?" + +#: taiga/users/models.py:97 +msgid "superuser status" +msgstr "슈퍼유저 상태" + +#: taiga/users/models.py:98 +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "이 사용자가 명시적인 할당을 받지 않고 모든 권한을 가지는지 지정합니다." + +#: taiga/users/models.py:128 +msgid "username" +msgstr "아이디" + +#: taiga/users/models.py:129 +msgid "" +"Required. 30 characters or fewer. Letters, numbers and /./-/_ characters" +msgstr "필수. 30자 이하. 문자, 숫자 그리고 /./-/_ characters" + +#: taiga/users/models.py:132 +msgid "Enter a valid username." +msgstr "올바른 아이디를 입력해주세요." + +#: taiga/users/models.py:135 +msgid "active" +msgstr "활성" + +#: taiga/users/models.py:136 +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "" +"이 사용자를 활성 상태로 취급할 것인지 지정합니다. 계정을 삭제하는 대신에 선택" +"을 해제하십시오." + +#: taiga/users/models.py:142 +msgid "biography" +msgstr "바이오그래피" + +#: taiga/users/models.py:145 +msgid "photo" +msgstr "사진" + +#: taiga/users/models.py:146 +msgid "date joined" +msgstr "가입한 날짜" + +#: taiga/users/models.py:148 +msgid "default language" +msgstr "기본 언어" + +#: taiga/users/models.py:150 +msgid "default theme" +msgstr "기본 테마" + +#: taiga/users/models.py:152 +msgid "default timezone" +msgstr "기본 시간대" + +#: taiga/users/models.py:154 +msgid "colorize tags" +msgstr "태그 색 칠하기" + +#: taiga/users/models.py:159 +msgid "email token" +msgstr "이메일 토큰" + +#: taiga/users/models.py:161 +msgid "new email address" +msgstr "새로운 이메일 주소" + +#: taiga/users/models.py:168 +msgid "max number of owned private projects" +msgstr "소유할 수 있는 비공개 프로젝트의 최대 개수" + +#: taiga/users/models.py:171 +msgid "max number of owned public projects" +msgstr "소유할 수 있는 공공 프로젝트의 최대 개수" + +#: taiga/users/models.py:174 +msgid "max number of memberships for each owned private project" +msgstr "소유한 비공개 프로젝트당 수용할 수 있는 최대 회원수" + +#: taiga/users/models.py:178 +msgid "max number of memberships for each owned public project" +msgstr "소유한 공공 프로젝트당 수용할 수 있는 최대 회원수" + +#: taiga/users/models.py:305 +msgid "permissions" +msgstr "권한" + +#: taiga/users/services.py:51 taiga/users/services.py:68 +msgid "Username or password does not matches user." +msgstr "아이디 또는 비밀번호가 올바르지 않습니다." + +#: taiga/users/templates/emails/change_email-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Change your email

    \n" +"

    Hello %(full_name)s,
    please confirm your email

    \n" +" Confirm " +"email\n" +"

    You can ignore this message if you did not request.

    \n" +"

    The Taiga Team

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

    이메일 변경

    \n" +"

    안녕하세요 %(full_name)s 님,
    이메일을 확인해주세요.

    \n" +" 이메일 확인\n" +"

    직접 요청하시지 않았다면 이 메시지를 무시하실 수 있습니다.

    \n" +"

    타이가 팀

    \n" +" " + +#: taiga/users/templates/emails/change_email-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(full_name)s, please confirm your email\n" +"\n" +"%(url)s\n" +"\n" +"You can ignore this message if you did not request.\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"안녕하세요 %(full_name)s 님, 이메일을 확인해주세요.\n" +"\n" +"%(url)s\n" +"\n" +"직접 요청하지 않았다면 이 메시지를 무시하실 수 있습니다.\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/users/templates/emails/change_email-subject.jinja:1 +msgid "[Taiga] Change email" +msgstr "[타이가] 이메일 변경" + +#: taiga/users/templates/emails/password_recovery-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

    Recover your password

    \n" +"

    Hello %(full_name)s,
    you asked to recover your password

    \n" +"     Recover your password\n" +"

    You can ignore this message if you did not request.

    \n" +"

    The Taiga Team

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

    비밀번호를 복구합니다.

    \n" +"

    안녕하세요 %(full_name)s 님,
    당신은 암호를 복구하도록 요청하셨" +"습니다.

    \n" +" 비밀번" +"호 복구하기\n" +"

    직접 요청하시지 않았다면 이 메시지를 무시하실 수 있습니다.

    \n" +"

    타이가 팀

    \n" +" " + +#: taiga/users/templates/emails/password_recovery-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(full_name)s, you asked to recover your password\n" +"\n" +"%(url)s\n" +"\n" +"You can ignore this message if you did not request.\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" +"\n" +"안녕하세요 %(full_name)s 님, 당신은 암호를 복구하도록 요청하셨습니다.\n" +"\n" +"%(url)s\n" +"\n" +"직접 요청하시지 않았다면 이 메시지를 무시하실 수 있습니다.\n" +"\n" +"---\n" +"타이가 팀\n" + +#: taiga/users/templates/emails/password_recovery-subject.jinja:1 +msgid "[Taiga] Password recovery" +msgstr "[타이가] 비밀번호 복구" + +#: taiga/users/templates/emails/registered_user-body-html.jinja:6 +msgid "" +"\n" +"     		\n" +"

    Thank you for registering in Taiga

    \n" +"

    We hope you enjoy it

    \n" +"

    We built Taiga because we wanted the project management tool " +"that sits open on our computers all day long, to serve as a continued " +"reminder of why we love to collaborate, code and design.

    \n" +"

    We built it to be beautiful, elegant, simple to use and fun - " +"without forsaking flexibility and power.

    \n" +" The taiga Team\n" +"     		\n" +"

    타이가에 가입해주셔서 감사합니다.

    \n" +"

    우리는 당신이 즐기길 원합니다.

    \n" +"

    우리는 타이가를 컴퓨터에 하루 종일 열려있는 프로젝트 관리 도구" +"로, 왜 우리가 협업과 코드와 디자인을 사랑하는지 계속해서 다시금 떠올릴 수 있" +"도록 만들었습니다.

    \n" +"

    우리는 아름답고, 우아하고, 간결하며 재미있게 사용할 수 있도록 " +"만들었습니다. - 유연성과 강력함을 버리지 않고 말이죠.

    \n" +" 타이가 팀\n" +"