Merge pull request #813 from hackerspace-ntnu/fix-loan-from-dates

updates locales and add date supported formats

files/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 20:23+0200\n"
+"POT-Creation-Date: 2024-04-11 12:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -57,7 +57,7 @@ msgid "Last opp bilde"
 msgstr "Upload new image"
 
 #: files/templates/files/image_confirm_delete.html:4
-msgid "Are you sure you want to delete "
+msgid "Er du sikker på at du vil slette "
 msgstr "Are you sure you want to delete "
 
 #: files/templates/files/images-modal.html:8
@@ -95,3 +95,6 @@ msgstr "Delete"
 #: files/templates/files/single-image.html:12
 msgid "Velg"
 msgstr "Select"
+
+#~ msgid "Are you sure you want to delete "
+#~ msgstr "Are you sure you want to delete "

files/locale/nb/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 20:23+0200\n"
+"POT-Creation-Date: 2024-04-11 12:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -56,7 +56,7 @@ msgid "Last opp bilde"
 msgstr ""
 
 #: files/templates/files/image_confirm_delete.html:4
-msgid "Are you sure you want to delete "
+msgid "Er du sikker på at du vil slette "
 msgstr ""
 
 #: files/templates/files/images-modal.html:8

files/templates/files/image_confirm_delete.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 
 <form method="post">{% csrf_token %}
-    <p>{% trans "Are you sure you want to delete " %}{{ object }}?</p>
+    <p>{% trans "Er du sikker på at du vil slette " %}{{ object }}?</p>
     <input type="submit" value="Confirm">
 </form>

inventory/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-11 00:10+0200\n"
+"POT-Creation-Date: 2024-04-11 12:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,11 +18,51 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: inventory/models/item.py:16 inventory/templates/inventory/inventory.html:25
+#: inventory/templates/inventory/inventory.html:33
+msgid "Navn"
+msgstr "Name"
+
+#: inventory/models/item.py:17 inventory/templates/inventory/inventory.html:31
+#: inventory/templates/inventory/inventory.html:32
+msgid "Lagerbeholdning"
+msgstr "Inventory Quantity"
+
+#: inventory/models/item.py:19
+#, fuzzy
+#| msgid "Lagerbeholdning"
+msgid "Ukjent lagerbeholdning"
+msgstr "Inventory Quantity"
+
+#: inventory/models/item.py:22
+msgid "Kan lånes"
+msgstr "Can be borrowed"
+
+#: inventory/models/item.py:24
+msgid "Beskrivelse"
+msgstr "Description"
+
+#: inventory/models/item.py:26
+msgid "Bilde"
+msgstr "Image"
+
+#: inventory/models/item.py:28 inventory/templates/inventory/items_list.html:30
+msgid "Hylleplass"
+msgstr "Shelf Location"
+
+#: inventory/models/item.py:30
+msgid "Maks lånevarighet (dager)"
+msgstr "Max borrow duration (days)"
+
+#: inventory/models/item.py:33
+msgid "Detaljsidevisninger"
+msgstr "Page views"
+
 #: inventory/models/item_loan.py:25
 msgid "Lån fra"
 msgstr "Borrow from"
 
-#: inventory/templates/inventory/edit_item.html:13
+#: inventory/templates/inventory/edit_item.html:11
 msgid "Rediger lagerinnslag"
 msgstr "Edit inventory item"
 
@@ -58,11 +98,6 @@ msgstr "View equipment and apparatus"
 msgid "Ting, tang og tare"
 msgstr "Things and stuff"
 
-#: inventory/templates/inventory/inventory.html:25
-#: inventory/templates/inventory/inventory.html:33
-msgid "Navn"
-msgstr "Name"
-
 #: inventory/templates/inventory/inventory.html:29
 msgid "Velg sorteringskriterie"
 msgstr "Choose sorting criterion"
@@ -71,11 +106,6 @@ msgstr "Choose sorting criterion"
 msgid "Popularitet"
 msgstr "Popularity"
 
-#: inventory/templates/inventory/inventory.html:31
-#: inventory/templates/inventory/inventory.html:32
-msgid "Lagerbeholdning"
-msgstr "Inventory Quantity"
-
 #: inventory/templates/inventory/inventory.html:31
 msgid "Synkende"
 msgstr "Descending"
@@ -106,10 +136,6 @@ msgstr "None"
 msgid "på lager"
 msgstr "in stock"
 
-#: inventory/templates/inventory/items_list.html:30
-msgid "Hylleplass"
-msgstr "Shelf Location"
-
 #: inventory/templates/inventory/items_list.html:34
 msgid "forventet på lager"
 msgstr "expected in stock"
@@ -142,10 +168,16 @@ msgstr "Loan applications"
 msgid "Oversikt over lånesøknader"
 msgstr "Overview of loan applications"
 
-#: inventory/views/item_loan.py:107
+#: inventory/views/item_loan.py:102
 msgid "Lånesøknaden er avslått"
 msgstr "Loan applications is denied"
 
-#: inventory/views/item_loan.py:124
+#: inventory/views/item_loan.py:119
 msgid "Lånesøknaden er lukket"
 msgstr "Loan application is closed"
+
+#: inventory/views/item_loan.py:146
+#, fuzzy
+#| msgid "Lånesøknaden er avslått"
+msgid "Lånesøknaden er registrert!"
+msgstr "Loan applications is denied"

inventory/locale/nb/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-11 00:09+0200\n"
+"POT-Creation-Date: 2024-04-11 12:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,11 +18,49 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: inventory/models/item.py:16 inventory/templates/inventory/inventory.html:25
+#: inventory/templates/inventory/inventory.html:33
+msgid "Navn"
+msgstr ""
+
+#: inventory/models/item.py:17 inventory/templates/inventory/inventory.html:31
+#: inventory/templates/inventory/inventory.html:32
+msgid "Lagerbeholdning"
+msgstr ""
+
+#: inventory/models/item.py:19
+msgid "Ukjent lagerbeholdning"
+msgstr ""
+
+#: inventory/models/item.py:22
+msgid "Kan lånes"
+msgstr ""
+
+#: inventory/models/item.py:24
+msgid "Beskrivelse"
+msgstr ""
+
+#: inventory/models/item.py:26
+msgid "Bilde"
+msgstr ""
+
+#: inventory/models/item.py:28 inventory/templates/inventory/items_list.html:30
+msgid "Hylleplass"
+msgstr ""
+
+#: inventory/models/item.py:30
+msgid "Maks lånevarighet (dager)"
+msgstr ""
+
+#: inventory/models/item.py:33
+msgid "Detaljsidevisninger"
+msgstr ""
+
 #: inventory/models/item_loan.py:25
 msgid "Lån fra"
 msgstr ""
 
-#: inventory/templates/inventory/edit_item.html:13
+#: inventory/templates/inventory/edit_item.html:11
 msgid "Rediger lagerinnslag"
 msgstr ""
 
@@ -53,11 +91,6 @@ msgstr ""
 msgid "Ting, tang og tare"
 msgstr ""
 
-#: inventory/templates/inventory/inventory.html:25
-#: inventory/templates/inventory/inventory.html:33
-msgid "Navn"
-msgstr ""
-
 #: inventory/templates/inventory/inventory.html:29
 msgid "Velg sorteringskriterie"
 msgstr ""
@@ -66,11 +99,6 @@ msgstr ""
 msgid "Popularitet"
 msgstr ""
 
-#: inventory/templates/inventory/inventory.html:31
-#: inventory/templates/inventory/inventory.html:32
-msgid "Lagerbeholdning"
-msgstr ""
-
 #: inventory/templates/inventory/inventory.html:31
 msgid "Synkende"
 msgstr ""
@@ -101,10 +129,6 @@ msgstr ""
 msgid "på lager"
 msgstr ""
 
-#: inventory/templates/inventory/items_list.html:30
-msgid "Hylleplass"
-msgstr ""
-
 #: inventory/templates/inventory/items_list.html:34
 msgid "forventet på lager"
 msgstr ""
@@ -137,10 +161,14 @@ msgstr ""
 msgid "Oversikt over lånesøknader"
 msgstr ""
 
-#: inventory/views/item_loan.py:107
+#: inventory/views/item_loan.py:102
 msgid "Lånesøknaden er avslått"
 msgstr ""
 
-#: inventory/views/item_loan.py:124
+#: inventory/views/item_loan.py:119
 msgid "Lånesøknaden er lukket"
 msgstr ""
+
+#: inventory/views/item_loan.py:146
+msgid "Lånesøknaden er registrert!"
+msgstr ""

inventory/views/item_loan.py

@@ -143,9 +143,10 @@ class ItemLoanApplicationView(CreateView):
         "consent",
     ]
     template_name = "inventory/loan_apply.html"
-    success_message = "Lånesøknaden er registrert!"
+    success_message = _("Lånesøknaden er registrert!")
     success_url = reverse_lazy("inventory:inventory")
     months_max_ahead = 1
+    date_format = "%d.%m.%Y"
 
     def get_success_url(self):
         # SuccessMessageMixin doesn't actually work so fuck it
@@ -187,8 +188,11 @@ def get_form(self, *args, **kwargs):
         form = super().get_form(*args, **kwargs)
         form.fields["loan_to"].widget.attrs["class"] = "datepicker"
         form.fields["loan_from"].widget.attrs["class"] = "datepicker"
-        form.fields["loan_from"].widget.format = "%d.%m.%Y"  # Set date format
-        form.fields["loan_to"].widget.format = "%d.%m.%Y"  # Set date format
+        form.fields["loan_from"].widget.format = self.date_format
+        form.fields["loan_to"].widget.format = self.date_format
+        form.fields["loan_from"].input_formats.append(self.date_format)
+        form.fields["loan_to"].input_formats.append(self.date_format)
+        print(form.fields["loan_from"].input_formats)
         return form
 
     def get_context_data(self, **kwargs):