r69036 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r69035‎ | r69036 | r69037 >
Date:23:32, 4 July 2010
Author:jeroendedauw
Status:ok (Comments)
Tags:
Comment:
Attempt to fix i18n issue
Modified paths:
  • /trunk/extensions/Maps/Maps.i18n.php (modified) (history)
  • /trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayers.php (modified) (history)
  • /trunk/extensions/Maps/Services/OpenLayers/OpenLayerFunctions.js (modified) (history)

Diff [purge]

Index: trunk/extensions/Maps/Services/OpenLayers/OpenLayerFunctions.js
@@ -59,7 +59,7 @@
6060 for (i = 0; i < mapTypes.length; i++) map.addLayer(mapTypes[i]);
6161
6262 // Layer to hold the markers.
63 - var markerLayer = new OpenLayers.Layer.Markers('Markers');
 63+ var markerLayer = new OpenLayers.Layer.Markers( msgMarkers );
6464 markerLayer.id= 'markerLayer';
6565 map.addLayer(markerLayer);
6666
Index: trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayers.php
@@ -75,7 +75,7 @@
7676 Html::linkedStyle( "$egMapsScriptPath/Services/OpenLayers/OpenLayers/theme/default/style.css" ),
7777 Html::linkedScript( "$egMapsScriptPath/Services/OpenLayers/OpenLayers/OpenLayers.js?$egMapsStyleVersion" ),
7878 Html::linkedScript( "$egMapsScriptPath/Services/OpenLayers/OpenLayerFunctions{$egMapsJsExt}?$egMapsStyleVersion" ),
79 - Html::inlineScript( 'initOLSettings(200, 100);' )
 79+ Html::inlineScript( 'initOLSettings(200, 100); var msgMarkers = "' . Xml::encodeJsVar( wfMsg( 'maps-markers' ) ) . '";' )
8080 );
8181 }
8282
Index: trunk/extensions/Maps/Maps.i18n.php
@@ -22,6 +22,7 @@
2323 Available mapping services: $1",
2424 'maps_map' => 'Map',
2525 'maps-loading-map' => 'Loading map...',
 26+ 'maps-markers' => 'Markers',
2627
2728 // Coordinate handling
2829 'maps-abb-north' => 'N',

Follow-up revisions

RevisionCommit summaryAuthorDate
r69039Fix syntax error in r69036. Xml::encodeJsVar() already supplies ""avar23:45, 4 July 2010

Comments

#Comment by Ævar Arnfjörð Bjarmason (talk | contribs)   23:46, 4 July 2010

OK with r69039

Status & tagging log