From 178dad8e03a27a86483b657d9e0436fbe2651d99 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Mon, 26 Aug 2024 17:43:54 +0700
Subject: [PATCH 1/5] Update pppoe.tpl

Language fixes
---
 ui/ui/pppoe.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/ui/pppoe.tpl b/ui/ui/pppoe.tpl
index 435d8ccb..3c17d6b1 100644
--- a/ui/ui/pppoe.tpl
+++ b/ui/ui/pppoe.tpl
@@ -8,7 +8,7 @@
                     <a class="btn btn-primary btn-xs" title="save" href="{$_url}services/sync/pppoe"
                         onclick="return confirm('This will sync/send PPPOE plan to Mikrotik?')"><span
                             class="glyphicon glyphicon-refresh" aria-hidden="true"></span> sync</a>
-                </div>{Lang::T('PPPOE Plans')}
+                </div>{Lang::T('PPPOE Package')}
             </div>
             <form id="site-search" method="post" action="{$_url}services/pppoe">
                 <div class="panel-body">
@@ -42,7 +42,7 @@
                         </div>
                         <div class="col-lg-1 col-xs-4">
                             <select class="form-control" id="bandwidth" name="bandwidth">
-                                <option value="">{Lang::T('Bandwidth')}</option>
+                                <option value="">Bandwidth</option>
                                 {foreach $bws as $b}
                                     <option value="{$b['id']}" {if $bandwidth eq $b['id'] }selected{/if}>
                                         {$b['name_bw']}

From 4889853e53edaf0fecc2ec6b21773e41641aad1e Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Mon, 26 Aug 2024 17:49:49 +0700
Subject: [PATCH 2/5] Update header.tpl

Language fixes
---
 ui/ui/sections/header.tpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl
index 68fce6e9..26270036 100644
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@@ -679,7 +679,7 @@
                                 <li {if $_routes[1] eq 'pppoe' }class="active" {/if}><a
                                         href="{$_url}services/pppoe">PPPOE</a></li>
                                 <li {if $_routes[1] eq 'list' }class="active" {/if}><a
-                                        href="{$_url}bandwidth/list">{Lang::T('Bandwidth')}</a></li>
+                                        href="{$_url}bandwidth/list">Bandwidth</a></li>
                                 {if $_c['enable_balance'] == 'yes'}
                                     <li {if $_routes[1] eq 'balance' }class="active" {/if}><a
                                             href="{$_url}services/balance">{Lang::T('Customer Balance')}</a></li>
@@ -733,9 +733,9 @@
                             </a>
                             <ul class="treeview-menu">
                                 <li {if $_routes[0] eq 'routers' and $_routes[1] eq '' }class="active" {/if}><a
-                                        href="{$_url}routers">{Lang::T('Routers')}</a></li>
+                                        href="{$_url}routers">Routers</a></li>
                                 <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'list' }class="active" {/if}><a
-                                        href="{$_url}pool/list">{Lang::T('IP Pool')}</a></li>
+                                        href="{$_url}pool/list">IP Pool</a></li>
                                 <li {if $_routes[0] eq 'routers' and $_routes[1] eq 'maps' }class="active" {/if}><a
                                         href="{$_url}routers/maps">{Lang::T('Routers Maps')}</a></li>
                                 {$_MENU_NETWORK}
@@ -769,7 +769,7 @@
                                 <li {if $_routes[1] eq 'Order_Voucher' }class="active" {/if}><a
                                         href="{$_url}pages/Order_Voucher">{Lang::T('Order Voucher')}</a></li>
                                 <li {if $_routes[1] eq 'Voucher' }class="active" {/if}><a
-                                        href="{$_url}pages/Voucher">{Lang::T('Voucher')} Template</a></li>
+                                        href="{$_url}pages/Voucher">{Lang::T('Theme Voucher')}</a></li>
                                 <li {if $_routes[1] eq 'Announcement' }class="active" {/if}><a
                                         href="{$_url}pages/Announcement">{Lang::T('Announcement')}</a></li>
                                 <li {if $_routes[1] eq 'Announcement_Customer' }class="active" {/if}><a
@@ -865,7 +865,7 @@
                         <li {if $_system_menu eq 'community' }class="active" {/if}>
                             <a href="{$_url}community">
                                 <i class="ion ion-chatboxes"></i>
-                                <span class="text">{Lang::T('Community')}</span>
+                                <span class="text">Community</span>
                             </a>
                         </li>
                     {/if}
@@ -906,4 +906,4 @@
                             }
                         });
                     </script>
-{/if}
\ No newline at end of file
+{/if}

From b9c31a856ebd37202da0094e342ac472aefba946 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Mon, 26 Aug 2024 17:54:52 +0700
Subject: [PATCH 3/5] Update hotspot.tpl

---
 ui/ui/hotspot.tpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/ui/hotspot.tpl b/ui/ui/hotspot.tpl
index b1d65a9e..47516488 100644
--- a/ui/ui/hotspot.tpl
+++ b/ui/ui/hotspot.tpl
@@ -26,9 +26,9 @@
                         </div>
                         <div class="col-lg-1 col-xs-4">
                             <select class="form-control" id="type1" name="type1">
-                                <option value="">Prepaid &amp; Postpaid</option>
-                                <option value="yes" {if $type1 eq 'yes' }selected{/if}>Prepaid</option>
-                                <option value="no" {if $type1 eq 'no' }selected{/if}>Postpaid</option>
+                                <option value="">{Lang::T('Prepaid')} &amp; {Lang::T('Postpaid')}</option>
+                                <option value="yes" {if $type1 eq 'yes' }selected{/if}>{Lang::T('Prepaid')}</option>
+                                <option value="no" {if $type1 eq 'no' }selected{/if}>{Lang::T('Postpaid')}</option>
                             </select>
                         </div>
                         <div class="col-lg-1 col-xs-4">
@@ -42,7 +42,7 @@
                         </div>
                         <div class="col-lg-1 col-xs-4">
                             <select class="form-control" id="bandwidth" name="bandwidth">
-                                <option value="">{Lang::T('Bandwidth')}</option>
+                                <option value="">Bandwidth</option>
                                 {foreach $bws as $b}
                                     <option value="{$b['id']}" {if $bandwidth eq $b['id'] }selected{/if}>
                                         {$b['name_bw']}
@@ -88,8 +88,8 @@
                         <div class="col-lg-1 col-xs-4">
                             <select class="form-control" id="status" name="status">
                                 <option value="-">{Lang::T('Status')}</option>
-                                <option value="1" {if $status eq '1' }selected{/if}>Enabled</option>
-                                <option value="0" {if $status eq '0' }selected{/if}>Disable</option>
+                                <option value="1" {if $status eq '1' }selected{/if}>{Lang::T('Active')}</option>
+                                <option value="0" {if $status eq '0' }selected{/if}>{Lang::T('Not Active')}</option>
                             </select>
                         </div>
                         <div class="col-lg-1 col-xs-8">
@@ -118,7 +118,7 @@
                         <tr>
                             <th>{Lang::T('Name')}</th>
                             <th>{Lang::T('Type')}</th>
-                            <th><a href="{$_url}bandwidth/list">{Lang::T('Bandwidth')}</a></th>
+                            <th><a href="{$_url}bandwidth/list">Bandwidth</a></th>
                             <th>{Lang::T('Category')}</th>
                             <th>{Lang::T('Price')}</th>
                             <th>{Lang::T('Validity')}</th>
@@ -155,7 +155,7 @@
                                 </td>
                                 <td>{$ds['device']}</td>
                                 <td>{if $ds['plan_expired']}<a
-                                        href="{$_url}services/edit/{$ds['plan_expired']}">Yes</a>{else}No
+                                        href="{$_url}services/edit/{$ds['plan_expired']}">{Lang::T('Yes')}</a>{else}{Lang::T('No')}
                                     {/if}</td>
                                 <td>{if $ds['prepaid'] == no}{$ds['expired_date']}{/if}</td>
                                 <td>{$ds['id']}</td>

From e78a1ca15e276510fa49ffe83d58844f0b6aea25 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Mon, 26 Aug 2024 17:58:22 +0700
Subject: [PATCH 4/5] Update hotspot-add.tpl

---
 ui/ui/hotspot-add.tpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/ui/hotspot-add.tpl b/ui/ui/hotspot-add.tpl
index c596ab2a..9baeb77f 100644
--- a/ui/ui/hotspot-add.tpl
+++ b/ui/ui/hotspot-add.tpl
@@ -13,8 +13,8 @@
                                 data-content="Customer cannot buy disabled Plan, but admin can recharge it, use it if you want only admin recharge it">?</a>
                         </label>
                         <div class="col-md-10">
-                            <input type="radio" name="enabled" value="1" checked> {Lang::T('Enable')}
-                            <input type="radio" name="enabled" value="0"> {Lang::T('Disable')}
+                            <input type="radio" name="enabled" value="1" checked> {Lang::T('Active')}
+                            <input type="radio" name="enabled" value="0"> {Lang::T('Not Active')}
                         </div>
                     </div>
                     <div class="form-group">
@@ -24,8 +24,8 @@
                                 data-content="Postpaid will have fix expired date">?</a>
                         </label>
                         <div class="col-md-10">
-                            <input type="radio" name="prepaid" onclick="prePaid()" value="yes" checked> Prepaid
-                            <input type="radio" name="prepaid" onclick="postPaid()" value="no"> Postpaid
+                            <input type="radio" name="prepaid" onclick="prePaid()" value="yes" checked> {Lang::T('Prepaid')}
+                            <input type="radio" name="prepaid" onclick="postPaid()" value="no"> {Lang::T('Postpaid')}
                         </div>
                     </div>
 
@@ -36,8 +36,8 @@
                                 data-content="Personal Plan will only show to personal Customer, Business plan will only show to Business Customer">?</a>
                         </label>
                         <div class="col-md-10">
-                            <input type="radio" name="plan_type" value="Personal" checked> Personal
-                            <input type="radio" name="plan_type" value="Business"> Business
+                            <input type="radio" name="plan_type" value="Personal" checked> {Lang::T('Personal')}
+                            <input type="radio" name="plan_type" value="Business"> {Lang::T('Business')}
                         </div>
                     </div>
                     {if $_c['radius_enable']}
@@ -49,7 +49,7 @@
                             </label>
                             <div class="col-md-6">
                                 <label class="radio-inline">
-                                    <input type="checkbox" name="radius" onclick="isRadius(this)" value="1"> Radius Plan
+                                    <input type="checkbox" name="radius" onclick="isRadius(this)" value="1"> {Lang::T('Radius Package')}
                                 </label>
                             </div>
                             <p class="help-block col-md-4">{Lang::T('Cannot be change after saved')}</p>

From 502a0a2b0c53042fc3be4b3f6951dedcb4105c6a Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Mon, 26 Aug 2024 18:01:13 +0700
Subject: [PATCH 5/5] Update hotspot-edit.tpl

---
 ui/ui/hotspot-edit.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/ui/hotspot-edit.tpl b/ui/ui/hotspot-edit.tpl
index 1100e4aa..96b18e9f 100644
--- a/ui/ui/hotspot-edit.tpl
+++ b/ui/ui/hotspot-edit.tpl
@@ -15,8 +15,8 @@
                                 data-content="Customer cannot buy disabled Plan, but admin can recharge it, use it if you want only admin recharge it">?</a>
                         </label>
                         <div class="col-md-9">
-                            <input type="radio" name="enabled" value="1" {if $d['enabled'] == 1}checked{/if}> {Lang::T('Enable')}
-                            <input type="radio" name="enabled" value="0" {if $d['enabled'] == 0}checked{/if}> {Lang::T('Disable')}
+                            <input type="radio" name="enabled" value="1" {if $d['enabled'] == 1}checked{/if}> {Lang::T('Active')}
+                            <input type="radio" name="enabled" value="0" {if $d['enabled'] == 0}checked{/if}> {Lang::T('Not Active')}
                         </div>
                     </div>
                     <div class="form-group">