Skip to content

Continue integrating translations into views #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
muarf wants to merge 1 commit into
base: feature/internationalization-i18n
Choose a base branch
from
Draft

Continue integrating translations into views #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
"translation_management_desc": "Edit all user interface translations",
"email_management": "Email Management",
"email_management_btn": "Email Management",
"email_management_desc": "Mailing list and email settings"
"email_management_desc": "Mailing list and email settings",
"security": "Security",
"password_management_btn": "Password Management",
"password_management_desc": "Security and access"
},
"admin_aide": {
"title": "Machine Help Management",
Expand Down Expand Up @@ -139,7 +142,9 @@
"price": "Price",
"price_paid": "Price paid",
"difference": "Difference",
"user_paid": "How much the user paid"
"user_paid": "How much the user paid",
"no_data_available": "No data available",
"no_duplicator_installed": "No duplicator installed"
},
"changement": {
"title": "Consumable change report",
Expand All @@ -157,7 +162,15 @@
"change_date": "Change date",
"notes": "Notes (optional)",
"notes_placeholder": "Add notes about the change...",
"submit_change": "Record change"
"submit_change": "Record change",
"machine_selection": "Machine selection",
"passage_count": "Number of passages",
"passage_count_help": "Total number of copies since last change",
"master_count": "Number of masters",
"master_count_help": "Current number of masters",
"drum_selection": "Drum selection",
"select_drum": "Select a drum",
"drum_help": "ink that was changed"
},
"imposition": {
"title": "PDF Imposition",
Expand Down Expand Up @@ -315,6 +328,8 @@
"edit": "Edit",
"close": "Close",
"back": "Back",
"back_to_home": "Back to home",
"view_stats": "View statistics",
"next": "Next",
"previous": "Previous",
"search": "Search",
Expand Down
21 changes: 18 additions & 3 deletions translations/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
"translation_management_desc": "Modifiez toutes les traductions de l'interface utilisateur",
"email_management": "Gestion des Emails",
"email_management_btn": "Gestion des Emails",
"email_management_desc": "Liste de diffusion et paramètres email"
"email_management_desc": "Liste de diffusion et paramètres email",
"security": "Sécurité",
"password_management_btn": "Gestion des mots de passe",
"password_management_desc": "Sécurité et accès"
},
"admin_aide": {
"title": "Gestion des aides par machine",
Expand Down Expand Up @@ -391,7 +394,9 @@
"price": "Prix",
"price_paid": "Prix payé",
"difference": "Différence",
"user_paid": "Combien l'utilisateur a payé"
"user_paid": "Combien l'utilisateur a payé",
"no_data_available": "Aucune donnée disponible",
"no_duplicator_installed": "Aucun duplicopieur installé"
},
"changement": {
"title": "Signalement de changement de consommable",
Expand All @@ -409,7 +414,15 @@
"change_date": "Date du changement",
"notes": "Notes (optionnel)",
"notes_placeholder": "Ajoutez des notes sur le changement...",
"submit_change": "Enregistrer le changement"
"submit_change": "Enregistrer le changement",
"machine_selection": "Sélection de la machine",
"passage_count": "Nombre de passages",
"passage_count_help": "Nombre total de copies depuis le dernier changement",
"master_count": "Nombre de masters",
"master_count_help": "Nombre de masters actuels",
"drum_selection": "Sélection du tambour",
"select_drum": "Sélectionnez un tambour",
"drum_help": "encre qui a été changé"
},
"imposition": {
"title": "Imposition de PDF",
Expand Down Expand Up @@ -551,6 +564,8 @@
"edit": "Modifier",
"close": "Fermer",
"back": "Retour",
"back_to_home": "Retour à l'accueil",
"view_stats": "Voir les statistiques",
"next": "Suivant",
"previous": "Précédent",
"search": "Rechercher",
Expand Down
12 changes: 6 additions & 6 deletions view/admin.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,21 @@
<!-- Sécurité -->
<div class="panel panel-warning">
<div class="panel-heading">
<h3 class="panel-title"><i class="fa fa-shield"></i> Sécurité</h3>
<h3 class="panel-title"><i class="fa fa-shield"></i> <?php _e('admin.security'); ?></h3>
</div>
<div class="panel-body">
<div class="row">
<div class="col-md-6">
<a href="?admin&mots" class="btn btn-warning btn-block">
<i class="fa fa-key"></i> Gestion des mots de passe
<i class="fa fa-key"></i> <?php _e('admin.password_management_btn'); ?>
</a>
<small class="text-muted">Sécurité et accès</small>
<small class="text-muted"><?php _e('admin.password_management_desc'); ?></small>
</div>
<div class="col-md-6">
<a href="?admin&bdd" class="btn btn-danger btn-block">
<i class="fa fa-database"></i> Gestion des BDD
<i class="fa fa-database"></i> <?php _e('admin.database_management_btn'); ?>
</a>
<small class="text-muted">Création, sauvegarde, restauration</small>
<small class="text-muted"><?php _e('admin.database_management_desc'); ?></small>
</div>
</div>
</div>
Expand All @@ -120,7 +120,7 @@
<div class="row">
<div class="col-md-12">
<a href="?accueil" class="btn btn-default btn-block">
<i class="fa fa-home"></i> Retour à l'accueil
<i class="fa fa-home"></i> <?php _e('common.back_to_home'); ?>
</a>
</div>
</div>
Expand Down
32 changes: 16 additions & 16 deletions view/changement.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@

<!-- Sélection de la machine -->
<div class="form-group">
<label class="col-md-4 control-label" for="machine">Machine :</label>
<label class="col-md-4 control-label" for="machine"><?php _e('changement.machine_selection'); ?> :</label>
<div class="col-md-4">
<select name="machine" id="machine" class="form-control" required>
<option value="">Sélectionnez une machine</option>
<option value=""><?php _e('changement.select_machine'); ?></option>

<!-- Duplicopieurs -->
<?php if(isset($duplicopieurs) && count($duplicopieurs) > 0): ?>
<optgroup label="Duplicopieurs">
<optgroup label="<?php _e('common.duplicopieur'); ?>s">
<?php foreach($duplicopieurs as $dup): ?>
<option value="<?= htmlspecialchars($dup['name']) ?>"><?= htmlspecialchars($dup['name']) ?></option>
<?php endforeach; ?>
Expand All @@ -64,7 +64,7 @@

<!-- Photocopieurs -->
<?php if(isset($photocopiers) && count($photocopiers) > 0): ?>
<optgroup label="Photocopieurs">
<optgroup label="<?php _e('common.photocopieur'); ?>s">
<?php foreach($photocopiers as $photocop): ?>
<option value="<?= htmlspecialchars($photocop) ?>"><?= htmlspecialchars($photocop) ?></option>
<?php endforeach; ?>
Expand All @@ -76,48 +76,48 @@

<!-- Type de consommable -->
<div class="form-group">
<label class="col-md-4 control-label" for="type">Type de consommable :</label>
<label class="col-md-4 control-label" for="type"><?php _e('changement.change_type'); ?> :</label>
<div class="col-md-4">
<select name="type" id="type" class="form-control" required>
<option value="">Sélectionnez un type</option>
<option value=""><?php _e('common.select'); ?> un type</option>
</select>
</div>
</div>

<!-- Nombre de passages -->
<div class="form-group">
<label class="col-md-4 control-label" for="nb_p">Nombre de passages :</label>
<label class="col-md-4 control-label" for="nb_p"><?php _e('changement.passage_count'); ?> :</label>
<div class="col-md-4">
<input id="nb_p" name="nb_p" class="form-control input-md" required type="number" placeholder="Ex: 12345">
<span class="help-block">Nombre total de copies depuis le dernier changement</span>
<span class="help-block"><?php _e('changement.passage_count_help'); ?></span>
</div>
</div>

<!-- Nombre de masters (pour duplicopieurs) -->
<div class="form-group" id="masters-group" style="display: none;">
<label class="col-md-4 control-label" for="nb_m">Nombre de masters :</label>
<label class="col-md-4 control-label" for="nb_m"><?php _e('changement.master_count'); ?> :</label>
<div class="col-md-4">
<input id="nb_m" name="nb_m" class="form-control input-md" type="number" placeholder="Ex: 67890">
<span class="help-block">Nombre de masters actuels</span>
<span class="help-block"><?php _e('changement.master_count_help'); ?></span>
</div>
</div>

<!-- Sélection du tambour (pour duplicopieurs) -->
<div class="form-group" id="tambour-group" style="display: none;">
<label class="col-md-4 control-label" for="tambour">Tambour :</label>
<label class="col-md-4 control-label" for="tambour"><?php _e('changement.drum_selection'); ?> :</label>
<div class="col-md-4">
<select name="tambour" id="tambour" class="form-control">
<option value="">Sélectionnez un tambour</option>
<option value=""><?php _e('changement.select_drum'); ?></option>
</select>
<span class="help-block">encre qui a été changé</span>
<span class="help-block"><?php _e('changement.drum_help'); ?></span>
</div>
</div>

<!-- Bouton de soumission -->
<div class="form-group">
<div class="col-md-4 col-md-offset-4">
<button type="submit" class="btn btn-success btn-block btn-lg">
<i class="fa fa-save"></i> Enregistrer le changement
<i class="fa fa-save"></i> <?php _e('changement.submit_change'); ?>
</button>
</div>
</div>
Expand All @@ -140,10 +140,10 @@
<div class="row">
<div class="col-md-12 text-center">
<a href="?accueil" class="btn btn-default">
<i class="fa fa-arrow-left"></i> Retour à l'accueil
<i class="fa fa-arrow-left"></i> <?php _e('common.back_to_home'); ?>
</a>
<a href="?stats" class="btn btn-info">
<i class="fa fa-bar-chart"></i> Voir les statistiques
<i class="fa fa-bar-chart"></i> <?php _e('common.view_stats'); ?>
</a>
</div>
</div>
Expand Down
50 changes: 25 additions & 25 deletions view/stats.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
<table class="table table-striped table-hover table-bordered">
<thead class="thead-dark">
<tr>
<th><i class="fa fa-calendar"></i> Date</th>
<th><i class="fa fa-file-o"></i> Feuilles</th>
<th><i class="fa fa-print"></i> Tirages</th>
<th><i class="fa fa-calculator"></i> Moyenne</th>
<th><i class="fa fa-euro"></i> Prix</th>
<th><i class="fa fa-money"></i> Prix payé</th>
<th><i class="fa fa-chart-line"></i> Différence</th>
<th><i class="fa fa-calendar"></i> <?php _e('stats.date'); ?></th>
<th><i class="fa fa-file-o"></i> <?php _e('stats.sheets'); ?></th>
<th><i class="fa fa-print"></i> <?php _e('stats.prints'); ?></th>
<th><i class="fa fa-calculator"></i> <?php _e('stats.average'); ?></th>
<th><i class="fa fa-euro"></i> <?php _e('stats.price'); ?></th>
<th><i class="fa fa-money"></i> <?php _e('stats.price_paid'); ?></th>
<th><i class="fa fa-chart-line"></i> <?php _e('stats.difference'); ?></th>
</tr>
</thead>
<tbody>
Expand All @@ -71,7 +71,7 @@
<?php
}
else:
echo '<tr><td colspan="7" class="text-center">Aucune donnée disponible</td></tr>';
echo '<tr><td colspan="7" class="text-center">' . __('stats.no_data_available') . '</td></tr>';
endif;
$iii = 1; ?>
<ul class="pagination">
Expand Down Expand Up @@ -105,17 +105,17 @@
<table class="table table-striped table-bordered">
<thead class="thead-dark">
<tr>
<th><i class="fa fa-calendar"></i> Date</th>
<th><i class="fa fa-file-o"></i> Feuilles</th>
<th><i class="fa fa-print"></i> Tirages</th>
<th><i class="fa fa-calculator"></i> Moyenne</th>
<th><i class="fa fa-euro"></i> Prix</th>
<th><i class="fa fa-money"></i> Prix payé</th>
<th><i class="fa fa-chart-line"></i> Différence</th>
<th><i class="fa fa-calendar"></i> <?php _e('stats.date'); ?></th>
<th><i class="fa fa-file-o"></i> <?php _e('stats.sheets'); ?></th>
<th><i class="fa fa-print"></i> <?php _e('stats.prints'); ?></th>
<th><i class="fa fa-calculator"></i> <?php _e('stats.average'); ?></th>
<th><i class="fa fa-euro"></i> <?php _e('stats.price'); ?></th>
<th><i class="fa fa-money"></i> <?php _e('stats.price_paid'); ?></th>
<th><i class="fa fa-chart-line"></i> <?php _e('stats.difference'); ?></th>
</tr>
</thead>
<tbody>
<tr class="warning"><td colspan="7" class="text-center"><i class="fa fa-info-circle"></i> Aucun duplicopieur installé</td></tr>
<tr class="warning"><td colspan="7" class="text-center"><i class="fa fa-info-circle"></i> <?php _e('stats.no_duplicator_installed'); ?></td></tr>
</tbody>
</table>
</div>
Expand All @@ -129,20 +129,20 @@
<div class="panel panel-success">
<div class="panel-heading">
<h3 class="panel-title text-center">
<i class="fa fa-print"></i> Statistiques par mois <?= htmlspecialchars($photocop_name) ?>
<i class="fa fa-print"></i> <?php _e('stats.monthly_stats_for'); ?> <?= htmlspecialchars($photocop_name) ?>
</h3>
</div>
<div class="panel-body">
<table class="table table-striped table-hover table-bordered">
<thead class="thead-dark">
<tr>
<th><i class="fa fa-calendar"></i> Date</th>
<th><i class="fa fa-file-o"></i> Feuilles</th>
<th><i class="fa fa-print"></i> Tirages</th>
<th><i class="fa fa-calculator"></i> Moyenne</th>
<th><i class="fa fa-euro"></i> Prix</th>
<th><i class="fa fa-money"></i> Prix payé</th>
<th><i class="fa fa-chart-line"></i> Différence</th>
<th><i class="fa fa-calendar"></i> <?php _e('stats.date'); ?></th>
<th><i class="fa fa-file-o"></i> <?php _e('stats.sheets'); ?></th>
<th><i class="fa fa-print"></i> <?php _e('stats.prints'); ?></th>
<th><i class="fa fa-calculator"></i> <?php _e('stats.average'); ?></th>
<th><i class="fa fa-euro"></i> <?php _e('stats.price'); ?></th>
<th><i class="fa fa-money"></i> <?php _e('stats.price_paid'); ?></th>
<th><i class="fa fa-chart-line"></i> <?php _e('stats.difference'); ?></th>
</tr>
</thead>
<tbody>
Expand All @@ -166,7 +166,7 @@
<?php
}
else:
echo '<tr><td colspan="7" class="text-center">Aucune donnée disponible</td></tr>';
echo '<tr><td colspan="7" class="text-center">' . __('stats.no_data_available') . '</td></tr>';
endif;
$iii = 1; ?>
<ul class="pagination">
Expand Down