diff --git a/greenmine/projects/choices.py b/greenmine/projects/choices.py index bbea85b4..95fbd10a 100644 --- a/greenmine/projects/choices.py +++ b/greenmine/projects/choices.py @@ -4,16 +4,16 @@ from django.utils.translation import ugettext_lazy as _ US_STATUSES = ( - (1, _(u"Open"), False), - (2, _(u"Closed"), True), + (1, _("Open"), False), + (2, _("Closed"), True), ) TASK_STATUSES = ( - (1, _(u"New"), False, "#999999"), - (2, _(u"In progress"), False, "#ff9900"), - (3, _(u"Ready for test"), True, "#ffcc00"), - (4, _(u"Closed"), True, "#669900"), - (5, _(u"Needs Info"), False, "#999999"), + (1, _("New"), False, "#999999"), + (2, _("In progress"), False, "#ff9900"), + (3, _("Ready for test"), True, "#ffcc00"), + (4, _("Closed"), True, "#669900"), + (5, _("Needs Info"), False, "#999999"), ) POINTS_CHOICES = ( @@ -46,13 +46,13 @@ SEVERITY_CHOICES = ( ) ISSUE_STATUSES = ( - (1, _(u"New"), False), - (2, _(u"In progress"), False), - (3, _(u"Ready for test"), True), - (4, _(u"Closed"), True), - (5, _(u"Needs Info"), False), - (6, _(u"Rejected"), True), - (7, _(u"Postponed"), False), + (1, _("New"), False), + (2, _("In progress"), False), + (3, _("Ready for test"), True), + (4, _("Closed"), True), + (5, _("Needs Info"), False), + (6, _("Rejected"), True), + (7, _("Postponed"), False), ) ISSUE_TYPES = ( @@ -60,9 +60,9 @@ ISSUE_TYPES = ( ) QUESTION_STATUS = ( - (1, _(u"New"), False), - (2, _(u"Pending"), False), - (3, _(u"Answered"), True), + (1, _("New"), False), + (2, _("Pending"), False), + (3, _("Answered"), True), ) # TODO: pending to refactor @@ -73,8 +73,8 @@ TASK_PRIORITY_CHANGE = 3 TASK_ASSIGNATION_CHANGE = 4 TASK_CHANGE_CHOICES = ( - (TASK_COMMENT, _(u"Task comment")), - (TASK_STATUS_CHANGE, _(u"Task status change")), - (TASK_PRIORITY_CHANGE, _(u"Task prioriy change")), - (TASK_ASSIGNATION_CHANGE, _(u"Task assignation change")), + (TASK_COMMENT, _("Task comment")), + (TASK_STATUS_CHANGE, _("Task status change")), + (TASK_PRIORITY_CHANGE, _("Task prioriy change")), + (TASK_ASSIGNATION_CHANGE, _("Task assignation change")), ) diff --git a/greenmine/projects/issues/models.py b/greenmine/projects/issues/models.py index 09e019ab..0395eec4 100644 --- a/greenmine/projects/issues/models.py +++ b/greenmine/projects/issues/models.py @@ -66,8 +66,8 @@ class Issue(WatchedMixin): ] class Meta: - verbose_name = u"issue" - verbose_name_plural = u"issues" + verbose_name = "issue" + verbose_name_plural = "issues" ordering = ["project", "created_date"] unique_together = ("ref", "project") permissions = ( @@ -81,7 +81,7 @@ class Issue(WatchedMixin): ) def __str__(self): - return u"({1}) {0}".format(self.ref, self.subject) + return "({1}) {0}".format(self.ref, self.subject) def save(self, *args, **kwargs): if self.id: diff --git a/greenmine/projects/milestones/models.py b/greenmine/projects/milestones/models.py index 9c789bf2..5790e470 100644 --- a/greenmine/projects/milestones/models.py +++ b/greenmine/projects/milestones/models.py @@ -50,8 +50,8 @@ class Milestone(WatchedMixin): ] class Meta: - verbose_name = u"milestone" - verbose_name_plural = u"milestones" + verbose_name = "milestone" + verbose_name_plural = "milestones" ordering = ["project", "-created_date"] unique_together = ("name", "project") permissions = ( @@ -62,7 +62,7 @@ class Milestone(WatchedMixin): return self.name def __repr__(self): - return u"".format(self.id) + return "".format(self.id) def save(self, *args, **kwargs): if not self.slug: diff --git a/greenmine/projects/models.py b/greenmine/projects/models.py index 0409a9f3..6ad9f405 100644 --- a/greenmine/projects/models.py +++ b/greenmine/projects/models.py @@ -36,12 +36,12 @@ class Attachment(models.Model): upload_to="files/msg", verbose_name=_("attached file")) class Meta: - verbose_name = u"Attachment" - verbose_name_plural = u"Attachments" + verbose_name = "Attachment" + verbose_name_plural = "Attachments" ordering = ["project", "created_date"] def __str__(self): - return u"Attachment: {}".format(self.id) + return "Attachment: {}".format(self.id) class Membership(models.Model): @@ -89,8 +89,8 @@ class Project(models.Model): tags = PickledObjectField(null=False, blank=True, verbose_name=_("tags")) class Meta: - verbose_name = u"project" - verbose_name_plural = u"projects" + verbose_name = "Project" + verbose_name_plural = "Projects" ordering = ["name"] permissions = ( ("list_projects", "Can list projects"), @@ -102,7 +102,7 @@ class Project(models.Model): return self.name def __repr__(self): - return u"".format(self.id) + return "".format(self.id) def save(self, *args, **kwargs): if not self.slug: @@ -155,13 +155,13 @@ class UserStoryStatus(models.Model): related_name="us_statuses", verbose_name=_("project")) class Meta: - verbose_name = u"Userstory status" - verbose_name_plural = u"Userstory statuses" + verbose_name = "Userstory status" + verbose_name_plural = "Userstory statuses" ordering = ["project", "name"] unique_together = ("project", "name") def __str__(self): - return u"Userstory status: {}".format(self.name) + return "Userstory status: {}".format(self.name) class Points(models.Model): @@ -175,8 +175,8 @@ class Points(models.Model): related_name="points", verbose_name=_("project")) class Meta: - verbose_name = u"Point" - verbose_name_plural = u"Points" + verbose_name = "Point" + verbose_name_plural = "Points" ordering = ["project", "name"] unique_together = ("project", "name") @@ -197,8 +197,8 @@ class TaskStatus(models.Model): related_name="task_statuses", verbose_name=_("project")) class Meta: - verbose_name = u"task status" - verbose_name_plural = u"task statuses" + verbose_name = "task status" + verbose_name_plural = "task statuses" ordering = ["project", "name"] unique_together = ("project", "name") @@ -215,13 +215,13 @@ class Priority(models.Model): related_name="priorities", verbose_name=_("project")) class Meta: - verbose_name = u"Priority" - verbose_name_plural = u"Priorities" + verbose_name = "Priority" + verbose_name_plural = "Priorities" ordering = ["project", "name"] unique_together = ("project", "name") def __str__(self): - return u"Priority {}".format(self.name) + return "Priority {}".format(self.name) class Severity(models.Model): @@ -231,13 +231,13 @@ class Severity(models.Model): related_name="severities", verbose_name=_("project")) class Meta: - verbose_name = u"Severity" - verbose_name_plural = u"Severities" + verbose_name = "Severity" + verbose_name_plural = "Severities" ordering = ["project", "name"] unique_together = ("project", "name") def __str__(self): - return u"Severity: {}".format(self.name) + return "Severity: {}".format(self.name) class IssueStatus(models.Model): @@ -255,7 +255,7 @@ class IssueStatus(models.Model): unique_together = ("project", "name") def __str__(self): - return u"Issue status: {}".format(self.name) + return "Issue status: {}".format(self.name) class IssueType(models.Model): @@ -294,7 +294,7 @@ class QuestionStatus(models.Model): unique_together = ("project", "name") def __str__(self): - return u"Quiestion status: {}".format(self.name) + return "Quiestion status: {}".format(self.name) # Reversion registration (usufull for base.notification and for meke a historical) diff --git a/greenmine/projects/questions/models.py b/greenmine/projects/questions/models.py index 4f793307..b1ef14b0 100644 --- a/greenmine/projects/questions/models.py +++ b/greenmine/projects/questions/models.py @@ -57,18 +57,18 @@ class Question(WatchedMixin): ] class Meta: - verbose_name = u"question" - verbose_name_plural = u"questions" + verbose_name = "question" + verbose_name_plural = "questions" ordering = ["project", "created_date", "subject"] unique_together = ("ref", "project") permissions = ( - ("reply_question", _(u"Can reply questions")), - ("change_owned_question", _(u"Can modify owned questions")), - ("change_assigned_question", _(u"Can modify assigned questions")), - ("assign_question_to_other", _(u"Can assign questions to others")), - ("assign_question_to_myself", _(u"Can assign questions to myself")), - ("change_question_state", _(u"Can change the question state")), - ("view_question", _(u"Can view the question")), + ("reply_question", _("Can reply questions")), + ("change_owned_question", _("Can modify owned questions")), + ("change_assigned_question", _("Can modify assigned questions")), + ("assign_question_to_other", _("Can assign questions to others")), + ("assign_question_to_myself", _("Can assign questions to myself")), + ("change_question_state", _("Can change the question state")), + ("view_question", _("Can view the question")), ) def __str__(self): diff --git a/greenmine/projects/tasks/models.py b/greenmine/projects/tasks/models.py index 9219cab1..65ed5d62 100644 --- a/greenmine/projects/tasks/models.py +++ b/greenmine/projects/tasks/models.py @@ -59,8 +59,8 @@ class Task(WatchedMixin): ] class Meta: - verbose_name = u"task" - verbose_name_plural = u"tasks" + verbose_name = "task" + verbose_name_plural = "tasks" ordering = ["project", "created_date"] unique_together = ("ref", "project") permissions = ( @@ -75,7 +75,7 @@ class Task(WatchedMixin): ) def __str__(self): - return u"({1}) {0}".format(self.ref, self.subject) + return "({1}) {0}".format(self.ref, self.subject) def save(self, *args, **kwargs): if self.id: diff --git a/greenmine/projects/userstories/models.py b/greenmine/projects/userstories/models.py index d430b3b9..c3e3e03a 100644 --- a/greenmine/projects/userstories/models.py +++ b/greenmine/projects/userstories/models.py @@ -83,8 +83,8 @@ class UserStory(WatchedMixin): ] class Meta: - verbose_name = u"user story" - verbose_name_plural = u"user stories" + verbose_name = "user story" + verbose_name_plural = "user stories" ordering = ["project", "order"] unique_together = ("ref", "project") permissions = ( @@ -95,10 +95,10 @@ class UserStory(WatchedMixin): ) def __str__(self): - return u"({1}) {0}".format(self.ref, self.subject) + return "({1}) {0}".format(self.ref, self.subject) def __repr__(self): - return u"" % (self.id) + return "" % (self.id) @property def is_closed(self):