aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lallement <dams@mageia.org>2011-11-21 13:26:19 +0000
committerDamien Lallement <dams@mageia.org>2011-11-21 13:26:19 +0000
commit6ea486c144aa5a6dad61e9bcde16cbeb1420c235 (patch)
treec2b21ec5ff5392bd59b0edae94281b5fac0ff383
parent531fc1008e3b6b1b1d901513e00fdff8284c10ae (diff)
downloadwww-6ea486c144aa5a6dad61e9bcde16cbeb1420c235.tar
www-6ea486c144aa5a6dad61e9bcde16cbeb1420c235.tar.gz
www-6ea486c144aa5a6dad61e9bcde16cbeb1420c235.tar.bz2
www-6ea486c144aa5a6dad61e9bcde16cbeb1420c235.tar.xz
www-6ea486c144aa5a6dad61e9bcde16cbeb1420c235.zip
- update donors list
- update bank accounts situation - rewrite 'anonymous' listing
-rw-r--r--donators.inc.php15
-rw-r--r--en/about/reports/2011/index.php4
-rw-r--r--langs.php2
3 files changed, 14 insertions, 7 deletions
diff --git a/donators.inc.php b/donators.inc.php
index ac131c627..afba581eb 100644
--- a/donators.inc.php
+++ b/donators.inc.php
@@ -3,8 +3,10 @@
*/
/**
-*/
+ */
+$anonymous = 15;
$donators = array(
+ 'Anonymous (x $anonymous)',
'Pascal Vilarem (MaĆ¢t)',
'Vicente Salvador Cubedo',
'Samuel Verschelde (Stormi)',
@@ -73,7 +75,6 @@ $donators = array(
'Werner Brinkmann',
'Serge Moreau',
'Jean Goujoun',
- 'Anonymous (x 14)',
'Freddy Janssens',
'Nico Bergmann',
'Adrien Guichard',
@@ -259,7 +260,13 @@ $donators = array(
'Alejandro Diaz Infante',
'Marcel Sahaghian',
'Edward Janusz',
- 'Jean-Claude Colette'
+ 'Jean-Claude Colette',
+ 'Eduardo Castiello Armayor',
+ 'Jean-Francois Cayula',
+ 'Angelika Furrer',
+ 'Valentin Moon',
+ 'Jean Derouet',
+ 'Patrick Le Tiec'
);
//$html .= '<img src="/g/images/mageia_0.svg" style="position: absolute; top: 180px; width: 300px; opacity: 0.2;" />';
@@ -295,7 +302,7 @@ $orgs = array(
*/
function html_donators_list($donators)
{
- $count_donators = count($donators)+14; //count + anonymous
+ $count_donators = count($donators+$anonymous);
//$donators = array_unique($donators);
sort($donators);
diff --git a/en/about/reports/2011/index.php b/en/about/reports/2011/index.php
index 99450c37a..2a541cb9e 100644
--- a/en/about/reports/2011/index.php
+++ b/en/about/reports/2011/index.php
@@ -54,9 +54,9 @@
</table>
<h2>Bank accounts situation</h2>
<ul>
- <li>Paypal (non-for-profit organisation account): EUR&nbsp;333.91</li>
+ <li>Paypal (non-for-profit organisation account): EUR&nbsp;63.82</li>
<li>Main account (with checkbook and no credit card): EUR&nbsp;354.55</li>
- <li>Savings account (between 2% and 4% of interest): EUR&nbsp;6 180,57</li>
+ <li>Savings account (between 2% and 4% of interest): EUR&nbsp;7 180,57</li>
</ul>
<h2>Forecast for 2011</h2>
<table id="fr-table"><thead><tr><th>Description of planned expenditure</th><th>Unit Price</th><th>Quantity</th><th>Recurrence</th><th>Total Price</th><th>Status</th></tr></thead><tbody><tr>
diff --git a/langs.php b/langs.php
index 91d065d01..5b45ebc0c 100644
--- a/langs.php
+++ b/langs.php
@@ -6,7 +6,7 @@ $g_app_root = realpath(dirname(__FILE__));
define('G_APP_ROOT', $g_app_root);
$g_donate_amount = 'EUR&nbsp;12 181.52';
-$g_amount_remain = 'EUR&nbsp;6 869.03';
+$g_amount_remain = 'EUR&nbsp;7 598.94';
$G_coord_assos = <<<T
Assocation Mageia.Org