From d6fdd56b1712686f5a3af5838107d7a748ad4896 Mon Sep 17 00:00:00 2001
From: ARNO* <arno@rezo.net>
Date: Fri, 31 Oct 2003 18:01:19 +0000
Subject: [PATCH] Barre des raccourcis: 2 niveaux de guillemets

---
 .gitattributes                             |   1 +
 IMG/icones_barre/guillemets-uniques-de.png | Bin 0 -> 295 bytes
 ecrire/inc_barre.php3                      |   9 ++++++---
 ecrire/lang/spip_de.php3                   |   4 ++--
 ecrire/lang/spip_en.php3                   |   4 ++--
 ecrire/lang/spip_fr.php3                   |   3 ++-
 6 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 IMG/icones_barre/guillemets-uniques-de.png

diff --git a/.gitattributes b/.gitattributes
index 15032f5d37..593820a9e6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -53,6 +53,7 @@ IMG/icones_barre/euro.png -text
 IMG/icones_barre/gras.png -text
 IMG/icones_barre/guillemets-de.png -text
 IMG/icones_barre/guillemets-simples.png -text
+IMG/icones_barre/guillemets-uniques-de.png -text
 IMG/icones_barre/guillemets-uniques.png -text
 IMG/icones_barre/guillemets.png -text
 IMG/icones_barre/intertitre.png -text
diff --git a/IMG/icones_barre/guillemets-uniques-de.png b/IMG/icones_barre/guillemets-uniques-de.png
new file mode 100644
index 0000000000000000000000000000000000000000..43dc0ab5a39f4a10269975552ad4b76d06b2d645
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl;=8&~`zjDUQ}64!{5
z;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWHb6xZ0X`wF`uh4nrjU@(@#Dvj9zELF
z*y!o$`R?7j!@i;wKnaeLAiv=M5WsM+d2b|8tkKiOF{I*FQi3}(1LKhfJq7^>4JMs6
zZ{9F4w&)x<b>PrBJ^_alOg#!r3Jn1)5)DxdOdOF7jT1ZP$^r#=Qdws)3OGnyV`33#
zV{l+#WR18vV<HPsjm7~MBW^x0<IJ%R6`-*S#xo{{GO!3RUpZO;<T@~li9|Cn@h~)e
WX6w4RequM!F$|urelF{r5}E+_F<D0d

literal 0
HcmV?d00001

diff --git a/ecrire/inc_barre.php3 b/ecrire/inc_barre.php3
index fc98a25bd6..19adf03111 100644
--- a/ecrire/inc_barre.php3
+++ b/ecrire/inc_barre.php3
@@ -91,12 +91,15 @@ function afficher_barre($formulaire='',$texte='', $forum=false) {
 		$col++;
 		if ($spip_lang == "fr" OR $spip_lang == "eo" OR $spip_lang == "cpf" OR $spip_lang == "ar") {
 			$ret .= bouton_barre_racc ("javascript:barre_raccourci('&laquo;','&raquo;',$champ)", "guillemets.png", _T('barre_guillemets'), $formulaire, $texte);
+			$ret .= bouton_barre_racc ("javascript:barre_raccourci('&ldquo;','&rdquo;',$champ)", "guillemets-simples.png", _T('barre_guillemets_simples'), $formulaire, $texte);
 		}
 		else if ($spip_lang == "de" OR $spip_lang == "pl" OR $spip_lang == "hr" OR $spip_lang == "src") {
-			$ret .= bouton_barre_racc ("javascript:barre_raccourci('&bdquo;','&ldquo;',$champ)", "guillemets-de.png", _T('barre_guillemets_de'), $formulaire, $texte);
+			$ret .= bouton_barre_racc ("javascript:barre_raccourci('&bdquo;','&ldquo;',$champ)", "guillemets-de.png", _T('barre_guillemets'), $formulaire, $texte);
+			$ret .= bouton_barre_racc ("javascript:barre_raccourci('&sbquo;','&lsquo;',$champ)", "guillemets-uniques-de.png", _T('barre_guillemets_simples'), $formulaire, $texte);
 		}
 		else {
-			$ret .= bouton_barre_racc ("javascript:barre_raccourci('&ldquo;','&rdquo;',$champ)", "guillemets-simples.png", _T('barre_guillemets_simples'), $formulaire, $texte);
+			$ret .= bouton_barre_racc ("javascript:barre_raccourci('&ldquo;','&rdquo;',$champ)", "guillemets-simples.png", _T('barre_guillemets'), $formulaire, $texte);
+			$ret .= bouton_barre_racc ("javascript:barre_raccourci('&lsquo;','&rsquo;',$champ)", "guillemets-uniques.png", _T('barre_guillemets_simples'), $formulaire, $texte);
 		}
 		$ret .= "&nbsp;&nbsp;&nbsp;";
 		if ($spip_lang == "fr" OR $spip_lang == "eo" OR $spip_lang == "cpf") {
@@ -106,7 +109,7 @@ function afficher_barre($formulaire='',$texte='', $forum=false) {
 			$ret .= bouton_barre_racc ("javascript:barre_inserer('&oelig;',$champ)", "oelig.png", _T('barre_eo'), $formulaire, $texte);
 			$ret .= bouton_barre_racc ("javascript:barre_inserer('&OElig;',$champ)", "oelig-maj.png", _T('barre_eo_maj'), $formulaire, $texte);
 		}
-		//$ret .= bouton_barre_racc ("javascript:barre_inserer('&euro;',$champ)", "euro.png", "Ins&eacute;rer le symbole euro", $formulaire, $texte);
+		$ret .= bouton_barre_racc ("javascript:barre_inserer('&euro;',$champ)", "euro.png", _T('barre_euro'), $formulaire, $texte);
 		$ret .= "</td>";
 
 		if ($flag_ecrire) {
diff --git a/ecrire/lang/spip_de.php3 b/ecrire/lang/spip_de.php3
index 2c0a2674d0..aa59fbb273 100644
--- a/ecrire/lang/spip_de.php3
+++ b/ecrire/lang/spip_de.php3
@@ -74,8 +74,8 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 'barre_eo' => 'Ein E in das O einf&uuml;gen',
 'barre_eo_maj' => 'Ein E in ein grosses O einf&uuml;gen',
 'barre_gras' => '{{fett}} setzen',
-'barre_guillemets' => 'In &laquo; franz&ouml;sische Anf&uuml;hrungszeichen &raquo; setzen',
-'barre_guillemets_de' => 'in &#8222;Anf&uuml;hrungszeichen&#8220; setzen',
+'barre_guillemets' => 'in &#8222;Anf&uuml;hrungszeichen&#8220; setzen',
+'barre_guillemets_simples' => 'in &#8218;Anf&uuml;hrungszeichen&#8216; setzen',
 'barre_intertitre' => 'in {{{Zwischentitel}}} umwandeln',
 'barre_italic' => 'in {kursive} Schrift setzen',
 'barre_lien' => 'in [Hyperlink->http://...] umwandeln',
diff --git a/ecrire/lang/spip_en.php3 b/ecrire/lang/spip_en.php3
index 543e2a5a65..d6ab4ef3fc 100644
--- a/ecrire/lang/spip_en.php3
+++ b/ecrire/lang/spip_en.php3
@@ -82,8 +82,8 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 'barre_eo' => 'Insert an oe-ligature',
 'barre_eo_maj' => 'Insert a capital EO-ligature',
 'barre_gras' => 'Put in {{bold type}}',
-'barre_guillemets' => 'Place between &laquo; French inverted commas &raquo;',
-'barre_guillemets_de' => 'Place between „German inverted commas“',
+'barre_guillemets' => 'Place between &ldquo;commas&rdquo;',
+'barre_guillemets_simples' => 'Place between &lsquo;commas&rsquo;',
 'barre_intertitre' => 'Turn into a {{{subheading}}}',
 'barre_italic' => 'Put in {italics}',
 'barre_lien' => 'Turn into a [hyperlink->http://...]',
diff --git a/ecrire/lang/spip_fr.php3 b/ecrire/lang/spip_fr.php3
index 2e9f13b59a..bbc830c446 100644
--- a/ecrire/lang/spip_fr.php3
+++ b/ecrire/lang/spip_fr.php3
@@ -81,9 +81,10 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 'barre_e_accent_aigu' => 'Ins&eacute;rer un E accent aigu majuscule',
 'barre_eo' => 'Ins&eacute;rer un E dans l\'O',
 'barre_eo_maj' => 'Ins&eacute;rer un Edans l\'O majuscule',
+'barre_euro' => 'Ins&eacute;rer le symbole &euro;',
 'barre_gras' => 'Mettre en {{gras}}',
 'barre_guillemets' => 'Entourer de &laquo; guillemets fran&ccedil;ais &raquo;',
-'barre_guillemets_de' => 'Entourer de &bdquo;guillemets&ldquo;',
+'barre_guillemets_simples' => 'Entourer de &ldquo;guillemets simples&rdquo;',
 'barre_intertitre' => 'Transformer en {{{intertitre}}}',
 'barre_italic' => 'Mettre en {italique}',
 'barre_lien' => 'Transformer en [lien hypertexte->http://...]',
-- 
GitLab