From bae3510e8322674eb171dae6d048d58d98ab22a8 Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Sun, 25 Jan 2026 10:31:06 +0000
Subject: [PATCH] changes on entering cities

---
 core/__pycache__/admin.cpython-311.pyc        | Bin 2410 -> 2453 bytes
 core/__pycache__/forms.cpython-311.pyc        | Bin 11257 -> 12090 bytes
 core/__pycache__/models.cpython-311.pyc       | Bin 11039 -> 12093 bytes
 core/__pycache__/views.cpython-311.pyc        | Bin 11392 -> 12165 bytes
 core/admin.py                                 |  18 +++---
 core/forms.py                                 |  31 +++++++---
 ..._city_name_remove_country_name_and_more.py |  55 ++++++++++++++++++
 ...ity_name_ar_alter_city_name_en_and_more.py |  43 ++++++++++++++
 ...move_country_name_and_more.cpython-311.pyc | Bin 0 -> 1799 bytes
 ...lter_city_name_en_and_more.cpython-311.pyc | Bin 0 -> 1543 bytes
 core/models.py                                |  30 ++++++++--
 core/views.py                                 |  15 +++--
 12 files changed, 166 insertions(+), 26 deletions(-)
 create mode 100644 core/migrations/0005_remove_city_name_remove_country_name_and_more.py
 create mode 100644 core/migrations/0006_alter_city_name_ar_alter_city_name_en_and_more.py
 create mode 100644 core/migrations/__pycache__/0005_remove_city_name_remove_country_name_and_more.cpython-311.pyc
 create mode 100644 core/migrations/__pycache__/0006_alter_city_name_ar_alter_city_name_en_and_more.cpython-311.pyc

diff --git a/core/__pycache__/admin.cpython-311.pyc b/core/__pycache__/admin.cpython-311.pyc
index 819c119391fc765181ab241c4d9430cac474a0b3..f8c2ac27378345aacc7c043921adf3d599bf111e 100644
GIT binary patch
delta 848
zcmZuu&ubG=5YGPIq-L9Dvtg66!P*3}ZCX&QhboGwc+kd+1urFCvs+o%Y|7iWLO|#q
z1W!uf;lZOP_2@s)n^#fTLs|R_1R;T*yy%-v6_VyX_?S0u=9`&seiq-V%7=VDm!ap+
z*U&YE&&o4aWfRG_dQQjj&kPHZ7wkLLj2@np)}kG_NTWGufgJPON6P*Fa|ihrc5d4}
z*Eczohfjq<B6a(rkI}$nPz9V9D6~I`Xb~O-fF*z;g=E2V1Kc@qJ?tQ)g1ZEeRw{#~
z|AQ<w0)s+CFZsdA`c>Lnu@*g;X;6m-)$AP?52kw~clk!627GBps0!vxIVgY(@`l&-
zYe2tsj^3d3wvi47TnXQ$h3NdNkU4RaTSB>Br|<UM8Y>V9ppkD}iM$qyVmj{%Wv-B8
z;R+*?vCyh3ht{Cy__z~b3x`3H>mr8=Zg(tf@~8zY8>A&R8I$aa*Y`|tY*I*a;h}vN
z*fynkx}#+X2ECI-N^19gZ$P);cy=(WNE0HP<d>)$2cXDfP~>T}b5gz+J%T$~R+C(k
zo@}PuN;OP}Omn9d{w?3=_3hAeZlZ1SQQALRA7xl(7KU4~x;loBQ-Cp-VJk7Ck5~wm
zGi)K!Ue<=$?@Tpjsw0*Ig7YxkjkU%YK28CEW%+-6Zo)!d$@$CkvxT^DaXPykGg?}W
Ke39Stu(ZFpK*~e_

delta 802
zcmZ{hKWGzC9LMwC{fn`87jwCKNz)K4)tnXup&%+9gif|8*p@<<7?V>1*92ZJL#E!)
z!7=b~a1;k|ba8icE#6QL1YMmH=;Y-4UNE$2dyo5Y_xt_c_sjdfch;Yr@k!S+De)YA
z@3+6oUyL_YBeC3R9C-XKeQ%V)jg$OhxQWH`{DHK!Pnj;}W3AckcLFwW33J3hn-i#g
zR+)hx6UYKL1mf#{yBE}7xBb9lEQhiM<N+JFnSlS49Ot%h%$39EXKW`;U0#=jH{X|+
z-9?lVM^?b+j9dvdz~sNByi<kb>IKOX*X76DQ10#}2Y_ZQH`~F$mDnvPOv^5fjegH#
z^*V@f*pe8iU20yzR=|ci|ET2D<e(K{SKyKIkSJVJSIkV4d5yqp)f<5@yvO&{Dyi~N
zeWF&Ou)@Eo*5M^-vLf0@F*b!ltK0DhB3sXI^=5OpgGpdPygi&LoUUKi4q|zRSYCyj
zC-dv!7S`leu&L&nd|P{QKe?PF(u$}idNW3U(@zh&t-kNAu}A!e_VTbiN>MV4;c8?p
zjnOy-#!`wFBI1lFM$;*p4eg`y@Y*pcMx;2R5(F+{xEtBaV>C_ys4Pt9GZU4y@=!h|
Yc0}x}Wt1peIWIH+f1Z!hA7tFwKbQQqQ~&?~

diff --git a/core/__pycache__/forms.cpython-311.pyc b/core/__pycache__/forms.cpython-311.pyc
index becc8759334337b4ad5874b8b9ad1e0baad6a046..4543ff81a6e3d400c284baa990cd73c3dd2fe291 100644
GIT binary patch
delta 4282
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
CRWm05

delta 3707
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
HxTQY;HW9c5

diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc
index 7b76646b7e915eacd9602e341f8b0f756eaa0820..57e069a93b2ff45ea2ad6211a35b7a5f2108a54f 100644
GIT binary patch
delta 3562
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

delta 2620
zcma)8-EY%Y6t`0+vEzKTNt1L<X}UHoDKsmHwJ<tJDc_={qaE7<stK`a15Q$|6GY3j
zcC6E?sSlL92aq;R+6SltO-Oy%)3n!ZPcZEPS^ERvVG{_nNs~71oSQWL04iMhmwV4S
zKKI_=`T4j%jC^_AebeP~aByAurI_go%)3MUsrj~e%$^mKBG0LuYSpEzBk5pcn=U71
z3wMB1?K7MzYW!K}{GFi3#Y_^I97`rQGs$3bmP`$j3nuQezuRl!G>0Z?RkuAiEF5<W
z?$V`tXSf?MytQQDlGV$xbOYbwgym}>m#>`5?o(|;T+C0e@$K|izJpikdAXj}TQ(k4
zg&8hsXIrtt6Smb$B}LT^4~nL}FJH_R$b=~jq_WyW6_#G$O-D9$QPH*BXkm>0QT3Y5
z6msCDdev^aRj8|#A<97Nrn&nb-`vDqG4zC^r-U(HqCX2GwSI7s8UR!1*9s{TfT5e7
za);=!H9W<<5ikwJBvJ>z<Q0T^gem}2>KjXu{TWSHNf?bD1Rp{Kp%J071d(uxAi`~&
z1(>e<-IwcUyMB}Ful2&;nd^r>KXj+rbyx1XCxf+Xdha8F_S+H>mJCy*;jUcv^61G8
zAob&6)dqyFP{0~OovH+cI!x(6{(?qwse;BfwO}!&d`?j{T?0!4q$EfjK?;eJj*H1I
zJf3M!m+C;gFf(|72xE|)d$PKcG_EK{fhbDgsubh>z<H9+NZ!t7%;Bg+83QB)mbFwx
z(6$Mnjuqo~DI8i+4A;tHP_Lu*Fj4{v=^g6p-Mg<;ix{S8LRh~lxFLdoGBB>v4;)>Q
z=M-agEvn^mE%3oK+?8u}E%v-*Erh;IVS?>~v_Psg%=hmkZD5UA*ilSrv{Ja|*1(C$
zmgsMy-@2CgkGbW|osh`1K}1GdkNa&9)&ksb(_h3pZnFxZ0|9v;aRl}vY{k(_kdM0|
z2&gw8-{W}+^1t#VY;0GZiw``zEIwq+6prO}?ID^Ms)&p3sA-G4&~81gr*h|*!eau7
zvd~;n*GU3~C7H9mcY?y}=*^mmYA-le>6&iw`T5uBeqSfk@rj*-B!4EOYjM^xx-q3#
zHmyhLK?vN=<Q(;f8&=R7Tq$SVRhW+WH%&1%_u?FhGz9_&G@avP`JATYirLc|DN)a~
zFAnV+RtDZaa)dD5vm>!0Ai1WHMtQxkG2syi!bZ4_QFy1JF)fO<8eihMn;L;jB5oyC
zMY`!<ferj1tqpGEYv`_Eo%J1X^w5*R9-!xXa6bAT%uT^aUC<zW5GG_8;W&VSiit#^
zW6-0ap!Foodg-~)9^SwBUFdIHUk@0D;VD)+TQQe8U({HoOsApc3d(qjq&3|jJ0K3i
zSUH_U)1ir}3U+?dKp!+lYSBS@5fTVlga+CW`A{}+SU}iK7b5TSPHJiTXahF6N%t`=
zt!1DmMh1~&(>7E{6^aIVlYZUQF5{L;*?Jf6H${2=0{!pR9^VNtgRrXM#}raz)F8)c
ze{(2^-GrcXQXXWRjw2xkeZP4WXhN<1+uXgQ51+P>Y4|a1Mrk=OOjhX+=9BJnl5$hM
zNV6@i<*xc?i>qS<6WB{J>uGQf;w~`_CZgeRMT4<T&r0xObW0<9gQww{lF|emF<EZM
z(E$A^x+lQo=N`|b&lSg&rEfzsjkE^%PTJl23I8emvGwR1NX4=OO_!pi^^{>iHFZUa
z@njbK?9_?U*91>Q5cV$~Y&&d~*<NuD|3iGS`K>8zGiFFVo63#m<Lc>nHV<DeBW`3y
zb14vr4c(q4cg7e`71Cn_n=`qLE^9x=mp;j*_a9yCML;<dR3=+~&6nvPu?JQv>Mm^;
zxeYP!u5iXTbgCmk?{#!ciG0T+?pc^UGp9dB`_pBoU*hABxM$&t?K9_Nv_D;T1|+^6
aW7ooL*IW<Awqq<ft%w17IsUzXeEknsB0B~E

diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index 4510127edb77d899c7d6be329fc0908f34752681..0124c631147bfd40dddd3fabe984e17cc01061eb 100644
GIT binary patch
delta 3264
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

delta 2382
zcmd5-TWk|Y6!qF`JI!X}I1k6KBzEFFOdjBX!y|~KpoW%LBeg(rs~Y3oghlHIv%5f4
zRdK7dAC!;6P|>On!4D9%im3e8s!~N&DJl|*kr8MG{jcZ;66z0My>~Vb!dE{#vX5r&
zy?f{0Gjs2Jk}e&qzafgXHW;_=7>YM|vEI*}zu5cntUnh>1vr~zlWNsqE|dzfxuAw~
zZK*bxJEc0cJ=c-yU~*B7<f5r4lh>=Axvo@KE|!Yrx>Mb`o>ULWJ#)5Huhan8Ckv8y
z&UPL4{2n)EBNYc}<C>JVb7%aLAIvvN0l<V51RRz^Z`tBudYgMxUa$*xuATnGj|uJI
zf<zFaly~lN#$noAKH%J7=lbbcclSUq>IMN!-q2*CIba%zL`WZsYKT0oXu3?uFf3!`
zMfZKXH-Q?rc2X%8WfJGe2wkW>$L*lK!s{(D)QQuwo-UAdmdF|SHbLiv#5nF_x{IVR
zrKqy$wsaEN3SzPgVGKZX0l@AsSO8=IH3%Ea{|Gf4x0#mO1LaonoZXc~)d>B<v%$rz
z`sweUcV{t^coPv(iNTO@1PqzHiqMP@Md(4`5rz;N5&97}B5Xn!K?ndqx<)oDYZ~c5
z5pooF5=Px?D40ONt-XwE%?Z=xEa<HUpK~9q$IEvbIv|7c6YpOfm!$WbMnWv`ZTRta
zfVji7D-zj(>rvX%ymj`!W`O&VI)t4F%md3Hgv&Pomcun)DP~AkR@1Q0TI3Nhcrj*J
znqnrKZIFw4+WLS@g77H)yZJ6;@N*008V-WM+K#cdgTCL|8O4O+9<mk>W1bPrth(s6
z*5IbK_`>Lfoe2iHb|!J&V)spyM(C5)K!9CH(I`rAr_!39(G86p2DL)l{5RlYJn;s~
zfBKKx8<EergRuD6369dq&_a@h*7$O0tzc|6o-h<uN@q@J1=RrW22qF)cRolrhZ8Qw
zq@SJ&?+mZMKJl7$QQi(8<oakso6jl3$LGrZZExdwm)b||;VintY~uD8BSYzS`XDm1
z!dxdxx)5ICu$7*U2KS7jhQ$-a*?Q(o_t^}|EBR@5t>Z2$xYeDlHgKHYjkbA^OmcJu
zKBLd0&#c;_?yk9Qj4GaaH+dyLRaiTid5(G2IQVwCM&Cg<2-oOuU0cA-cd-EV#`brs
zAbY{ktj`c#$*OW%lJ$(Dl04|I(~n}|_RTQMqRW+m$zzp0GXdx?v8^pwsmtROYS^Hk
zyL|Maqmgd!_H{}QiN9`#&Ix~Od}!CP5iAegL;vsvXC>zkuJvZnH{FNK+HAqd>tqH>
z1DaY9K4J%D^7%|oo|xxMUdv3$aO7)8<Uu1=qq|{dy3S-&L)J(OE_f9hCtO3;B+#2#
zJ6$*<lRbI3zuNjXTaOKsX_=Co1@n3MYsUaewufH-<<OOmOC49k74J~hJ4Ao%4ei@|
z&%1Y#U!1CV4_Cd1OZy%Rt>5xrrYiovs=x21u_PobLb56(m-r<4Kk!?(nxMt-4CH2&
z!fBXI5CXW4-3ByRWtZr<L~4nFmdnhd7t@thbY+>;*_F2g_y$%j4fz1f7T~WP0RTpu
zf|p0Hj9nVLx~tMOTx}XI9e6ByFTD3ajNB6=H`OIEQV~b1;^+f$_dRj<uUi&<6>+jE
zPL?JtnvZ-{_f6f+<dTr62#KnYSmG0m<U?_||6~1+xE>lEXx@+YX$sP*On$mBbW+!g
z*4<c<7(~@rqcO!|W+o@+^|YZYAY)x=#VT9KPZ2*Y4K&XNz#n0i&l)@Hp7^4(=h=EJ
z@u^|Wnl(p)oyaP5R;E~T?0PXq=4~u!_S8PF*_kUyhAQtO=fMbzQJaQJdg|af?xAgb
j34YW!*i3r|zb;n?Kjr!z+{jbgD%3i-VO+ipY=?gVp9uji

diff --git a/core/admin.py b/core/admin.py
index c589342..a3863d8 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -3,20 +3,20 @@ from .models import Profile, Parcel, Country, Governate, City
 
 @admin.register(Country)
 class CountryAdmin(admin.ModelAdmin):
-    list_display = ('name',)
-    search_fields = ('name',)
+    list_display = ('name_en', 'name_ar')
+    search_fields = ('name_en', 'name_ar')
 
 @admin.register(Governate)
 class GovernateAdmin(admin.ModelAdmin):
-    list_display = ('name', 'country')
+    list_display = ('name_en', 'name_ar', 'country')
     list_filter = ('country',)
-    search_fields = ('name',)
+    search_fields = ('name_en', 'name_ar')
 
 @admin.register(City)
 class CityAdmin(admin.ModelAdmin):
-    list_display = ('name', 'governate')
+    list_display = ('name_en', 'name_ar', 'governate')
     list_filter = ('governate__country', 'governate')
-    search_fields = ('name',)
+    search_fields = ('name_en', 'name_ar')
 
 @admin.register(Profile)
 class ProfileAdmin(admin.ModelAdmin):
@@ -26,7 +26,7 @@ class ProfileAdmin(admin.ModelAdmin):
 
 @admin.register(Parcel)
 class ParcelAdmin(admin.ModelAdmin):
-    list_display = ('tracking_number', 'shipper', 'carrier', 'status', 'created_at')
-    list_filter = ('status', 'pickup_country', 'delivery_country')
+    list_display = ('tracking_number', 'shipper', 'carrier', 'status', 'payment_status', 'created_at')
+    list_filter = ('status', 'payment_status', 'pickup_country', 'delivery_country')
     search_fields = ('tracking_number', 'shipper__username', 'carrier__username', 'receiver_name')
-    readonly_fields = ('tracking_number', 'created_at', 'updated_at')
+    readonly_fields = ('tracking_number', 'created_at', 'updated_at')
\ No newline at end of file
diff --git a/core/forms.py b/core/forms.py
index 552138d..030dfac 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -1,6 +1,7 @@
 from django import forms
 from django.contrib.auth.models import User
 from django.utils.translation import gettext_lazy as _
+from django.utils.translation import get_language
 from .models import Profile, Parcel, Country, Governate, City
 
 class UserRegistrationForm(forms.ModelForm):
@@ -25,23 +26,28 @@ class UserRegistrationForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        lang = get_language()
+        name_field = 'name_ar' if lang == 'ar' else 'name_en'
+        
+        self.fields['country'].queryset = Country.objects.all().order_by(name_field)
+        
         if 'country' in self.data:
             try:
                 country_id = int(self.data.get('country'))
-                self.fields['governate'].queryset = Governate.objects.filter(country_id=country_id).order_by('name')
+                self.fields['governate'].queryset = Governate.objects.filter(country_id=country_id).order_by(name_field)
             except (ValueError, TypeError):
                 pass
         elif self.instance.pk and hasattr(self.instance, 'profile') and self.instance.profile.country:
-            self.fields['governate'].queryset = self.instance.profile.country.governate_set.order_by('name')
+            self.fields['governate'].queryset = self.instance.profile.country.governate_set.order_by(name_field)
 
         if 'governate' in self.data:
             try:
                 governate_id = int(self.data.get('governate'))
-                self.fields['city'].queryset = City.objects.filter(governate_id=governate_id).order_by('name')
+                self.fields['city'].queryset = City.objects.filter(governate_id=governate_id).order_by(name_field)
             except (ValueError, TypeError):
                 pass
         elif self.instance.pk and hasattr(self.instance, 'profile') and self.instance.profile.governate:
-            self.fields['city'].queryset = self.instance.profile.governate.city_set.order_by('name')
+            self.fields['city'].queryset = self.instance.profile.governate.city_set.order_by(name_field)
 
     def clean_password_confirm(self):
         password = self.cleaned_data.get('password')
@@ -110,6 +116,13 @@ class ParcelForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        lang = get_language()
+        name_field = 'name_ar' if lang == 'ar' else 'name_en'
+
+        # Set querysets for countries
+        self.fields['pickup_country'].queryset = Country.objects.all().order_by(name_field)
+        self.fields['delivery_country'].queryset = Country.objects.all().order_by(name_field)
+
         # Pickup
         self.fields['pickup_governate'].queryset = Governate.objects.none()
         self.fields['pickup_city'].queryset = City.objects.none()
@@ -117,14 +130,14 @@ class ParcelForm(forms.ModelForm):
         if 'pickup_country' in self.data:
             try:
                 country_id = int(self.data.get('pickup_country'))
-                self.fields['pickup_governate'].queryset = Governate.objects.filter(country_id=country_id).order_by('name')
+                self.fields['pickup_governate'].queryset = Governate.objects.filter(country_id=country_id).order_by(name_field)
             except (ValueError, TypeError):
                 pass
         
         if 'pickup_governate' in self.data:
             try:
                 gov_id = int(self.data.get('pickup_governate'))
-                self.fields['pickup_city'].queryset = City.objects.filter(governate_id=gov_id).order_by('name')
+                self.fields['pickup_city'].queryset = City.objects.filter(governate_id=gov_id).order_by(name_field)
             except (ValueError, TypeError):
                 pass
 
@@ -135,13 +148,13 @@ class ParcelForm(forms.ModelForm):
         if 'delivery_country' in self.data:
             try:
                 country_id = int(self.data.get('delivery_country'))
-                self.fields['delivery_governate'].queryset = Governate.objects.filter(country_id=country_id).order_by('name')
+                self.fields['delivery_governate'].queryset = Governate.objects.filter(country_id=country_id).order_by(name_field)
             except (ValueError, TypeError):
                 pass
         
         if 'delivery_governate' in self.data:
             try:
                 gov_id = int(self.data.get('delivery_governate'))
-                self.fields['delivery_city'].queryset = City.objects.filter(governate_id=gov_id).order_by('name')
+                self.fields['delivery_city'].queryset = City.objects.filter(governate_id=gov_id).order_by(name_field)
             except (ValueError, TypeError):
-                pass
\ No newline at end of file
+                pass
diff --git a/core/migrations/0005_remove_city_name_remove_country_name_and_more.py b/core/migrations/0005_remove_city_name_remove_country_name_and_more.py
new file mode 100644
index 0000000..b7531ba
--- /dev/null
+++ b/core/migrations/0005_remove_city_name_remove_country_name_and_more.py
@@ -0,0 +1,55 @@
+# Generated by Django 5.2.7 on 2026-01-25 10:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0004_parcel_payment_status_parcel_price_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='city',
+            name='name',
+        ),
+        migrations.RemoveField(
+            model_name='country',
+            name='name',
+        ),
+        migrations.RemoveField(
+            model_name='governate',
+            name='name',
+        ),
+        migrations.AddField(
+            model_name='city',
+            name='name_ar',
+            field=models.CharField(default='', max_length=100, verbose_name='Name (Arabic)'),
+        ),
+        migrations.AddField(
+            model_name='city',
+            name='name_en',
+            field=models.CharField(default='', max_length=100, verbose_name='Name (English)'),
+        ),
+        migrations.AddField(
+            model_name='country',
+            name='name_ar',
+            field=models.CharField(default='', max_length=100, verbose_name='Name (Arabic)'),
+        ),
+        migrations.AddField(
+            model_name='country',
+            name='name_en',
+            field=models.CharField(default='', max_length=100, verbose_name='Name (English)'),
+        ),
+        migrations.AddField(
+            model_name='governate',
+            name='name_ar',
+            field=models.CharField(default='', max_length=100, verbose_name='Name (Arabic)'),
+        ),
+        migrations.AddField(
+            model_name='governate',
+            name='name_en',
+            field=models.CharField(default='', max_length=100, verbose_name='Name (English)'),
+        ),
+    ]
diff --git a/core/migrations/0006_alter_city_name_ar_alter_city_name_en_and_more.py b/core/migrations/0006_alter_city_name_ar_alter_city_name_en_and_more.py
new file mode 100644
index 0000000..3bd216d
--- /dev/null
+++ b/core/migrations/0006_alter_city_name_ar_alter_city_name_en_and_more.py
@@ -0,0 +1,43 @@
+# Generated by Django 5.2.7 on 2026-01-25 10:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_remove_city_name_remove_country_name_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='city',
+            name='name_ar',
+            field=models.CharField(max_length=100, verbose_name='Name (Arabic)'),
+        ),
+        migrations.AlterField(
+            model_name='city',
+            name='name_en',
+            field=models.CharField(max_length=100, verbose_name='Name (English)'),
+        ),
+        migrations.AlterField(
+            model_name='country',
+            name='name_ar',
+            field=models.CharField(max_length=100, verbose_name='Name (Arabic)'),
+        ),
+        migrations.AlterField(
+            model_name='country',
+            name='name_en',
+            field=models.CharField(max_length=100, verbose_name='Name (English)'),
+        ),
+        migrations.AlterField(
+            model_name='governate',
+            name='name_ar',
+            field=models.CharField(max_length=100, verbose_name='Name (Arabic)'),
+        ),
+        migrations.AlterField(
+            model_name='governate',
+            name='name_en',
+            field=models.CharField(max_length=100, verbose_name='Name (English)'),
+        ),
+    ]
diff --git a/core/migrations/__pycache__/0005_remove_city_name_remove_country_name_and_more.cpython-311.pyc b/core/migrations/__pycache__/0005_remove_city_name_remove_country_name_and_more.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a16bc4ec9faac12dbbaf9c7a319476db32e70d5f
GIT binary patch
literal 1799
zcmb_bOHb5L6ux~-XIdD9#)QNNkkJ?#6Gn~hhzT)hVgM6OTug>ErS~$^v5)b#RfZJ{
z7cSZP4^RU?z<;3bhGZ6`TUR75N?;=^&uyoJJXON&%;`DzyuN$--H*khf?)mn8Cu^Z
zgnlq1Te+^XI|<4Mgc0U!<Zu<v;VV3cc=QBe{vE;s;Tl4gv<BLG&#DMme1WvwHgjuy
zq&QZM8iD1xek3^_Cbn;8ne08(HFirpYe`Ur!>GbzuEtda9ucvTfr8dp*bvtsZXN#V
zIueolYlL)41dJkG&?OI5^Nm7pr+{UwZ1f#I=tloxJ3;bimEs9i2L7{3?n1ES@I_#e
zE(D8oJ}fo4BI8Rytied0%@_sr5>1bi=nky=defjLvEkKnh#TmBU<9Gx+ohICbi>8E
z!!ktE3R;oq8V*TF%802mi?Z7h<xMYi1KNt@n)ilK*9b_IXKvk~5!%KOvs|15du)7)
z8Vi=GX+o68WYGxi061?f={9j|K|Sh+^aal+NpVe}eUO^=$SqpL#@({ST^>m5O}jPQ
z^6T21rbGojNz?U6(E&FOZ323~uD=cqJAnfhCQagE;+humDZ7VJ-*e&s?8iy{!W71d
zMn&e6AJq+-dK9lox>xfv+65=tC*`{5kaD;Hrw_|yiI`#F(ehi5zVe%fNy=>8<%26-
zhQUA3Y0^$-BTeyU8|e_!y=?Ro%@$?XBoR#Uzj6qz^qyEk@-!C<{AFonCRUI<`d;Z2
zMz)5pZw(E{IYCx-5Qse{;=+M@>}+@GWcM{z{AyDC%9dJMz12}mpYDCR@$Fe#t!}E-
zj#`cLBI^laj|m3pw5;|_wXM!?s`DLn{){w$dX8pCv;MIe9Q+*3j%J<JY?iyNN-Iy<
zLr1eOJEw_}j2nhq^Cs{@!pnq!>9-$YVM**5X#0i9l-v(#2~3~^@?V081&-r@51iIU
b<HvuobeEH2bX=?|oxz(s%&~WZH|hHuC=;?i

literal 0
HcmV?d00001

diff --git a/core/migrations/__pycache__/0006_alter_city_name_ar_alter_city_name_en_and_more.cpython-311.pyc b/core/migrations/__pycache__/0006_alter_city_name_ar_alter_city_name_en_and_more.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e5f7c58fd5a923b9673e30fa7af1b552e12bd894
GIT binary patch
literal 1543
zcmb_bPfyf96rX9k-ECq0)0mj32q9|dg>FpnM2y5JiBYn|#6uHpx}BlhwSU%Wi@=G4
z2anwR2B?vPAHk2XBzqup^~AxX1WufsX}2g@C4x-b*LiQ=d%s`ad-JhgR{>j%AF21M
z0>F2!l#A*4+Mi{=4*&rKeGots27)O-Ab@#*gm(am7<R;gFW6+eFGrdwBI!BME4%zy
z7pNL|F0m6Y3S%k<5yF1#l#%>jA1M1@A&11kgb0`df-W>g0br?9l48(^TjWl)On@X*
z*^)N}Mu2_A+NvHWG?b$@ltVdX4)q*(sObNBjGP0Hk+bk{WwVAxS)1!rc~<t9HCu8b
zg6Z8xqcLL<97N05a=c{K3he+N8KN{y$iQZY$O?Fj#QkVBceKeaV!d3eFR-wQsX1b|
zJV(!G$zHL19J)!HjxJ-;iejAS)<rgFe716pN<0m%EP2>RgPb^AyHKQi6uQ0_w{==|
z3MN!>8Br4230}|@TC)ne7F8|A4W&M|EIMjgZ&KUO`7sUQE)Ee69S_HZ&puV>`~;K7
z9Fj=fpge5bg-+F|iwAe$GuY>2dbnh?qW~Leixnd^@CtU)BqGM!h`f%wwu22`N#obu
zF<4FSSvJS`t)w;?GU3oFi#pw1B{Boc1>eLk*&SOydNLU(^Dq;IEAsl&Oa;o#_iDd3
zwsUoC=km23ZF1vIUz_~oe7o4wn%i2luQju(q^Ns<i32YF9@Bf!>}iYJ+G1Z@JRxY}
z3_!<Y{t;;M3_!<YP6C=4*W~pl{2@2WdN1e_RZzzc-Dn!M@)^nJqUgwV?w0$GvE5;9
wwivYgWSpt2Ng#f~L?%KAS(l*R15?9qCf|l~28P9k+P`#bj~^WT;WWqn2@wK&V*mgE

literal 0
HcmV?d00001

diff --git a/core/models.py b/core/models.py
index 6893819..7c76838 100644
--- a/core/models.py
+++ b/core/models.py
@@ -1,13 +1,21 @@
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils.translation import gettext_lazy as _
+from django.utils.translation import get_language
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 import uuid
 
 class Country(models.Model):
-    name = models.CharField(_('Name'), max_length=100)
+    name_en = models.CharField(_('Name (English)'), max_length=100)
+    name_ar = models.CharField(_('Name (Arabic)'), max_length=100)
     
+    @property
+    def name(self):
+        if get_language() == 'ar':
+            return self.name_ar
+        return self.name_en
+
     def __str__(self):
         return self.name
 
@@ -17,8 +25,15 @@ class Country(models.Model):
 
 class Governate(models.Model):
     country = models.ForeignKey(Country, on_delete=models.CASCADE, verbose_name=_('Country'))
-    name = models.CharField(_('Name'), max_length=100)
+    name_en = models.CharField(_('Name (English)'), max_length=100)
+    name_ar = models.CharField(_('Name (Arabic)'), max_length=100)
     
+    @property
+    def name(self):
+        if get_language() == 'ar':
+            return self.name_ar
+        return self.name_en
+
     def __str__(self):
         return f"{self.name} ({self.country.name})"
 
@@ -28,8 +43,15 @@ class Governate(models.Model):
 
 class City(models.Model):
     governate = models.ForeignKey(Governate, on_delete=models.CASCADE, verbose_name=_('Governate'))
-    name = models.CharField(_('Name'), max_length=100)
+    name_en = models.CharField(_('Name (English)'), max_length=100)
+    name_ar = models.CharField(_('Name (Arabic)'), max_length=100)
     
+    @property
+    def name(self):
+        if get_language() == 'ar':
+            return self.name_ar
+        return self.name_en
+
     def __str__(self):
         return f"{self.name} ({self.governate.name})"
 
@@ -122,4 +144,4 @@ class Parcel(models.Model):
 
     class Meta:
         verbose_name = _('Parcel')
-        verbose_name_plural = _('Parcels')
+        verbose_name_plural = _('Parcels')
\ No newline at end of file
diff --git a/core/views.py b/core/views.py
index f174adf..01241e4 100644
--- a/core/views.py
+++ b/core/views.py
@@ -5,6 +5,7 @@ from django.contrib.auth.decorators import login_required
 from .models import Parcel, Profile, Country, Governate, City
 from .forms import UserRegistrationForm, ParcelForm
 from django.utils.translation import gettext_lazy as _
+from django.utils.translation import get_language
 from django.contrib import messages
 from django.http import JsonResponse
 from django.urls import reverse
@@ -168,10 +169,16 @@ def article_detail(request):
 
 def get_governates(request):
     country_id = request.GET.get('country_id')
-    governates = Governate.objects.filter(country_id=country_id).values('id', 'name')
-    return JsonResponse(list(governates), safe=False)
+    lang = get_language()
+    field_name = 'name_ar' if lang == 'ar' else 'name_en'
+    governates = Governate.objects.filter(country_id=country_id).order_by(field_name)
+    data = [{'id': g.id, 'name': getattr(g, field_name)} for g in governates]
+    return JsonResponse(data, safe=False)
 
 def get_cities(request):
     governate_id = request.GET.get('governate_id')
-    cities = City.objects.filter(governate_id=governate_id).values('id', 'name')
-    return JsonResponse(list(cities), safe=False)
\ No newline at end of file
+    lang = get_language()
+    field_name = 'name_ar' if lang == 'ar' else 'name_en'
+    cities = City.objects.filter(governate_id=governate_id).order_by(field_name)
+    data = [{'id': c.id, 'name': getattr(c, field_name)} for c in cities]
+    return JsonResponse(data, safe=False)