| Index: trunk/extensions/Maps/Maps.php |
| — | — | @@ -100,7 +100,7 @@ |
| 101 | 101 | * Initialization function for the Maps extension |
| 102 | 102 | */ |
| 103 | 103 | function efMapsSetup() { |
| 104 | | - global $wgExtensionCredits, $wgOut, $wgAutoloadClasses, $IP; |
| | 104 | + global $wgExtensionCredits, $wgOut, $wgLang, $wgAutoloadClasses, $IP; |
| 105 | 105 | global $egMapsDefaultService, $egMapsAvailableServices, $egMapsServices, $egMapsScriptPath, $egMapsDefaultGeoService, $egMapsAvailableGeoServices, $egMapsIP; |
| 106 | 106 | |
| 107 | 107 | efMapsValidateGoogleMapsKey(); |
| — | — | @@ -114,7 +114,7 @@ |
| 115 | 115 | // Creation of a list of internationalized service names |
| 116 | 116 | $services = array(); |
| 117 | 117 | foreach (array_keys($egMapsServices) as $name) $services[] = wfMsg('maps_'.$name); |
| 118 | | - $services_list = implode(', ', $services); |
| | 118 | + $services_list = $wgLang->listToText($services); |
| 119 | 119 | |
| 120 | 120 | $wgExtensionCredits['parserhook'][] = array( |
| 121 | 121 | 'path' => __FILE__, |
| Index: trunk/extensions/Maps/GoogleMaps/Maps_GoogleMapsUtils.php |
| — | — | @@ -117,7 +117,6 @@ |
| 118 | 118 | global $egGoogleMapsKey, $egMapsIncludePath, $egGoogleMapsOnThisPage; |
| 119 | 119 | |
| 120 | 120 | if (empty($egGoogleMapsOnThisPage)) { |
| 121 | | - |
| 122 | 121 | $egGoogleMapsOnThisPage = 0; |
| 123 | 122 | $output .= "<script src='http://maps.google.com/maps?file=api&v=2&key=$egGoogleMapsKey&hl={$wgLang->getCode()}' type='$wgJsMimeType'></script> |
| 124 | 123 | <script type='$wgJsMimeType' src='$egMapsIncludePath/GoogleMaps/GoogleMapFunctions.js'></script>"; |