django-nepkit 0.2.0__tar.gz → 0.2.1__tar.gz

{django_nepkit-0.2.0/django_nepkit.egg-info → django_nepkit-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-nepkit
-Version: 0.2.0
+Version: 0.2.1
 Summary: Django Nepali date, time, phone, and address fields with helpers.
 Home-page: https://github.com/S4NKALP/django-nepkit
 Author: Sankalp Tharu
@@ -28,7 +28,7 @@ License-File: LICENSE
 Requires-Dist: django>=4.2
 Requires-Dist: django-filter>=25.2
 Requires-Dist: djangorestframework>=3.16.1
-Requires-Dist: nepali>=1.1.3
+Requires-Dist: nepali>=1.2.0
 Provides-Extra: drf
 Requires-Dist: djangorestframework>=3.14; extra == "drf"
 Requires-Dist: django-filter>=23.1; extra == "drf"

django_nepkit-0.2.1/django_nepkit/constants.py

@@ -0,0 +1,129 @@
+"""
+Constants for django-nepkit package.
+Contains hardcoded values, word mappings, and configuration data.
+"""
+
+# Nepali number words mapping (0-99)
+NEPALI_ONES = [
+    "",
+    "एक",
+    "दुई",
+    "तीन",
+    "चार",
+    "पाँच",
+    "छ",
+    "सात",
+    "आठ",
+    "नौ",
+    "दश",
+    "एघार",
+    "बाह्र",
+    "तेह्र",
+    "चौध",
+    "पन्ध्र",
+    "सोह्र",
+    "सत्र",
+    "अठार",
+    "उन्नाइस",
+    "बीस",
+    "एकाइस",
+    "बाइस",
+    "तेईस",
+    "चौबीस",
+    "पच्चीस",
+    "छब्बीस",
+    "सत्ताइस",
+    "अठाइस",
+    "उनन्तीस",
+    "तीस",
+    "एकतीस",
+    "बत्तीस",
+    "तेत्तीस",
+    "चौंतीस",
+    "पैंतीस",
+    "छत्तीस",
+    "सैंतीस",
+    "अठतीस",
+    "उनन्चालीस",
+    "चालीस",
+    "एकचालीस",
+    "बयालीस",
+    "त्रिचालीस",
+    "चवालीस",
+    "पैंतालीस",
+    "छयालीस",
+    "सत्तालीस",
+    "अठचालीस",
+    "उनन्पचास",
+    "पचास",
+    "एकाउन्न",
+    "बाउन्न",
+    "त्रिपन्न",
+    "चउन्न",
+    "पचपन्न",
+    "छपन्न",
+    "सन्ताउन्न",
+    "अन्ठाउन्न",
+    "उनन्साठी",
+    "साठी",
+    "एकसाठी",
+    "बासट्ठी",
+    "त्रिसट्ठी",
+    "चौसट्ठी",
+    "पैंसट्ठी",
+    "छयसट्ठी",
+    "सतसट्ठी",
+    "अठसट्ठी",
+    "उनन्सत्तरी",
+    "सत्तरी",
+    "एकहत्तर",
+    "बाहत्तर",
+    "त्रिहत्तर",
+    "चौरहत्तर",
+    "पचहत्तर",
+    "छयहत्तर",
+    "सतहत्तर",
+    "अठहत्तर",
+    "उनन्असी",
+    "असी",
+    "एकासी",
+    "बयासी",
+    "त्रियासी",
+    "चौरासी",
+    "पचासी",
+    "छयासी",
+    "सतासी",
+    "अठासी",
+    "उनन्नब्बे",
+    "नब्बे",
+    "एकानब्बे",
+    "बयानब्बे",
+    "त्रियानब्बे",
+    "चौरानब्बे",
+    "पञ्चानब्बे",
+    "छ्यानब्बे",
+    "सन्तानब्बे",
+    "अन्ठानब्बे",
+    "उनन्सय",
+]
+
+# Nepali number units and their corresponding names
+NEPALI_UNITS = [
+    ("", ""),
+    (100, "सय"),
+    (1000, "हजार"),
+    (100000, "लाख"),
+    (10000000, "करोड"),
+    (1000000000, "अरब"),
+    (100000000000, "खरब"),
+]
+
+# Placeholder text for location selects
+PLACEHOLDERS = {
+    "province": {"ne": "प्रदेश छान्नुहोस्", "en": "Select Province"},
+    "district": {"ne": "जिल्ला छान्नुहोस्", "en": "Select District"},
+    "municipality": {"ne": "नगरपालिका छान्नुहोस्", "en": "Select Municipality"},
+}
+
+# Internal parameters to exclude from fallback logic
+INTERNAL_PARAMS = ["ne", "en", "html"]

django_nepkit-0.2.1/django_nepkit/lang_utils.py

@@ -0,0 +1,52 @@
+"""
+Language parameter utilities for django-nepkit.
+Helper functions to resolve Nepali/English language parameters consistently.
+"""
+
+from django_nepkit.conf import nepkit_settings
+
+
+def resolve_language_params(ne=None, en=None, **kwargs):
+    """
+    Resolve language parameters with fallback to default settings.
+    """
+    default_lang = nepkit_settings.DEFAULT_LANGUAGE
+
+    # Extract from kwargs if provided
+    if ne is None and "ne" in kwargs:
+        ne = kwargs.get("ne")
+    if en is None and "en" in kwargs:
+        en = kwargs.get("en")
+
+    # Set defaults
+    if ne is None:
+        ne = default_lang == "ne"
+
+    # Handle en parameter logic
+    explicit_en = en is not None
+    if en is None:
+        en = not ne
+
+    # If ne is True and en wasn't explicitly set, en should be False
+    if ne and not explicit_en:
+        en = False
+
+    return ne, en
+
+
+def pop_language_params(kwargs):
+    """
+    Pop ne/en parameters from kwargs dict and return resolved values.
+    """
+    default_lang = nepkit_settings.DEFAULT_LANGUAGE
+    ne = kwargs.pop("ne", default_lang == "ne")
+
+    explicit_en = "en" in kwargs
+    en_value = kwargs.pop("en", not ne)
+
+    if ne and not explicit_en:
+        en = False
+    else:
+        en = en_value
+
+    return ne, en

{django_nepkit-0.2.0 → django_nepkit-0.2.1}/django_nepkit/models.py

@@ -7,7 +7,6 @@ from django.utils.translation import gettext_lazy as _
 from nepali.datetime import nepalidate, nepalidatetime
 from nepali.locations import districts, municipalities, provinces
 
-from django_nepkit.forms import NepaliDateFormField
 from django_nepkit.utils import (
     BS_DATE_FORMAT,
     BS_DATETIME_FORMAT,
@@ -172,6 +171,9 @@ class NepaliDateField(BaseNepaliBSField):
     parse_func = staticmethod(try_parse_nepali_date)
 
     def formfield(self, **kwargs):
+        # Import here to avoid circular dependency
+        from django_nepkit.forms import NepaliDateFormField
+
         kwargs.setdefault("form_class", NepaliDateFormField)
         return super().formfield(**kwargs)
 
@@ -206,13 +208,7 @@ class BaseLocationField(NepaliFieldMixin, models.CharField):
         return [(self._get_name(item, ne), self._get_name(item, ne)) for item in source]
 
     def _get_name(self, item, ne):
-        name = getattr(item, "name_nepali", item.name) if ne else item.name
-        # Handle name variations and Koshi Province mapping
-        if name == "Province 1":
-            return "Koshi Province"
-        if name == "प्रदेश नं. १":
-            return "कोशी प्रदेश"
-        return name
+        return getattr(item, "name_nepali", item.name) if ne else item.name
 
     def formfield(self, **kwargs):
         widget_cls = getattr(self, "widget_class", None)

{django_nepkit-0.2.0 → django_nepkit-0.2.1}/django_nepkit/static/django_nepkit/js/address-chaining.js

@@ -1,6 +1,20 @@
 (function() {
     'use strict';
 
+    // Placeholder text constants
+    const PLACEHOLDERS = {
+        province: { ne: 'प्रदेश छान्नुहोस्', en: 'Select Province' },
+        district: { ne: 'जिल्ला छान्नुहोस्', en: 'Select District' },
+        municipality: { ne: 'नगरपालिका छान्नुहोस्', en: 'Select Municipality' }
+    };
+
+    /**
+     * Get placeholder text for a specific location type
+     */
+    function getPlaceholder(type, isNepali) {
+        return PLACEHOLDERS[type][isNepali ? 'ne' : 'en'];
+    }
+
     function updateOptions(selectElement, data, placeholder) {
         selectElement.innerHTML = '';
         if (placeholder) {
@@ -43,7 +57,45 @@
         return null;
     }
 
+    /**
+     * Fetch data from server endpoint
+     */
+    function fetchData(selectElement, paramName, paramValue, placeholderType, isNepali) {
+        if (!selectElement.dataset.url) return;
+
+        let url = selectElement.dataset.url + '?' + paramName + '=' + encodeURIComponent(paramValue);
+        if (isNepali) url += '&ne=true';
+        if (selectElement.dataset.en === 'true') url += '&en=true';
+
+        fetch(url)
+            .then(response => response.json())
+            .then(data => {
+                updateOptions(selectElement, data, getPlaceholder(placeholderType, isNepali));
+            });
+    }
+
+    /**
+     * Update dependent select element based on parent value
+     */
+    function updateDependentSelect(childSelect, dataType, parentValue, placeholderType, isNepali, paramName) {
+        if (!childSelect) return;
+
+        if (!parentValue) {
+            updateOptions(childSelect, [], getPlaceholder(placeholderType, isNepali));
+            return;
+        }
+
+        const localData = getLocalData(dataType, parentValue, isNepali);
+
+        if (localData) {
+            updateOptions(childSelect, localData, getPlaceholder(placeholderType, isNepali));
+        } else {
+            fetchData(childSelect, paramName, parentValue, placeholderType, isNepali);
+        }
+    }
+
     function init() {
+        // Initialize province selects
         document.querySelectorAll('.nepkit-province-select').forEach(provinceSelect => {
             const isNepali = provinceSelect.dataset.ne === 'true';
             const container = provinceSelect.closest('form') || document;
@@ -52,14 +104,15 @@
 
             if (!provinceSelect.value) {
                 if (districtSelect && !districtSelect.value) {
-                    updateOptions(districtSelect, [], isNepali ? 'जिल्ला छान्नुहोस्' : 'Select District');
+                    updateOptions(districtSelect, [], getPlaceholder('district', isNepali));
                 }
                 if (municipalitySelect && !municipalitySelect.value) {
-                    updateOptions(municipalitySelect, [], isNepali ? 'नगरपालिका छान्नुहोस्' : 'Select Municipality');
+                    updateOptions(municipalitySelect, [], getPlaceholder('municipality', isNepali));
                 }
             }
         });
 
+        // Initialize district selects
         document.querySelectorAll('.nepkit-district-select').forEach(districtSelect => {
             const isNepali = districtSelect.dataset.ne === 'true';
             const container = districtSelect.closest('form') || document;
@@ -67,13 +120,14 @@
 
             if (!districtSelect.value) {
                 if (municipalitySelect && !municipalitySelect.value) {
-                    updateOptions(municipalitySelect, [], isNepali ? 'नगरपालिका छान्नुहोस्' : 'Select Municipality');
+                    updateOptions(municipalitySelect, [], getPlaceholder('municipality', isNepali));
                 }
             }
         });
     }
 
     document.addEventListener('change', function(e) {
+        // Handle province select change
         if (e.target.matches('.nepkit-province-select')) {
             const province = e.target.value;
             const isNepali = e.target.dataset.ne === 'true';
@@ -83,63 +137,22 @@
 
             // Always clear municipality if province changes
             if (municipalitySelect) {
-                updateOptions(municipalitySelect, [], isNepali ? 'नगरपालिका छान्नुहोस्' : 'Select Municipality');
+                updateOptions(municipalitySelect, [], getPlaceholder('municipality', isNepali));
             }
 
-            if (districtSelect) {
-                if (!province) {
-                    updateOptions(districtSelect, [], isNepali ? 'जिल्ला छान्नुहोस्' : 'Select District');
-                    return;
-                }
-
-                const localData = getLocalData('districts', province, isNepali);
-
-                if (localData) {
-                    updateOptions(districtSelect, localData, isNepali ? 'जिल्ला छान्नुहोस्' : 'Select District');
-                } else if (districtSelect.dataset.url) {
-                    // Fallback to AJAX
-                    let url = districtSelect.dataset.url + '?province=' + encodeURIComponent(province);
-                    if (isNepali) url += '&ne=true';
-                    if (districtSelect.dataset.en === 'true') url += '&en=true';
-
-                    fetch(url)
-                        .then(response => response.json())
-                        .then(data => {
-                            updateOptions(districtSelect, data, isNepali ? 'जिल्ला छान्नुहोस्' : 'Select District');
-                        });
-                }
-            }
+            // Update district options
+            updateDependentSelect(districtSelect, 'districts', province, 'district', isNepali, 'province');
         }
 
+        // Handle district select change
         if (e.target.matches('.nepkit-district-select')) {
             const district = e.target.value;
             const isNepali = e.target.dataset.ne === 'true';
             const container = e.target.closest('form') || document;
             const municipalitySelect = getMatchingSelect(container, '.nepkit-municipality-select', isNepali);
 
-            if (municipalitySelect) {
-                if (!district) {
-                    updateOptions(municipalitySelect, [], isNepali ? 'नगरपालिका छान्नुहोस्' : 'Select Municipality');
-                    return;
-                }
-
-                const localData = getLocalData('municipalities', district, isNepali);
-
-                if (localData) {
-                    updateOptions(municipalitySelect, localData, isNepali ? 'नगरपालिका छान्नुहोस्' : 'Select Municipality');
-                } else if (municipalitySelect.dataset.url) {
-                    // Fallback to AJAX
-                    let url = municipalitySelect.dataset.url + '?district=' + encodeURIComponent(district);
-                    if (isNepali) url += '&ne=true';
-                    if (municipalitySelect.dataset.en === 'true') url += '&en=true';
-
-                    fetch(url)
-                        .then(response => response.json())
-                        .then(data => {
-                            updateOptions(municipalitySelect, data, isNepali ? 'नगरपालिका छान्नुहोस्' : 'Select Municipality');
-                        });
-                }
-            }
+            // Update municipality options
+            updateDependentSelect(municipalitySelect, 'municipalities', district, 'municipality', isNepali, 'district');
         }
     });