Index: trunk/extensions/Chemistry/SpecialChemicalsources.php |
— | — | @@ -20,7 +20,7 @@ |
21 | 21 | * These parameters are built into the page [[Wikipedia:Chemical Sources]] by replacement |
22 | 22 | * of the $ codes (empty codes giving empty strings). |
23 | 23 | * |
24 | | - * Note: ChemFunctions.i18n.php has to be stored in the same folder like SpecialChemicalsources.php |
| 24 | + * Note: ChemFunctions.i18n.php has to be stored in the same folder like SpecialChemicalsources.php |
25 | 25 | * |
26 | 26 | * @package MediaWiki |
27 | 27 | * @subpackage SpecialPage |
— | — | @@ -65,7 +65,7 @@ |
66 | 66 | $ParamsCheck = ""; |
67 | 67 | global $wgChemFunctions_ChemicalIdentifiers; |
68 | 68 | foreach ($wgChemFunctions_ChemicalIdentifiers as $key) { |
69 | | - if ( isset( $Params [$key] ) ) |
| 69 | + if ( isset( $Params [$key] ) ) |
70 | 70 | $ParamsCheck .= $Params [$key]; |
71 | 71 | } |
72 | 72 | if ($ParamsCheck) { |
— | — | @@ -106,7 +106,7 @@ |
107 | 107 | $Params['CAS'] = preg_replace( '/[^0-9\-]/', "", $Params['CAS'] ); |
108 | 108 | else $Params['CAS'] = ''; |
109 | 109 | if ( isset( $Params['EINECS'] ) ) |
110 | | - $Params['EINECS'] = preg_replace( '/[^0-9\-]/', "", $Params['EINECS'] ); |
| 110 | + $Params['EINECS'] = preg_replace( '/[^0-9\-]/', "", $Params['EINECS'] ); |
111 | 111 | else $Params['EINECS'] = ''; |
112 | 112 | if ( isset( $Params['CHEBI'] ) ) |
113 | 113 | $Params['CHEBI'] = preg_replace( '/[^0-9\-]/', "", $Params['CHEBI'] ); |
— | — | @@ -173,7 +173,7 @@ |
174 | 174 | "\$MIXNameFormula" => $TEMPNAMEFORMULA); |
175 | 175 | global $wgChemFunctions_ChemicalIdentifiers; |
176 | 176 | foreach ($wgChemFunctions_ChemicalIdentifiers as $key) { |
177 | | - if ( isset( $Params[$key] ) ) |
| 177 | + if ( isset( $Params[$key] ) ) |
178 | 178 | $transParams["\$" . $key] = $Params[$key] ; |
179 | 179 | } |
180 | 180 | return $transParams; |
— | — | @@ -187,6 +187,7 @@ |
188 | 188 | $go = htmlspecialchars( wfMsg( "go" ) ); |
189 | 189 | |
190 | 190 | global $wgChemFunctions_ChemicalIdentifiers; |
| 191 | + $wgOut->addWikitext ( wfMsg('ChemFunctions_SearchExplanation')); |
191 | 192 | $wgOut->addHTML("<table><tr><td>"); |
192 | 193 | foreach ($wgChemFunctions_ChemicalIdentifiers as $key) { |
193 | 194 | $this->GetParam_Row("ChemFunctions_" . $key, $key, $action, $go); |
— | — | @@ -197,7 +198,7 @@ |
198 | 199 | function GetParam_Row($p, $q, $action, $go) { |
199 | 200 | #Creates a table row |
200 | 201 | global $wgOut; |
201 | | - $wgOut->addWikitext("[[" . htmlspecialchars( wfMsg( $p ) ) . "]]: "); |
| 202 | + $wgOut->addHTML ( wfMsg( $p ) . ": "); |
202 | 203 | $wgOut->addHTML("</td><td> |
203 | 204 | <form action=\"$action\" method='post'> |
204 | 205 | <input name=\"$q\" id=\"$q\" /> |
Index: trunk/extensions/Chemistry/ChemFunctions.i18n.php |
— | — | @@ -53,6 +53,7 @@ |
54 | 54 | 'ChemFunctions_ECNumber' => 'ECNumber', |
55 | 55 | 'ChemFunctions_Formula' => 'Formula', |
56 | 56 | 'ChemFunctions_Name' => 'IUPAC Name', |
| 57 | + 'ChemFunctions_SearchExplanation' => '', |
57 | 58 | 'ChemFunctions_ChemicalDataList' => 'Below is a list of links to sites that may provide information about the chemical substance you are looking for.<br /><br /> |
58 | 59 | * <a href="http://webbook.nist.gov/cgi/cbook.cgi?ID=$MIXCASNameFormula&Units=SI">Compound $MIXCASNameFormula at NIST</a><br /> |
59 | 60 | * <a href="http://ptcl.chem.ox.ac.uk/MSDS/">MSDS at the Oxford University (UK) (not searchable)</a><br />' |
— | — | @@ -75,6 +76,7 @@ |
76 | 77 | 'ChemFunctions_ECNumber' => 'ECNumber', |
77 | 78 | 'ChemFunctions_Formula' => 'Formula', |
78 | 79 | 'ChemFunctions_Name' => 'IUPAC Name', |
| 80 | + 'ChemFunctions_SearchExplanation' => '', |
79 | 81 | 'ChemFunctions_ChemicalDataList' => 'Nachfolgend finden Sie Links zu Seiten, die eventuell Informationen über chemische Substanzen anbieten, nach denen Sie suchen:<br /><br /> |
80 | 82 | * <a href="http://webbook.nist.gov/cgi/cbook.cgi?ID=$MIXCASNameFormula&Units=SI">Verbindung $MIXCASNameFormula auf NIST</a><br /> |
81 | 83 | * <a href="http://ptcl.chem.ox.ac.uk/MSDS/">MSDS an der Oxford University (UK) (nicht durchsuchbar)</a><br />' |
— | — | @@ -97,6 +99,7 @@ |
98 | 100 | 'ChemFunctions_ECNumber' => 'EC Nummer', |
99 | 101 | 'ChemFunctions_Formula' => 'Formula', |
100 | 102 | 'ChemFunctions_Name' => 'IUPAC Naam', |
| 103 | + 'ChemFunctions_SearchExplanation' => '', |
101 | 104 | 'ChemFunctions_ChemicalDataList' => 'Hieronder staat een lijst van pagina\'s, die meer informatie over de chemische verbinding kunnen verschaffen.<br /><br /> |
102 | 105 | * <a href="http://webbook.nist.gov/cgi/cbook.cgi?ID=$MIXCASNameFormula&Units=SI">Verbinding $MIXCASNameFormula op de pagina van het NIST</a><br /> |
103 | 106 | * <a href="http://ptcl.chem.ox.ac.uk/MSDS/">MSDS op de pagina van de Oxford University (UK) (geen zoekresultaten)</a><br />' |