From 5668506c08277d4a0621ca265f81016dc89751c3 Mon Sep 17 00:00:00 2001 From: Alan Garcia Date: Fri, 11 Mar 2011 09:32:58 +0000 Subject: [PATCH] =?UTF-8?q?Ajouts=20du=20changement=20de=20langue=20*dans*?= =?UTF-8?q?=20le=20panel=20(avec=20de=20mignons=20petit=20drapeaux).=20Pas?= =?UTF-8?q?sage=20en=201.0~rc2=20(au=20moins.=20On=20verra=20apr=C3=A8s=20?= =?UTF-8?q?si=20on=20change=20=C3=A7a).=20Premier=20jet=20du=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 4 ++++ bureau/admin/images/flag_de_DE.png | Bin 0 -> 147 bytes bureau/admin/images/flag_en_US.png | Bin 0 -> 803 bytes bureau/admin/images/flag_es_ES.png | Bin 0 -> 168 bytes bureau/admin/images/flag_fr_FR.png | Bin 0 -> 178 bytes bureau/admin/menu.php | 10 ++++++++-- bureau/class/lang_env.php | 13 ++++++------- bureau/class/local.php | 2 +- debian/changelog | 18 ++++++++++++++++++ 9 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 bureau/admin/images/flag_de_DE.png create mode 100644 bureau/admin/images/flag_en_US.png create mode 100644 bureau/admin/images/flag_es_ES.png create mode 100644 bureau/admin/images/flag_fr_FR.png diff --git a/.gitattributes b/.gitattributes index 2cf97b90..72559bbf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -164,6 +164,10 @@ bureau/admin/images/delete.png -text bureau/admin/images/dom.png -text bureau/admin/images/edit.png -text bureau/admin/images/exit.png -text +bureau/admin/images/flag_de_DE.png -text +bureau/admin/images/flag_en_US.png -text +bureau/admin/images/flag_es_ES.png -text +bureau/admin/images/flag_fr_FR.png -text bureau/admin/images/folder.png -text bureau/admin/images/folderhta.png -text bureau/admin/images/ftp.png -text diff --git a/bureau/admin/images/flag_de_DE.png b/bureau/admin/images/flag_de_DE.png new file mode 100644 index 0000000000000000000000000000000000000000..0a6a87036bd9388f6a4ca05cfe2ed7e2cc71460a GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^qCm{Y#0(_&X6%mzQak}ZA+G;{;0(imAeVumg75n# zAjMhW5n0T@z%2~Ij105pNB{-dOFVsD*{?B+il|y=G4E;s3Q2joIEHXsPyWHr#4hn6 laJ9n%Mr%ZW00004XF*Lt006O% z3;baP00007bV*G`2h#)_3U|20K{f{d;H{{Q~^|NZ{^>ch#@Bq{sb+GTi|`v3ed zOMyd9i1PIH{`~vlxwFa{9W_OF#VET=I-petK2g++i`OC`TF?(|JZwc%?u7mScNl6h_$=L z`~3Xy($3i;D)Q&&?X|J@)T)FB<% zBp=r)BGM!x*(NC2EGpL?8rUNx*(fX3C?wV@DBCV5(hHrF*X>4${%_4)YH*4f?UI!J;!LVSagulCW>;Iz2uuBO&9G}tsY z+>M6&{q@Nr9@$n{lbW_VP=|1dsqXRY=!c5r^z_l)>)dN>&|6pMnwa?I=;o}bxn-Yh!o<>t-H+bly0Be9S$N*J0*imkoN-RZT>9YYt-2lzc4!ucjQFIzdsFE`z@_=tLu4LcaT z)M|A**9?j+_w<0bXPbTBybBxd-f?A_G{BYpSY)@l1C4BL!UTYm{Mv2Ex&%BeT+dGd z+~>1$&oI28wVNctjR6FmMZlFeAgPITAoYQ%@Ji5R22vHir*$sRQRa~ PsD#1O)z4*}Q$iB}@t-)J literal 0 HcmV?d00001 diff --git a/bureau/admin/menu.php b/bureau/admin/menu.php index 9e1e7cd2..8e8b3a4c 100644 --- a/bureau/admin/menu.php +++ b/bureau/admin/menu.php @@ -50,7 +50,13 @@ if ($tt) { } ?> -

+

AlternC
- +

"; +foreach($locales as $l) { ?> + <?php __($l); ?>

diff --git a/bureau/class/lang_env.php b/bureau/class/lang_env.php index 1cd34d1f..51e5c95e 100644 --- a/bureau/class/lang_env.php +++ b/bureau/class/lang_env.php @@ -2,18 +2,17 @@ function update_locale($langpath) { $locales=array(); - $f=@fopen("/etc/locale.gen","rb"); - if ($f) { - while ($s=fgets($f,1024)) { - if (preg_match("/^([a-z][a-z]_[A-Z][A-Z])/",trim($s),$mat) && file_exists($langpath . '/' . $mat[1])) { - $locales[$mat[1]]=$mat[1]; - } + $file=file("/etc/locale.gen", FILE_SKIP_EMPTY_LINES); + if (! is_array($file) ) return $locales; + foreach ($file as $v ) { + if ( (preg_match("/^([a-z][a-z]_[A-Z][A-Z])/",trim($v),$mat) && file_exists($langpath . '/' . $mat[1]) ) ) { + $locales[$mat[1]]=$mat[1]; } - fclose($f); } return $locales; } + // setlang is on the link at the login page if (isset($_REQUEST["setlang"])) { $lang=$_REQUEST["setlang"]; diff --git a/bureau/class/local.php b/bureau/class/local.php index d746ddbe..49ea298a 100644 --- a/bureau/class/local.php +++ b/bureau/class/local.php @@ -1,7 +1,7 @@ 'MX', diff --git a/debian/changelog b/debian/changelog index 84724f46..6dee42ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +alternc (1.0~rc2) stable; urgency=low + * Major patch + * Web & DNS file generation rebuild from scratch + * Drop of apache 1 support + * Big changes in database schema (domaines, sub_domaines, *_standby) + * Major changes + * Drop mass virtual hosting, now use full vhost + * New features + * Domains type are dynamic, the administrator can create domaine type with his own apache template + * Advanced DNS options (ipv6, cname, txt, mx) + * Possibility to create a temporary mail + * Bugfixes + * Too many to be listed (we change the update_domaines.sh) + * Dash compatibility + * Use iana.org to have whois server list up to date + + -- Alan Garcia Fri, 11 Mars 2011 10:24:30 +0200 + alternc (1.0~rc1) stable; urgency=low * Major patch