diff --git a/main/forms.py b/main/forms.py index 604ca3b..0380fb0 100644 --- a/main/forms.py +++ b/main/forms.py @@ -1,6 +1,5 @@ from django import forms from django.contrib.auth.models import User -from django.utils.translation import ugettext_lazy as _ from main.models import InventoryTransaction, Order, Product, Transaction, UserProfile from main.utils import format_username @@ -11,7 +10,7 @@ class OrderForm(forms.ModelForm): def clean(self): if self.cleaned_data["customer"] is None and self.cleaned_data["customer_name"] != "Ekstern": - raise forms.ValidationError(_("Du har ikke valgt hvem som skal kjøpe.")) + raise forms.ValidationError("Du har ikke valgt hvem som skal kjøpe.") return self.cleaned_data @@ -20,7 +19,7 @@ class OrderForm(forms.ModelForm): return self.cleaned_data["customer"] if self.cleaned_data["customer"].profile.balance <= 0: - raise forms.ValidationError(_("Du har negativ saldo og kan ikke kjøpe noe.")) + raise forms.ValidationError("Du har negativ saldo og kan ikke kjøpe noe.") return self.cleaned_data["customer"] @@ -83,5 +82,5 @@ class InventoryTransactionForm(forms.ModelForm): class DateRangeForm(forms.Form): - start_time = forms.DateTimeField(required=False, label=_("Fra")) - end_time = forms.DateTimeField(required=False, label=_("Til")) + start_time = forms.DateTimeField(required=False, label="Fra") + end_time = forms.DateTimeField(required=False, label="Til") diff --git a/main/models.py b/main/models.py index e139bb7..09aa400 100755 --- a/main/models.py +++ b/main/models.py @@ -3,7 +3,6 @@ from datetime import datetime from django.conf import settings from django.db import models from django.templatetags.static import static -from django.utils.translation import ugettext_lazy as _ class Product(models.Model): @@ -80,7 +79,7 @@ class OrderLine(models.Model): order = models.ForeignKey("main.Order", on_delete=models.CASCADE, related_name="orderlines") product = models.ForeignKey("main.Product", on_delete=models.CASCADE, related_name="orderlines") amount = models.IntegerField() - unit_price = models.FloatField(verbose_name=_("Enhetspris")) + unit_price = models.FloatField(verbose_name="Enhetspris") @property def price(self): @@ -116,11 +115,11 @@ class InventoryTransaction(models.Model): "main.Product", on_delete=models.CASCADE, related_name="transactions", - verbose_name=_("Produkt"), + verbose_name="Produkt", ) - amount = models.FloatField(verbose_name=_("Antall")) - unit_price = models.FloatField(verbose_name=_("Enhetspris")) - comment = models.TextField(verbose_name=_("Kommentar"), blank=True) + amount = models.FloatField(verbose_name="Antall") + unit_price = models.FloatField(verbose_name="Enhetspris") + comment = models.TextField(verbose_name="Kommentar", blank=True) created = models.DateTimeField(auto_now_add=True) @property