Merge pull request #194

locale(de): update translation - thanks to @CocaCola2701

app/WYGIWYH/settings.py

@@ -163,6 +163,7 @@ AUTH_USER_MODEL = "users.User"
 
 LANGUAGE_CODE = "en"
 LANGUAGES = (
+    ("de", "Deutsch"),
     ("en", "English"),
     ("nl", "Nederlands"),
     ("pt-br", "Português (Brasil)"),

app/apps/rules/models.py

@@ -297,10 +297,8 @@ class UpdateOrCreateTransactionRuleAction(models.Model):
         search_query = Q()
 
         def add_to_query(field_name, value, operator):
-            if isinstance(value, (int, str)):
-                lookup = f"{field_name}__{operator}"
-                return Q(**{lookup: value})
-            return Q()
+            lookup = f"{field_name}__{operator}"
+            return Q(**{lookup: value})
 
         if self.search_account:
             value = simple.eval(self.search_account)

app/apps/rules/tasks.py

@@ -131,14 +131,16 @@ def _process_update_or_create_transaction_action(action, simple_eval):
 
     # Build search query using the helper method
     search_query = action.build_search_query(simple_eval)
+    logger.info("Searching transactions using: %s", search_query)
 
     # Find latest matching transaction or create new
     if search_query:
-        transaction = (
-            Transaction.objects.filter(search_query).order_by("-date", "-id").first()
-        )
+        transactions = Transaction.objects.filter(search_query).order_by("-date", "-id")
+        transaction = transactions.first()
+        logger.info("Found at least one matching transaction, using latest")
     else:
         transaction = None
+        logger.info("No matching transaction found, creating a new transaction")
 
     if not transaction:
         transaction = Transaction()

app/apps/users/migrations/0019_alter_usersettings_language.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-02-24 19:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0018_alter_usersettings_start_page'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='usersettings',
+            name='language',
+            field=models.CharField(choices=[('auto', 'Auto'), ('de', 'Deutsch'), ('en', 'English'), ('nl', 'Nederlands'), ('pt-br', 'Português (Brasil)')], default='auto', max_length=10, verbose_name='Language'),
+        ),
+    ]

app/locale/nl/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-19 23:05-0300\n"
+"POT-Creation-Date: 2025-02-24 16:30-0300\n"
 "PO-Revision-Date: 2025-02-22 15:03+0100\n"
 "Last-Translator: Dimitri Decrock <dimitri@fam-decrock.eu>\n"
 "Language-Team: \n"
@@ -1895,6 +1895,7 @@ msgstr "Sluiten"
 
 #: templates/cotton/config/search.html:6
 #: templates/import_app/fragments/profiles/list_presets.html:13
+#: templates/monthly_overview/pages/overview.html:177
 msgid "Search"
 msgstr "Zoeken"
 
@@ -2866,6 +2867,26 @@ msgstr "Bedragen tonen"
 msgid "Yearly Overview"
 msgstr "Jaaroverzicht"
 
+#, fuzzy
+#~| msgid "From Amount"
+#~ msgid "Principal Amount"
+#~ msgstr "Van Bedrag"
+
+#, fuzzy
+#~| msgid "Interval"
+#~ msgid "Interest"
+#~ msgstr "Interval"
+
+#, fuzzy
+#~| msgid "Management"
+#~ msgid "Loan Payment"
+#~ msgstr "Beheer"
+
+#, fuzzy
+#~| msgid "Management"
+#~ msgid "Loan Payments"
+#~ msgstr "Beheer"
+
 #, fuzzy
 #~| msgid "Installment Plans"
 #~ msgid "Installment Planss"
@@ -2926,11 +2947,6 @@ msgstr "Jaaroverzicht"
 #~ msgid "Reference Date Operator"
 #~ msgstr "Referentiedatum vanaf"
 
-#, fuzzy
-#~| msgid "From Amount"
-#~ msgid "Search Amount"
-#~ msgstr "Van Bedrag"
-
 #, fuzzy
 #~| msgid "Amount max"
 #~ msgid "Amount Operator"

app/locale/pt_BR/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-19 23:05-0300\n"
+"POT-Creation-Date: 2025-02-24 16:30-0300\n"
 "PO-Revision-Date: 2025-02-19 23:06-0300\n"
 "Last-Translator: Herculino Trotta\n"
 "Language-Team: \n"
@@ -1892,6 +1892,7 @@ msgstr "Fechar"
 
 #: templates/cotton/config/search.html:6
 #: templates/import_app/fragments/profiles/list_presets.html:13
+#: templates/monthly_overview/pages/overview.html:177
 msgid "Search"
 msgstr "Buscar"
 
@@ -2861,6 +2862,26 @@ msgstr "Mostrar valores"
 msgid "Yearly Overview"
 msgstr "Visão Anual"
 
+#, fuzzy
+#~| msgid "From Amount"
+#~ msgid "Principal Amount"
+#~ msgstr "Quantia de origem"
+
+#, fuzzy
+#~| msgid "Interval"
+#~ msgid "Interest"
+#~ msgstr "Intervalo"
+
+#, fuzzy
+#~| msgid "Management"
+#~ msgid "Loan Payment"
+#~ msgstr "Gerenciar"
+
+#, fuzzy
+#~| msgid "Management"
+#~ msgid "Loan Payments"
+#~ msgstr "Gerenciar"
+
 #, fuzzy
 #~| msgid "Installment Plans"
 #~ msgid "Installment Planss"
@@ -2926,11 +2947,6 @@ msgstr "Visão Anual"
 #~ msgid "Reference Date Operator"
 #~ msgstr "Data de Referência de"
 
-#, fuzzy
-#~| msgid "From Amount"
-#~ msgid "Search Amount"
-#~ msgstr "Quantia de origem"
-
 #, fuzzy
 #~| msgid "Amount max"
 #~ msgid "Amount Operator"

app/templates/monthly_overview/pages/overview.html

@@ -174,7 +174,7 @@
         </div>
         <div id="search" class="my-3">
           <label class="w-100">
-          <input type="search" class="form-control" placeholder="Buscar" hx-preserve id="quick-search"
+          <input type="search" class="form-control" placeholder="{% translate 'Search' %}" hx-preserve id="quick-search"
                  _="on input or search or htmx:afterSwap from window
                       if my value is empty
                         trigger toggle on <.transactions-divider-collapse/>

frontend/src/application/datepicker.js

@@ -2,12 +2,14 @@ import AirDatepicker from 'air-datepicker';
 import en from 'air-datepicker/locale/en';
 import ptBr from 'air-datepicker/locale/pt-BR';
 import nl from 'air-datepicker/locale/nl';
+import de from 'air-datepicker/locale/de';
 import {createPopper} from '@popperjs/core';
 
 const locales = {
     'pt': ptBr,
     'en': en,
-    'nl': nl
+    'nl': nl,
+    'de': de
 };
 
 function isMobileDevice() {
@@ -43,7 +45,7 @@ window.DatePicker = function createDynamicDatePicker(element) {
         toggleSelected: element.dataset.toggleSelected === 'true',
         autoClose: element.dataset.autoClose === 'true',
         buttons: element.dataset.clearButton === 'true' ? ['clear', todayButton] : [todayButton],
-        locale: locales[element.dataset.language],
+        locale: locales[element.dataset.language] || locales['en'],
         onSelect: ({date, formattedDate, datepicker}) => {
             const _event = new CustomEvent("change", {
                 bubbles: true,
@@ -117,7 +119,7 @@ window.MonthYearPicker = function createDynamicDatePicker(element) {
         toggleSelected: element.dataset.toggleSelected === 'true',
         autoClose: element.dataset.autoClose === 'true',
         buttons: element.dataset.clearButton === 'true' ? ['clear', todayButton] : [todayButton],
-        locale: locales[element.dataset.language],
+        locale: locales[element.dataset.language] || locales['en'],
         onSelect: ({date, formattedDate, datepicker}) => {
             const _event = new CustomEvent("change", {
                 bubbles: true,
@@ -190,7 +192,7 @@ window.YearPicker = function createDynamicDatePicker(element) {
         toggleSelected: element.dataset.toggleSelected === 'true',
         autoClose: element.dataset.autoClose === 'true',
         buttons: element.dataset.clearButton === 'true' ? ['clear', todayButton] : [todayButton],
-        locale: locales[element.dataset.language],
+        locale: locales[element.dataset.language] || locales['en'],
         onSelect: ({date, formattedDate, datepicker}) => {
             const _event = new CustomEvent("change", {
                 bubbles: true,