+ Translate missing string

This commit is contained in:
Djery-Tom 2020-11-20 17:26:51 +01:00
parent f49d8d72c9
commit 3eac3ba684
11 changed files with 76 additions and 35 deletions

View File

@ -1291,6 +1291,7 @@ class Hyperviseur_dash extends CI_Controller
$data['hasWallet'] = $data['configWallet'] = $this->wallet_model->getConfigWallet($this->session->userdata('network_id'));
$data['country'] = $this->session->userdata('current_pays');
$data['category'] = $this->session->userdata('category');
$data['id_network'] = $this->session->userdata('network_id');
$this->load->view('header_hyp', $data);
if ($type == 'savings')

View File

@ -337,6 +337,8 @@ class Superviseur_dash extends CI_Controller
$data['country'] = $this->session->userdata('current_pays');
$data['category'] = $this->session->userdata('category');
$data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code'));
$data['id_network'] = $this->session->userdata('network_id');
$this->load->view('header_sup', $data);
if ($type == 'transaction')
@ -378,6 +380,7 @@ class Superviseur_dash extends CI_Controller
$data['hasWallet'] = $this->wallet_model->getConfigWallet($this->session->userdata('network_id'));
$data['country'] = $this->session->userdata('current_pays');
$data['category'] = $this->session->userdata('category');
$data['id_network'] = $this->session->userdata('network_id');
// $data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code'));
$this->load->view('header_sup', $data);

View File

@ -79,7 +79,7 @@ class WalletIlinkTransaction extends CI_Controller
$data[] = array($row->id_transaction, $operation, $numero_carte, $moneyNetInit->formatTo('fr_FR'), $moneyNetFinal->formatTo('fr_FR'),
Money::of(round($row->part_reseau_payeur_final_country ? $row->part_reseau_payeur_final_country : 0, 2), $row->final_currency ? $row->final_currency : 'XAF', $this->context)->formatTo('fr_FR'),
str_replace('_', ' ', $row->status_reseau_payeur), $row->final_currency, $row->pays_init,$row->pays_final, Money::of(round($row->frais,2), $row->init_currency,$this->context)->formatTo('fr_FR'),
$this->lang->line($row->status_reseau_payeur), $row->final_currency, $row->pays_init,$row->pays_final, Money::of(round($row->frais,2), $row->init_currency,$this->context)->formatTo('fr_FR'),
Money::of(round($row->taxe, 2),$row->init_currency,$this->context)->formatTo('fr_FR'),Money::of(round($row->commission_banque ? $row->commission_banque : 0, 2),$row->init_currency,$this->context)->formatTo('fr_FR'),
Money::of(round($row->commission_hyp ? $row->commission_hyp : 0, 2),$row->init_currency,$this->context)->formatTo('fr_FR'),Money::of(round($row->commission_sup ? $row->commission_sup : 0 , 2),$row->init_currency,$this->context)->formatTo('fr_FR'),
Money::of(round($row->commission_ag ? $row->commission_ag : 0, 2),$row->init_currency,$this->context)->formatTo('fr_FR'), $agent , $emetteur, $destinataire, $created);

View File

@ -55,8 +55,8 @@ $lang['Délai de traitement'] = 'Processing time';
$lang['Emetteur'] = 'Transmitter';
$lang['Montant'] = 'Amount';
$lang['Sortantes'] = 'outcoming';
$lang['traitée'] = 'treated';
$lang['Non traitée'] = 'not treated';
$lang['traitée'] = 'Treated';
$lang['Non traitée'] = 'Not treated';
$lang['les plus rapidement traitées'] = 'processed the fastest';
$lang['les plus tardivement traitées'] = 'the most recently processed';
$lang['demandes de credit entrantes'] = 'incoming loan requests';
@ -555,4 +555,22 @@ $lang['operator_type'] = "Operator type";
$lang['no_type'] = "No type";
$lang['accepted_demands'] = "Requests accepted";
$lang['canceled_demands'] = "Canceled requests";
$lang['phone_number'] = $lang['Telephone'] = "Phone number";
$lang['since'] = "Since";
$lang['seconds'] = "seconds";
$lang['days'] = "days";
$lang['hours'] = "hours";
$lang['minutes'] = "minutes";
$lang['EN_COURS'] = "IN PROGRESS";
$lang['CASSE'] = "BROKEN";
$lang['EN_ATTENTE_DE_VALIDATION'] = "PENDING FOR VALIDATION";
$lang['REMBOURSE'] = "REFUND";
$lang['NON_VALIDE'] = "INVALID";
$lang['VALIDE'] = "VALID";
$lang['SIMPLE'] = "SIMPLE";
$lang['BLOQUE'] = "BLOCKED";
$lang['NON_TRAITEE'] = "NON_TRAITEE";
$lang['TRAITEE'] = "TREATED";
$lang['individuel'] = "INDIVIDUAL";
$lang['groupe'] = "GROUP";
?>

View File

@ -13,8 +13,8 @@
$lang['Utilisateurs géolocalisés'] = 'Utilisateurs géolocalisés';
$lang["Plus d'informations"] = "Plus d'informations";
$lang['Demandes de crédits'] = 'Demandes de crédits';
$lang['traitée'] = 'traitée';
$lang['Non traitée'] = 'non traitée';
$lang['traitée'] = 'Traitée';
$lang['Non traitée'] = 'Non traitée';
$lang['Demandes traitées'] = 'Demandes traitées';
$lang['Demandes non traitées'] = 'Demandes non traitées';
$lang['demandes'] = 'Demandes';
@ -567,4 +567,22 @@ $lang['operator_type'] = "Type d'opérateur";
$lang['no_type'] = "Aucun type";
$lang['accepted_demands'] = "Demandes acceptées";
$lang['canceled_demands'] = "Demandes annulées";
$lang['phone_number'] = "Numéro de téléphone";
$lang['since'] = "Depuis";
$lang['seconds'] = "secondes";
$lang['days'] = "jours";
$lang['hours'] = "heures";
$lang['minutes'] = "minutes";
$lang['EN_COURS'] = "EN COURS";
$lang['CASSE'] = "CASSÉE";
$lang['EN_ATTENTE_DE_VALIDATION'] = "EN ATTENTE DE VALIDATION";
$lang['REMBOURSE'] = "REMBOURSE";
$lang['NON_VALIDE'] = "NON VALIDE";
$lang['VALIDE'] = "VALIDE";
$lang['SIMPLE'] = "SIMPLE";
$lang['BLOQUE'] = "BLOQUÉE";
$lang['NON_TRAITEE'] = "NON_TRAITÉE";
$lang['TRAITEE'] = "TRAITÉE";
$lang['individuel'] = "INDIVIDUEL";
$lang['groupe'] = "GROUPE";
?>

View File

@ -28,7 +28,7 @@
}
function dateDiff($date1, $date2){
function dateDiff($date1, $date2,$class = null){
$diff = abs($date1 - $date2); // abs pour avoir la valeur absolute, ainsi éviter d'avoir une différence négative
$retour = array();
@ -44,15 +44,16 @@
$tmp = floor( ($tmp - $heure) /24 );
$jour = $tmp;
return 'Depuis '.$jour.' jours '.$heure.' heures '.$minute.' minutes '.$second.' secondes';
return $class->lang->line('since').' ' . $jour . ' '.$class->lang->line('days').' ' . $heure . ' '.$class->lang->line('hours').' ' . $minute . ' '.$class->lang->line('minutes').' ' . $second . ' '.$class->lang->line('seconds');
}
function traitementTemps($time,$dateAjout){
function traitementTemps($time,$dateAjout , $class = null){
if($time==null){
$now = time();
$date2 = strtotime($dateAjout);
return dateDiff($now, $date2);
return dateDiff($now, $date2, $class);
}
else{
return duree($time);
@ -165,7 +166,7 @@
<td>".$row->date_creation."</td>
<td > ".$row->date_modified."</td>
<td>$etat</td>
<td>".traitementTemps($row->temps,$row->date_creation)."</td>
<td>".traitementTemps($row->temps,$row->date_creation,$this)."</td>
</tr>";

View File

@ -33,7 +33,7 @@
}
function dateDiff($date1, $date2)
function dateDiff($date1, $date2,$class = null)
{
$diff = abs($date1 - $date2); // abs pour avoir la valeur absolute, ainsi éviter d'avoir une différence négative
$retour = array();
@ -50,16 +50,16 @@
$tmp = floor(($tmp - $heure) / 24);
$jour = $tmp;
return 'Depuis ' . $jour . ' jours ' . $heure . ' heures ' . $minute . ' minutes ' . $second . ' secondes';
return $class->lang->line('since').' ' . $jour . ' '.$class->lang->line('days').' ' . $heure . ' '.$class->lang->line('hours').' ' . $minute . ' '.$class->lang->line('minutes').' ' . $second . ' '.$class->lang->line('seconds');
}
function traitementTemps($time, $dateAjout)
function traitementTemps($time, $dateAjout , $class = null)
{
if ($time == null) {
$now = time();
$date2 = strtotime($dateAjout);
return dateDiff($now, $date2);
return dateDiff($now, $date2,$class);
} else {
return duree($time);
}
@ -261,7 +261,7 @@
<td>" . $row->dateAjout . "</td>
<td > " . $row->dateModif . "</td>
<td>$etat</td>
<td>" . traitementTemps($row->temps, $row->dateAjout) . "</td>
<td>" . traitementTemps($row->temps, $row->dateAjout,$this) . "</td>
<td>" . getDelayOfTreatmentInSeconds($row->temps, $row->dateAjout)/60 . "</td>
</tr>";
@ -351,7 +351,7 @@
<td>" . $row->dateAjout . "</td>
<td > " . $row->dateModif . "</td>
<td>$etat</td>
<td>" . traitementTemps($row->temps, $row->dateAjout) . "</td>
<td>" . traitementTemps($row->temps, $row->dateAjout,$this) . "</td>
<td>" . getDelayOfTreatmentInSeconds($row->temps, $row->dateAjout)/60 . "</td>
</tr>";
@ -777,7 +777,7 @@
<td>" . $row->dateAjout . "</td>
<td> " . $row->dateModif . "</td>
<td>$etat</td>
<td>" . traitementTemps($row->temps, $row->dateAjout) . "</td>
<td>" . traitementTemps($row->temps, $row->dateAjout,$this) . "</td>
<td>" . getDelayOfTreatmentInSeconds($row->temps, $row->dateAjout)/60 . "</td>
</tr>";

View File

@ -116,7 +116,7 @@
<div class="row">
<div class="col-sm-3">
<div class="form-group">
<label>Numéro de téléphone :</label>
<label><?= $this->lang->line('phone_number')?></label>
<div class="input-group date">
<div class="input-group-addon">
<i class="glyphicon glyphicon-earphone"></i>
@ -128,7 +128,7 @@
</div>
<div class='col-sm-3'>
<div class="form-group">
<label>Numéro de transaction :</label>
<label><?= $this->lang->line('Numéro de transaction') ?></label>
<div class="input-group date">
<div class="input-group-addon">
<i class="glyphicon glyphicon-usd"></i>
@ -140,7 +140,7 @@
</div>
<div class='col-sm-3'>
<div class="form-group">
<label>Code membre :</label>
<label><?= $this->lang->line('code membre') ?></label>
<div class="input-group date">
<div class="input-group-addon">
<i class="glyphicon glyphicon-user"></i>
@ -152,7 +152,7 @@
</div>
<div class='col-sm-3'>
<div class="form-group">
<label>Nom :</label>
<label><?= $this->lang->line('Nom') ?></label>
<div class="input-group date">
<div class="input-group-addon">
<i class="glyphicon glyphicon-user"></i>

View File

@ -179,16 +179,16 @@
<span><?php echo $this->lang->line('menu_wallet_password'); ?></span>
</a>
</li>
<?php if ($hasWallet->first_row()->type == 'ilink') { ?>
<li class="<?php if ($active == "wallet_calculator") {
echo "active";
} ?>">
<a href="<?php echo base_url('index.php/Hyperviseur_dash/calculator') ?>">
<i class="glyphicon glyphicon-adjust"></i>
<span><?php echo $this->lang->line('calculator'); ?></span>
</a>
</li>
<?php } ?>
<!-- --><?php //if ($hasWallet->first_row()->type == 'ilink') { ?>
<!-- <li class="--><?php //if ($active == "wallet_calculator") {
// echo "active";
// } ?><!--">-->
<!-- <a href="--><?php //echo base_url('index.php/Hyperviseur_dash/calculator') ?><!--">-->
<!-- <i class="glyphicon glyphicon-adjust"></i>-->
<!-- <span>--><?php //echo $this->lang->line('calculator'); ?><!--</span>-->
<!-- </a>-->
<!-- </li>-->
<!-- --><?php //} ?>
</ul>
</li>

View File

@ -143,13 +143,13 @@
}
$moneyNet = Money::of(round($row->montant, 2), $currency_code, $context);
if ($row->type_caution == 'individuel')
$retrait = $row->retrait_cash ? 'OUI' : 'NON';
$retrait = $this->lang->line($row->retrait_cash ? 'Oui' : 'Non');
else
$retrait = "";
echo "<tr>
<td align='center' >$row->id_demande</td>
<td>" . str_replace('_',' ',$row->etat) . "</td>
<td>" . strtoupper($row->type_caution) . "</td>
<td>" . $this->lang->line($row->etat) . "</td>
<td>" . $this->lang->line($row->type_caution) . "</td>
<td>" . strtoupper($row->duree_mois) . "</td>
<td>" . Money::of(round($row->montant_rembourse, 2), $currency_code, $context)->formatTo('fr_FR') . "</td>
<td>" . $moneyNet->formatTo('fr_FR') . "</td>

View File

@ -140,7 +140,7 @@
$moneyNet = Money::of(round($row->montant, 2), $currency_code, $context);
echo "<tr>
<td align='center' >$row->id_epargne</td>
<td>" . str_replace('_',' ',$row->etat) . "</td>
<td>" . $this->lang->line($row->etat) . "</td>
<td>" . strtoupper($row->duree_mois) . "</td>
<td>" . $moneyNet->formatTo('fr_FR') . "</td>
<td>" . Money::of(round($row->interet, 2), $currency_code, $context)->formatTo('fr_FR') . "</td>