[MediaWiki-commits] [Gerrit] Make marker uppercase for letters - change (mediawiki...Kartographer)

Mon, 07 Mar 2016 11:05:18 -0800 

jenkins-bot has submitted this change and it was merged.

Change subject: Make marker uppercase for <maplink> letters
......................................................................


Make marker uppercase for <maplink> letters

Change-Id: I8e1155b39a0c4d344fa28ae2245a2a6e9b0ec1e3
---
M includes/Tag/TagHandler.php
M tests/parserTests.txt
2 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Tag/TagHandler.php b/includes/Tag/TagHandler.php
index 2e75022..4c2361a 100644
--- a/includes/Tag/TagHandler.php
+++ b/includes/Tag/TagHandler.php
@@ -325,7 +325,8 @@
                                        $marker = $isNumber ? strval( $count ) 
: chr( ord( 'a' ) + $count - 1 );
                                        $item->properties->{'marker-symbol'} = 
$marker;
                                        if ( $firstMarker === false ) {
-                                               $firstMarker = $marker;
+                                               // GeoJSON is in lowercase, but 
the letter is shown as uppercase
+                                               $firstMarker = mb_strtoupper( 
$marker );
                                        }
                                }
                        }
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 2d886ac..14de241 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -73,8 +73,8 @@
 !! result
 <p><a class="mw-kartographer mw-kartographer-link" mw-data="interface" 
data-style="osm-intl" data-zoom="13" data-lat="10" data-lon="20" 
data-overlays="[&quot;_b34053f88dea58fe70a7da09c558f792394f6e11&quot;]">Foo</a>
 </p><p><a class="mw-kartographer mw-kartographer-link" mw-data="interface" 
data-style="osm-intl" data-zoom="13" data-lat="10" data-lon="20" 
data-overlays="[&quot;_2e4133dc429eb3c3abf4e45916c073e841f9d193&quot;]">2</a>
-</p><p><a class="mw-kartographer mw-kartographer-link" mw-data="interface" 
data-style="osm-intl" data-zoom="13" data-lat="10" data-lon="20" 
data-overlays="[&quot;_dd3c7bae539f7c3747c64d043c97e1a8834fbc8f&quot;]">a</a>
-</p><p><a class="mw-kartographer mw-kartographer-link" mw-data="interface" 
data-style="osm-intl" data-zoom="13" data-lat="10" data-lon="20" 
data-overlays="[&quot;_8ce73f7395e427bd6f462824717c0a214b3ca564&quot;]">b</a>
+</p><p><a class="mw-kartographer mw-kartographer-link" mw-data="interface" 
data-style="osm-intl" data-zoom="13" data-lat="10" data-lon="20" 
data-overlays="[&quot;_dd3c7bae539f7c3747c64d043c97e1a8834fbc8f&quot;]">A</a>
+</p><p><a class="mw-kartographer mw-kartographer-link" mw-data="interface" 
data-style="osm-intl" data-zoom="13" data-lat="10" data-lon="20" 
data-overlays="[&quot;_8ce73f7395e427bd6f462824717c0a214b3ca564&quot;]">B</a>
 </p>
 !! end
 

-- 
To view, visit https://gerrit.wikimedia.org/r/275515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e1155b39a0c4d344fa28ae2245a2a6e9b0ec1e3
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to