CVS: spip/ecrire config-lang.php3, 1.12, 1.13 inc_presentation.php3, 1.343, 1.344

[Genuine_VIAGRA_Onlin (Genuine VIAGRA © Online Store)]

Update of /home/spip-cvs/spip/ecrire
In directory miel:/tmp/cvs-serv5261/ecrire

Modified Files:
  config-lang.php3 inc_presentation.php3
Log Message:
Modif configuration des langues: sŽparer langue du site et multilinguisme.

Index: config-lang.php3

RCS file: /home/spip-cvs/spip/ecrire/config-lang.php3,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- config-lang.php3 26 Nov 2003 05:40:00 -0000 1.12
+++ config-lang.php3 26 Nov 2003 06:14:49 -0000 1.13
@@ -19,7 +19,11 @@

echo "<br><br><br>";
gros_titre(_T('info_langues'));
-//barre_onglets("configuration", "langues");
+
+
+barre_onglets("config_lang", "langues");
+
+

debut_gauche();
@@ -132,153 +136,6 @@
   fin_cadre_relief();

}
-
-
-debut_cadre_enfonce();
- echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">";
- echo "<TR><TD BGCOLOR='#EEEECC' BACKGROUND='img_pack/rien.gif' COLSPAN=2><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='black'>"._T('info_multilinguisme')."</FONT></B>" /* .aide ("confart") */ ."</TD></TR>";
-
- echo "<TR><TD BACKGROUND='img_pack/rien.gif' COLSPAN='2' class='verdana2'>";
- echo _T('texte_multilinguisme');
- echo "</TD></TR>";
-
- echo "<TR>";
- echo "<TD ALIGN='$spip_lang_left' class='verdana2'>";
- echo _T('info_multi_articles');
- echo "</TD>";
- echo "<TD ALIGN='$spip_lang_left' class='verdana2'>";
- afficher_choix('multi_articles', lire_meta('multi_articles'),
- array('oui' => _T('item_oui'), 'non' => _T('item_non')), " &nbsp; ");
- echo "</TD></TR>\n";
-
- echo "<TR>";
- echo "<TD ALIGN='$spip_lang_left' class='verdana2'>";
- echo _T('info_multi_rubriques');
- echo "</TD>";
- echo "<TD ALIGN='$spip_lang_left' class='verdana2'>";
- afficher_choix('multi_rubriques', lire_meta('multi_rubriques'),
- array('oui' => _T('item_oui'), 'non' => _T('item_non')), " &nbsp; ");
- echo "</TD></TR>\n";
-
- if (lire_meta('multi_rubriques') == 'oui') {
- echo "<TR>";
- echo "<TD ALIGN='$spip_lang_left' class='verdana2'>";
- echo _T('info_multi_secteurs');
- echo "</TD>";
- echo "<TD ALIGN='$spip_lang_left' class='verdana2'>";
- afficher_choix('multi_secteurs', lire_meta('multi_secteurs'),
- array('oui' => _T('item_oui'), 'non' => _T('item_non')), " &nbsp; ");
- echo "</TD></TR>\n";
- } else
- echo "<input type='hidden' name='multi_secteurs' value='".lire_meta('multi_secteurs')."'>";
-
- if ((lire_meta('multi_rubriques') == 'oui') OR (lire_meta('multi_articles') == 'oui')) {
- echo "<TR><TD BACKGROUND='img_pack/rien.gif' COLSPAN='2' class='verdana2'><hr>";
- echo _T('texte_multilinguisme_trad');
- echo "</TD></TR>";
-
- echo "<TR>";
- echo "<TD ALIGN='$spip_lang_left' class='verdana2'>";
- echo _T('info_gerer_trad');
- echo "</TD>";
- echo "<TD ALIGN='$spip_lang_left' class='verdana2'>";
- afficher_choix('gerer_trad', lire_meta('gerer_trad'),
- array('oui' => _T('item_oui'), 'non' => _T('item_non')), " &nbsp; ");
- echo "</TD></TR>\n";
- } else
- echo "<input type='hidden' name='gerer_trad' value='".lire_meta('gerer_trad')."'>";
-
-
- echo "<TR><TD style='text-align:$spip_lang_right;' COLSPAN=2>";
- echo "<INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'>";
- echo "</TD></TR>";
- echo "</TABLE>";
-
-
- if (lire_meta('multi_articles') == "oui" OR lire_meta('multi_rubriques') == "oui") {
- echo "<p>";
- debut_cadre_relief("langues-24.gif");
- echo "<p class='verdana2'>";
- echo _T('info_multi_langues_choisies');
- echo '</p>';
-
- $langues = $GLOBALS['codes_langues'];
- $cesure = floor((count($langues) + 1) / 2);
-
- $langues_installees = explode(',', $GLOBALS['all_langs']);
- $langues_autorisees = explode(',', lire_meta('langues_multilingue'));
-
- while (list(,$l) = each ($langues_installees)) {
- $langues_trad[$l] = true;
- }
-
- while (list(,$l) = each ($langues_autorisees)) {
- $langues_auth[$l] = true;
- }
-
- $langues_bloquees[lire_meta('langue_site')] = 1;
- $query = "SELECT DISTINCT lang FROM spip_articles WHERE statut='publie'";
- $result = spip_query($query);
- while ($row = spip_fetch_array($result)) {
- $langues_bloquees[$row['lang']] = 1;
- }
- $query = "SELECT DISTINCT lang FROM spip_breves WHERE statut='publie'";
- $result = spip_query($query);
- while ($row = spip_fetch_array($result)) {
- $langues_bloquees[$row['lang']] = 1;
- }
- $query = "SELECT DISTINCT lang FROM spip_rubriques WHERE statut='publie'";
- $result = spip_query($query);
- while ($row = spip_fetch_array($result)) {
- $langues_bloquees[$row['lang']] = 1;
- }
-
- echo "<table width = '100%' cellspacing='10'><tr><td width='50%' align='top'><font size='2' face='Verdana,Arial,Sans,sans-serif'>";
-
- ksort($langues_bloquees);
- while (list($code_langue, ) = each($langues_bloquees)) {
- $i++;
- echo "<div>";
- $nom_langue = $langues[$code_langue];
- $nom_langue = "<b><font color='$couleur_foncee'>$nom_langue</font></b>";
- echo "<input type='hidden' name='langues_auth[]' value='$code_langue' id='langue_auth_$code_langue'>";
- echo "<input type='checkbox' checked disabled>";
- echo " $nom_langue &nbsp; &nbsp;<font color='#777777'>[$code_langue]</font>";
- echo "</div>\n";
-
- if ($i == $cesure) echo "</font></td><td width='50%' align='top'><font size='2' face='Verdana,Arial,Sans,sans-serif'>";
- }
-
- echo "<div>&nbsp;</div>";
-
- while (list($code_langue, $nom_langue) = each($langues)) {
- if ($langues_bloquees[$code_langue]) continue;
- $i++;
- echo "<div>";
-
- if ($langues_auth[$code_langue]) {
- echo "<input type='checkbox' name='langues_auth[]' value='$code_langue' id='langue_auth_$code_langue' checked>";
- $nom_langue = "<b>$nom_langue</b>";
- }
- else {
- echo "<input type='checkbox' name='langues_auth[]' value='$code_langue' id='langue_auth_$code_langue'>";
- }
- echo " <label for='langue_auth_$code_langue'>$nom_langue</label> &nbsp; &nbsp;<font color='#777777'>[$code_langue]</font>";
-
- echo "</div>\n";
-
- if ($i == $cesure) echo "</font></td><td width='50%' align='top'><font size='2' face='Verdana,Arial,Sans,sans-serif'>";
- }
-
- echo "</font></td></tr>";
- echo "<tr><td style='text-align:$spip_lang_right;' COLSPAN=2>";
- echo "<INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'>";
- echo "</td></tr></table>";
-
- fin_cadre_relief();
- }
-fin_cadre_enfonce();
-

echo "</form>";

Index: inc_presentation.php3

RCS file: /home/spip-cvs/spip/ecrire/inc_presentation.php3,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -d -r1.343 -r1.344
--- inc_presentation.php3 26 Nov 2003 04:19:23 -0000 1.343
+++ inc_presentation.php3 26 Nov 2003 06:14:49 -0000 1.344
@@ -1098,7 +1098,11 @@
     onglet(_T('onglet_contenu_site'), "configuration.php3", "contenu", $onglet, "racine-site-24.gif");
     onglet(_T('onglet_interactivite'), "config-contenu.php3", "interactivite", $onglet, "forum-interne-24.gif");
     onglet(_T('onglet_fonctions_avances'), "config-fonctions.php3", "fonctions", $onglet, "image-24.gif");
- //onglet(_T('onglet_langues'), "config-lang.php3", "langues", $onglet, "langues-24.gif");
+ }
+
+ if ($rubrique == "config_lang") {
+ onglet(_T('info_langue_principale'), "config-lang.php3", "langues", $onglet, "langues-24.gif");
+ onglet(_T('info_multilinguisme'), "config-multilang.php3", "multi", $onglet, "traductions-24.gif");
   }

   if ($rubrique == "suivi_forum"){