phyks
/
bouffeatulm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix i18n

This commit is contained in:
Phyks 2014-08-31 18:49:52 +02:00
parent 7456210772
commit 612a715efc
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i18n/en.php
View File

@ -121,7 +121,7 @@ $i18n['confirm'] = 'Confirm';
$i18n['a_bill'] = 'a bill'; $i18n['a_bill'] = 'a bill';
$i18n['doesnt_exist'] = "doesn't exist"; $i18n['doesnt_exist'] = "doesn't exist";
$i18n['deleted_user'] = 'Deleted user'; $i18n['deleted_user'] = 'Deleted user';
$i18n['confirm_payback'] = "Are you sure you want to confirm this payback? This action can't be undone easily."; $i18n['confirm_global_payback'] = "Are you sure you want to confirm this payback? This action can't be undone easily.";
$i18n['go_back_list_global_paybacks'] = 'Go back to global paybacks list'; $i18n['go_back_list_global_paybacks'] = 'Go back to global paybacks list';
$i18n['submit'] = 'Submit'; $i18n['submit'] = 'Submit';

2
i18n/fr.php
View File

@ -121,7 +121,7 @@ $i18n['confirm'] = 'Confirmer';
$i18n['a_bill'] = 'une dépense'; $i18n['a_bill'] = 'une dépense';
$i18n['doesnt_exist'] = "n'existe pas"; $i18n['doesnt_exist'] = "n'existe pas";
$i18n['deleted_user'] = 'Utilisateur supprimé'; $i18n['deleted_user'] = 'Utilisateur supprimé';
$i18n['confirm_payback'] = "Êtes-vous sûr de vouloir confirmer ce remboursement ? Cette action ne peut pas être annulée simplement."; $i18n['confirm_global_payback'] = "Êtes-vous sûr de vouloir confirmer ce remboursement ? Cette action ne peut pas être annulée simplement.";
$i18n['go_back_list_global_paybacks'] = 'Retour à la liste des remboursements globaux'; $i18n['go_back_list_global_paybacks'] = 'Retour à la liste des remboursements globaux';
$i18n['submit'] = 'Envoyer'; $i18n['submit'] = 'Envoyer';

4
index.php
View File

@ -1188,7 +1188,7 @@
} }
} }
if($balances[$user1->getId()][$user2->getId()] == 0) { if(abs($balances[$user1->getId()][$user2->getId()]) < 0.01) {
$balances[$user1->getId()][$user2->getId()] = '-'; $balances[$user1->getId()][$user2->getId()] = '-';
$balances[$user2->getId()][$user1->getId()] = '-'; $balances[$user2->getId()][$user1->getId()] = '-';
} }
@ -1209,7 +1209,7 @@
$user_balance = $user_balance + $balances[$user1->getId()][$current_user->getId()]; $user_balance = $user_balance + $balances[$user1->getId()][$current_user->getId()];
} }
$tpl->assign('user_balance', round($user_balance,2)); $tpl->assign('user_balance', round($user_balance, 2));
} }
$tpl->assign('users', secureDisplay($users_list)); $tpl->assign('users', secureDisplay($users_list));

4
install.php
View File

@ -75,8 +75,8 @@
amount INT(11), amount INT(11),
from_user INT(11), from_user INT(11),
FOREIGN KEY (from_user) REFERENCES '.$mysql_prefix.'Users(id) ON DELETE CASCADE, FOREIGN KEY (from_user) REFERENCES '.$mysql_prefix.'Users(id) ON DELETE CASCADE,
to_user INT(11) to_user INT(11),
FOREIGN KEY (to_user) REFERENCES '.$mysql_prefix.'Users(id) ON DELETE CASCADE, FOREIGN KEY (to_user) REFERENCES '.$mysql_prefix.'Users(id) ON DELETE CASCADE
) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci'); ) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci');
// Create table "GlobalPaybacks" // Create table "GlobalPaybacks"

2
tpl/default/see_paybacks.html
View File

@ -41,7 +41,7 @@
{else} {else}
<td> <td>
{if condition="$table[$key1][$key2] != 0"} {if condition="$table[$key1][$key2] != 0"}
<a href="?do=confirm_global_paybacks&amp;from={$key1}&amp;to={$key2}&amp;payback_id={$global_paybacks->getId()}&amp;token={$token}" title="Confirm payback" onclick="return confirm("{$i18n['confirm_payback']}");">{$table[$key1][$key2]}</a> <a href="?do=confirm_global_paybacks&amp;from={$key1}&amp;to={$key2}&amp;payback_id={$global_paybacks->getId()}&amp;token={$token}" title="Confirm payback" onclick="return confirm("{$i18n['confirm_global_payback']}");">{$table[$key1][$key2]}</a>
{else} {else}
- -
{/if} {/if}