diff --git a/config/__pycache__/settings.cpython-311.pyc b/config/__pycache__/settings.cpython-311.pyc index 71feee1..8d9d456 100644 Binary files a/config/__pycache__/settings.cpython-311.pyc and b/config/__pycache__/settings.cpython-311.pyc differ diff --git a/config/settings.py b/config/settings.py index 252ca9c..be01bfa 100644 --- a/config/settings.py +++ b/config/settings.py @@ -139,7 +139,7 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization # https://docs.djangoproject.com/en/5.2/topics/i18n/ -LANGUAGE_CODE = 'en' +LANGUAGE_CODE = 'ar' TIME_ZONE = 'UTC' diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc index 30bef6c..485f75a 100644 Binary files a/core/__pycache__/models.cpython-311.pyc and b/core/__pycache__/models.cpython-311.pyc differ diff --git a/core/migrations/0013_alter_truck_registration_back_and_more.py b/core/migrations/0013_alter_truck_registration_back_and_more.py new file mode 100644 index 0000000..ab894d7 --- /dev/null +++ b/core/migrations/0013_alter_truck_registration_back_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 5.2.7 on 2026-01-23 16:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0012_remove_truck_driver_license_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='truck', + name='registration_back', + field=models.ImageField(blank=True, null=True, upload_to='docs/', verbose_name='Registration (Back Face)'), + ), + migrations.AlterField( + model_name='truck', + name='registration_front', + field=models.ImageField(blank=True, null=True, upload_to='docs/', verbose_name='Registration (Front Face)'), + ), + ] diff --git a/core/migrations/__pycache__/0013_alter_truck_registration_back_and_more.cpython-311.pyc b/core/migrations/__pycache__/0013_alter_truck_registration_back_and_more.cpython-311.pyc new file mode 100644 index 0000000..8add192 Binary files /dev/null and b/core/migrations/__pycache__/0013_alter_truck_registration_back_and_more.cpython-311.pyc differ diff --git a/core/models.py b/core/models.py index 0995c2c..aa235a7 100644 --- a/core/models.py +++ b/core/models.py @@ -107,8 +107,8 @@ class Truck(models.Model): # Pictures truck_picture = models.ImageField(_('Truck Picture'), upload_to='trucks/', blank=True, null=True) - registration_front = models.ImageField(_('Registration Front'), upload_to='docs/', blank=True, null=True) - registration_back = models.ImageField(_('Registration Back'), upload_to='docs/', blank=True, null=True) + registration_front = models.ImageField(_('Registration (Front Face)'), upload_to='docs/', blank=True, null=True) + registration_back = models.ImageField(_('Registration (Back Face)'), upload_to='docs/', blank=True, null=True) driver_license_front = models.ImageField(_('Driver License (Front Face)'), upload_to='docs/', blank=True, null=True) driver_license_back = models.ImageField(_('Driver License (Back Face)'), upload_to='docs/', blank=True, null=True) diff --git a/core/templates/core/admin_dashboard.html b/core/templates/core/admin_dashboard.html index d51c0ed..52ee6f7 100644 --- a/core/templates/core/admin_dashboard.html +++ b/core/templates/core/admin_dashboard.html @@ -225,7 +225,7 @@
{% trans "Documents & Registration" %}
-

{% trans "Registration Front" %}

+

{% trans "Registration (Front Face)" %}

-

{% trans "Registration Back" %}

+

{% trans "Registration (Back Face)" %}

-

{% trans "License Front" %}

+

{% trans "Driver License (Front Face)" %}

-

{% trans "License Back" %}

+

{% trans "Driver License (Back Face)" %}

diff --git a/locale/ar/LC_MESSAGES/django.mo b/locale/ar/LC_MESSAGES/django.mo index c0299ed..bd3012c 100644 Binary files a/locale/ar/LC_MESSAGES/django.mo and b/locale/ar/LC_MESSAGES/django.mo differ diff --git a/locale/ar/LC_MESSAGES/django.po b/locale/ar/LC_MESSAGES/django.po index ce3abdf..9248e31 100644 --- a/locale/ar/LC_MESSAGES/django.po +++ b/locale/ar/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-01-23 15:31+0000\n" +"POT-Creation-Date: 2026-01-23 16:23+0000\n" "PO-Revision-Date: 2026-01-23 10:45+0000\n" "Last-Translator: Gemini\n" "Language-Team: Arabic\n" @@ -55,44 +55,44 @@ msgstr "حقلا البريد الإلكتروني غير متطابقين." msgid "OTP Code" msgstr "رمز التحقق" -#: core/forms.py:90 core/forms.py:114 core/models.py:40 +#: core/forms.py:91 core/forms.py:115 core/models.py:40 #: core/templates/core/post_shipment.html:29 #: core/templates/core/truck_register.html:32 msgid "Truck Type" msgstr "نوع الشاحنة" -#: core/forms.py:133 +#: core/forms.py:134 msgid "You must have an approved truck to place a bid." msgstr "يجب أن يكون لديك شاحنة معتمدة لتقديم عرض." -#: core/forms.py:136 core/models.py:156 +#: core/forms.py:137 core/models.py:157 #: core/templates/core/post_shipment.html:17 msgid "Goods Description" msgstr "وصف البضائع" -#: core/forms.py:137 core/models.py:157 +#: core/forms.py:138 core/models.py:158 #: core/templates/core/post_shipment.html:24 msgid "Weight/Volume" msgstr "الوزن/الحجم" -#: core/forms.py:138 core/models.py:160 +#: core/forms.py:139 core/models.py:161 #: core/templates/core/shipment_detail.html:25 #, fuzzy #| msgid "Truck Type" msgid "Required Truck Type" msgstr "نوع الشاحنة" -#: core/forms.py:145 core/models.py:170 +#: core/forms.py:146 core/models.py:171 #: core/templates/core/shipment_detail.html:35 msgid "Requested Delivery Date" msgstr "تاريخ التسليم المطلوب" -#: core/forms.py:146 core/models.py:201 +#: core/forms.py:147 core/models.py:202 #: core/templates/core/truck_owner_dashboard.html:32 msgid "Offer Amount" msgstr "قيمة العرض" -#: core/forms.py:147 core/models.py:202 +#: core/forms.py:148 core/models.py:203 msgid "Comments" msgstr "تعليقات" @@ -198,101 +198,116 @@ msgstr "الحمولة" msgid "Color (AR)" msgstr "اللون" -#: core/models.py:104 core/templates/core/admin_dashboard.html:189 +#: core/models.py:104 core/templates/core/admin_dashboard.html:191 #: core/templates/core/marketplace.html:28 #: core/templates/core/truck_register.html:84 msgid "Year" msgstr "السنة" #: core/models.py:105 core/templates/core/admin_dashboard.html:63 -#: core/templates/core/admin_dashboard.html:121 -#: core/templates/core/admin_dashboard.html:193 +#: core/templates/core/admin_dashboard.html:122 +#: core/templates/core/admin_dashboard.html:195 #: core/templates/core/truck_register.html:89 msgid "Plate No" msgstr "رقم اللوحة" #: core/models.py:106 core/templates/core/truck_register.html:94 msgid "Registration Expiry Date" -msgstr "تاريخ انتهاء التسجيل" +msgstr "تاريخ انتهاء الاستمارة" #: core/models.py:109 core/templates/core/truck_register.html:105 msgid "Truck Picture" msgstr "صورة الشاحنة" -#: core/models.py:110 core/templates/core/admin_dashboard.html:226 -msgid "Registration Front" -msgstr "التسجيل (الوجه الأمامي)" +#: core/models.py:110 core/templates/core/admin_dashboard.html:228 +#: core/templates/core/truck_register.html:141 +#, fuzzy +#| msgid "Registration Front" +msgid "Registration (Front Face)" +msgstr "واجهة استمارة السيارة" -#: core/models.py:111 core/templates/core/admin_dashboard.html:235 -msgid "Registration Back" -msgstr "التسجيل (الوجه الخلفي)" +#: core/models.py:111 core/templates/core/admin_dashboard.html:237 +#: core/templates/core/truck_register.html:151 +#, fuzzy +#| msgid "Registration Back" +msgid "Registration (Back Face)" +msgstr "خلفية استمارة السيارة" -#: core/models.py:112 core/templates/core/admin_dashboard.html:244 -#: core/templates/core/truck_register.html:115 -msgid "Driver License" -msgstr "رخصة القيادة" +#: core/models.py:112 core/templates/core/admin_dashboard.html:246 +#: core/templates/core/truck_register.html:118 +#, fuzzy +#| msgid "Driver License" +msgid "Driver License (Front Face)" +msgstr "واجهة رخصة القيادة" -#: core/models.py:114 +#: core/models.py:113 core/templates/core/admin_dashboard.html:255 +#: core/templates/core/truck_register.html:128 +#, fuzzy +#| msgid "Driver License" +msgid "Driver License (Back Face)" +msgstr "خلفية رخصة القيادة" + +#: core/models.py:115 msgid "Is Approved" msgstr "معتمد" -#: core/models.py:150 +#: core/models.py:151 msgid "Open for Bids" msgstr "مفتوح للعروض" -#: core/models.py:151 +#: core/models.py:152 msgid "In Progress" msgstr "قيد التنفيذ" -#: core/models.py:152 +#: core/models.py:153 msgid "Completed" msgstr "مكتمل" -#: core/models.py:153 +#: core/models.py:154 msgid "Cancelled" msgstr "ملغي" -#: core/models.py:167 +#: core/models.py:168 msgid "Origin (Legacy)" msgstr "" -#: core/models.py:168 +#: core/models.py:169 #, fuzzy #| msgid "Destination" msgid "Destination (Legacy)" msgstr "الوجهة" -#: core/models.py:194 core/templates/core/shipper_dashboard.html:55 +#: core/models.py:195 core/templates/core/shipper_dashboard.html:55 #: core/templates/core/truck_owner_dashboard.html:49 #: core/templates/core/truck_owner_dashboard.html:115 msgid "Pending" msgstr "قيد الانتظار" -#: core/models.py:195 core/templates/core/shipper_dashboard.html:57 +#: core/models.py:196 core/templates/core/shipper_dashboard.html:57 #: core/templates/core/truck_owner_dashboard.html:51 msgid "Accepted" msgstr "مقبول" -#: core/models.py:196 core/templates/core/shipper_dashboard.html:59 +#: core/models.py:197 core/templates/core/shipper_dashboard.html:59 #: core/templates/core/truck_owner_dashboard.html:53 msgid "Rejected" msgstr "مرفوض" -#: core/models.py:220 +#: core/models.py:221 msgid "Wablas API Token" msgstr "" -#: core/models.py:221 +#: core/models.py:222 msgid "Wablas Secret Key" msgstr "" -#: core/models.py:222 +#: core/models.py:223 #, fuzzy #| msgid "My Active Bids" msgid "Is Active" msgstr "عروضي النشطة" -#: core/models.py:225 core/models.py:226 core/models.py:229 +#: core/models.py:226 core/models.py:227 core/models.py:230 #, fuzzy #| msgid "WhatsApp Integration" msgid "WhatsApp Configuration" @@ -417,134 +432,135 @@ msgid "Pending Truck Approvals" msgstr "طلبات اعتماد الشاحنات المعلقة" #: core/templates/core/admin_dashboard.html:61 -#: core/templates/core/admin_dashboard.html:119 -#: core/templates/core/admin_dashboard.html:209 +#: core/templates/core/admin_dashboard.html:120 +#: core/templates/core/admin_dashboard.html:211 #: core/templates/core/marketplace.html:32 #: core/templates/core/place_bid.html:25 msgid "Owner" msgstr "المالك" #: core/templates/core/admin_dashboard.html:62 -#: core/templates/core/admin_dashboard.html:120 -#: core/templates/core/admin_dashboard.html:172 +#: core/templates/core/admin_dashboard.html:121 +#: core/templates/core/admin_dashboard.html:174 msgid "Truck Details" msgstr "تفاصيل الشاحنة" #: core/templates/core/admin_dashboard.html:64 -#: core/templates/core/admin_dashboard.html:122 +#: core/templates/core/admin_dashboard.html:123 msgid "Actions" msgstr "الإجراءات" -#: core/templates/core/admin_dashboard.html:91 -#: core/templates/core/admin_dashboard.html:149 +#: core/templates/core/admin_dashboard.html:92 +#: core/templates/core/admin_dashboard.html:151 msgid "View" msgstr "عرض" -#: core/templates/core/admin_dashboard.html:94 +#: core/templates/core/admin_dashboard.html:95 msgid "Approve" msgstr "اعتماد" -#: core/templates/core/admin_dashboard.html:100 +#: core/templates/core/admin_dashboard.html:101 msgid "No trucks awaiting approval." msgstr "لا توجد شاحنات في انتظار الاعتماد." -#: core/templates/core/admin_dashboard.html:112 +#: core/templates/core/admin_dashboard.html:113 msgid "Manage Approved Trucks" msgstr "إدارة الشاحنات المعتمدة" -#: core/templates/core/admin_dashboard.html:152 +#: core/templates/core/admin_dashboard.html:154 msgid "Suspend" msgstr "تعليق" -#: core/templates/core/admin_dashboard.html:158 +#: core/templates/core/admin_dashboard.html:160 msgid "No approved trucks yet." msgstr "لا توجد شاحنات معتمدة بعد." -#: core/templates/core/admin_dashboard.html:178 +#: core/templates/core/admin_dashboard.html:180 #: core/templates/core/truck_register.html:81 msgid "General Information" msgstr "معلومات عامة" -#: core/templates/core/admin_dashboard.html:181 +#: core/templates/core/admin_dashboard.html:183 msgid "Type" msgstr "النوع" -#: core/templates/core/admin_dashboard.html:185 +#: core/templates/core/admin_dashboard.html:187 #: core/templates/core/truck_register.html:44 msgid "Model" msgstr "الموديل" -#: core/templates/core/admin_dashboard.html:197 +#: core/templates/core/admin_dashboard.html:199 #: core/templates/core/marketplace.html:29 #, fuzzy #| msgid "Capacity:" msgid "Capacity" msgstr "الحمولة:" -#: core/templates/core/admin_dashboard.html:201 +#: core/templates/core/admin_dashboard.html:203 #: core/templates/core/truck_register.html:54 msgid "Color" msgstr "اللون" -#: core/templates/core/admin_dashboard.html:205 +#: core/templates/core/admin_dashboard.html:207 msgid "Expiry Date" msgstr "تاريخ الانتهاء" -#: core/templates/core/admin_dashboard.html:215 +#: core/templates/core/admin_dashboard.html:217 #, fuzzy #| msgid "Truck Type" msgid "Truck Image" -msgstr "نوع الشاحنة" +msgstr "صورة الشاحنة" -#: core/templates/core/admin_dashboard.html:218 +#: core/templates/core/admin_dashboard.html:220 msgid "No image provided" msgstr "لم يتم توفير صورة" -#: core/templates/core/admin_dashboard.html:223 +#: core/templates/core/admin_dashboard.html:225 #, fuzzy #| msgid "Submit Registration" msgid "Documents & Registration" -msgstr "إرسال التسجيل" +msgstr "المستندات والاستمارة" -#: core/templates/core/admin_dashboard.html:231 -#: core/templates/core/admin_dashboard.html:240 -#: core/templates/core/admin_dashboard.html:249 +#: core/templates/core/admin_dashboard.html:233 +#: core/templates/core/admin_dashboard.html:242 +#: core/templates/core/admin_dashboard.html:251 +#: core/templates/core/admin_dashboard.html:260 msgid "Not available" msgstr "غير متوفر" -#: core/templates/core/admin_dashboard.html:255 +#: core/templates/core/admin_dashboard.html:266 msgid "Close" msgstr "إغلاق" -#: core/templates/core/admin_dashboard.html:262 +#: core/templates/core/admin_dashboard.html:273 msgid "Quick Actions" msgstr "إجراءات سريعة" -#: core/templates/core/admin_dashboard.html:271 +#: core/templates/core/admin_dashboard.html:282 msgid "View Landing Page" msgstr "عرض الصفحة الرئيسية" -#: core/templates/core/admin_dashboard.html:272 +#: core/templates/core/admin_dashboard.html:283 msgid "See how the site looks to visitors" msgstr "شاهد كيف يبدو الموقع للزوار" -#: core/templates/core/admin_dashboard.html:284 +#: core/templates/core/admin_dashboard.html:295 msgid "Manage Shipments" msgstr "إدارة الشحنات" -#: core/templates/core/admin_dashboard.html:285 +#: core/templates/core/admin_dashboard.html:296 msgid "Approve or moderate shipments" msgstr "اعتماد أو مراقبة الشحنات" -#: core/templates/core/admin_dashboard.html:297 +#: core/templates/core/admin_dashboard.html:308 msgid "Manage Users" msgstr "إدارة المستخدمين" -#: core/templates/core/admin_dashboard.html:298 +#: core/templates/core/admin_dashboard.html:309 msgid "Review registered profiles" msgstr "مراجعة الملفات الشخصية المسجلة" -#: core/templates/core/admin_dashboard.html:322 +#: core/templates/core/admin_dashboard.html:333 msgid "N/A" msgstr "" @@ -1069,25 +1085,13 @@ msgstr "اللون" msgid "Documents & Photos" msgstr "المستندات والصور" -#: core/templates/core/truck_register.html:127 -#, fuzzy -#| msgid "Registration Front" -msgid "Registration (Front Face)" -msgstr "التسجيل (الوجه الأمامي)" - -#: core/templates/core/truck_register.html:137 -#, fuzzy -#| msgid "Registration Back" -msgid "Registration (Back Face)" -msgstr "التسجيل (الوجه الخلفي)" - -#: core/templates/core/truck_register.html:150 +#: core/templates/core/truck_register.html:164 msgid "Update and Submit for Approval" msgstr "تحديث وإرسال للاعتماد" -#: core/templates/core/truck_register.html:152 +#: core/templates/core/truck_register.html:166 msgid "Submit Registration" -msgstr "إرسال التسجيل" +msgstr "إرسال طلب التسجيل" #: core/templates/registration/login.html:15 msgid "Username" @@ -1132,13 +1136,17 @@ msgstr "التحقق من حسابك" msgid "" "We have sent a verification code to your WhatsApp number. Please enter it " "below to complete your registration." -msgstr "لقد أرسلنا رمز تحقق إلى رقم WhatsApp الخاص بك. يرجى إدخاله أدناه لإكمال عملية التسجيل." +msgstr "" +"لقد أرسلنا رمز تحقق إلى رقم WhatsApp الخاص بك. يرجى إدخاله أدناه لإكمال " +"عملية التسجيل." #: core/templates/registration/verify_otp.html:15 msgid "" "We have sent a verification code to your WhatsApp number. Please enter it " "below to log in." -msgstr "لقد أرسلنا رمز تحقق إلى رقم WhatsApp الخاص بك. يرجى إدخاله أدناه لتسجيل الدخول." +msgstr "" +"لقد أرسلنا رمز تحقق إلى رقم WhatsApp الخاص بك. يرجى إدخاله أدناه لتسجيل " +"الدخول." #: core/templates/registration/verify_otp.html:32 msgid "Verify" @@ -1242,7 +1250,9 @@ msgstr "يرجى تصحيح الأخطاء في النموذج." msgid "" "New offer received for your truck (%(plate)s)! Route: %(origin)s to " "%(dest)s. Amount: %(amount)s" -msgstr "تم استلام عرض جديد لشاحنتك (%(plate)s)! المسار: %(origin)s إلى %(dest)s. المبلغ: %(amount)s" +msgstr "" +"تم استلام عرض جديد لشاحنتك (%(plate)s)! المسار: %(origin)s إلى %(dest)s. " +"المبلغ: %(amount)s" #: core/views.py:324 #, fuzzy @@ -1278,6 +1288,12 @@ msgstr "تم قبول العرض! الشحنة قيد التنفيذ الآن." msgid "Offer rejected." msgstr "مرفوض" +#~ msgid "Registration Front" +#~ msgstr "التسجيل (الوجه الأمامي)" + +#~ msgid "Registration Back" +#~ msgstr "التسجيل (الوجه الخلفي)" + #~ msgid "e.g. Flatbed" #~ msgstr "مثال: مسطحة"