Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/245183
Change subject: Renamed to Kartographer
......................................................................
Renamed to Kartographer
Change-Id: Ic882c35decf8cad5ccf8f1ae7701d46b2974970e
---
M .gitreview
R Kartographer.hooks.php
A Kartographer.php
D Map.php
M README.md
M extension.json
M i18n/en.json
M i18n/qqq.json
M package.json
M styles/common.less
A tests/phpunit/KartographerTest.php
D tests/phpunit/MapTest.php
12 files changed, 67 insertions(+), 67 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/83/245183/1
diff --git a/.gitreview b/.gitreview
index 10fa607..ae31e32 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,7 +1,7 @@
[gerrit]
host=gerrit.wikimedia.org
port=29418
-project=mediawiki/extensions/Map.git
+project=mediawiki/extensions/Kartographer.git
defaultbranch=master
defaultrebase=0
diff --git a/Map.hooks.php b/Kartographer.hooks.php
similarity index 71%
rename from Map.hooks.php
rename to Kartographer.hooks.php
index da5185e..6587cae 100644
--- a/Map.hooks.php
+++ b/Kartographer.hooks.php
@@ -7,7 +7,7 @@
* @author Yuri Astrakhan
*/
-namespace Map;
+namespace Kartographer;
use Html;
use Parser;
@@ -15,7 +15,7 @@
class Singleton {
public static function onParserFirstCallInit( Parser $parser ) {
- $parser->setHook( 'map', 'Map\Singleton::onMapTag' );
+ $parser->setHook( 'map', 'Kartographer\Singleton::onMapTag' );
return true;
}
@@ -39,19 +39,19 @@
if ( $zoom === false || $width === false || $height === false ||
$latitude === false || $longitude === false
) {
- $parserOutput->setExtensionData( 'map_broken', true );
+ $parserOutput->setExtensionData( 'kartographer_broken',
true );
return $input;
}
- $parserOutput->setExtensionData( 'map_valid', true );
+ $parserOutput->setExtensionData( 'kartographer_valid', true );
//
https://maps.wikimedia.org/img/osm-intl,%1$s,%2$s,%3$s,%4$sx%5$s.jpeg
// 1=zoom, 2=lat, 3=lon, 4=width, 5=height, [6=scale]
//
http://.../img/{source},{zoom},{lat},{lon},{width}x{height}[@{scale}x].{format}
- global $wgMapStaticImgUrl;
+ global $wgKartographerStaticImgUrl;
$html = Html::rawElement( 'img', array(
- 'class' => 'mw-wiki-map-img',
- 'src' => sprintf( $wgMapStaticImgUrl, $zoom, $latitude,
$longitude, $width, $height ),
+ 'class' => 'mw-wiki-kartographer-img',
+ 'src' => sprintf( $wgKartographerStaticImgUrl, $zoom,
$latitude, $longitude, $width, $height ),
) );
return $html;
@@ -59,11 +59,11 @@
public static function onParserAfterParse( Parser $parser ) {
$output = $parser->getOutput();
- if ( $output->getExtensionData( 'map_broken' ) ) {
- $output->addTrackingCategory( 'map-broken-category',
$parser->getTitle() );
+ if ( $output->getExtensionData( 'kartographer_broken' ) ) {
+ $output->addTrackingCategory(
'kartographer-broken-category', $parser->getTitle() );
}
- if ( $output->getExtensionData( 'map_valid' ) ) {
- $output->addTrackingCategory( 'map-tracking-category',
$parser->getTitle() );
+ if ( $output->getExtensionData( 'kartographer_valid' ) ) {
+ $output->addTrackingCategory(
'kartographer-tracking-category', $parser->getTitle() );
}
return true;
}
diff --git a/Kartographer.php b/Kartographer.php
new file mode 100644
index 0000000..9f18b9b
--- /dev/null
+++ b/Kartographer.php
@@ -0,0 +1,13 @@
+<?php
+if ( function_exists( 'wfLoadExtension' ) ) {
+ wfLoadExtension( 'Kartographer' );
+ // Keep i18n globals so mergeMessageFileList.php doesn't break
+ $wgMessagesDirs['Kartographer'] = __DIR__ . '/i18n';
+ /* wfWarn(
+ 'Deprecated PHP entry point used for Kartographer extension.
Please use wfLoadExtension instead, ' .
+ 'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
+ ); */
+ return;
+} else {
+ die( 'This version of the Kartographer extension requires MediaWiki
1.25+' );
+}
diff --git a/Map.php b/Map.php
deleted file mode 100644
index ab62af1..0000000
--- a/Map.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-if ( function_exists( 'wfLoadExtension' ) ) {
- wfLoadExtension( 'Map' );
- // Keep i18n globals so mergeMessageFileList.php doesn't break
- $wgMessagesDirs['Map'] = __DIR__ . '/i18n';
- /* wfWarn(
- 'Deprecated PHP entry point used for Map extension. Please use
wfLoadExtension instead, ' .
- 'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
- ); */
- return;
-} else {
- die( 'This version of the Map extension requires MediaWiki 1.25+' );
-}
diff --git a/README.md b/README.md
index 4c3e535..1ca3c33 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-Map is a MediaWiki extension that adds map capability
-See https://www.mediawiki.org/wiki/Extension:Map
+Kartographer is a MediaWiki extension that adds map capability
+See https://www.mediawiki.org/wiki/Extension:Kartographer
diff --git a/extension.json b/extension.json
index c6ac1cb..8af8684 100644
--- a/extension.json
+++ b/extension.json
@@ -1,22 +1,22 @@
{
- "name": "Map",
+ "name": "Kartographer",
"author": [
"Yuri Astrakhan"
],
- "url": "https://www.mediawiki.org/wiki/Extension:Map";,
- "descriptionmsg": "map-desc",
+ "url": "https://www.mediawiki.org/wiki/Extension:Kartographer";,
+ "descriptionmsg": "kartographer-desc",
"license-name": "MIT",
"type": "other",
"MessagesDirs": {
- "Map": [
+ "Kartographer": [
"i18n"
]
},
"AutoloadClasses": {
- "Map\\Singleton": "Map.hooks.php"
+ "Kartographer\\Singleton": "Kartographer.hooks.php"
},
"ResourceModules": {
- "ext.map": {
+ "ext.kartographer": {
"scripts": [
],
"styles": [
@@ -32,24 +32,24 @@
},
"ResourceFileModulePaths": {
"localBasePath": "",
- "remoteExtPath": "Map"
+ "remoteExtPath": "Kartographer"
},
"Hooks": {
"ParserFirstCallInit": [
- "Map\\Singleton::onParserFirstCallInit"
+ "Kartographer\\Singleton::onParserFirstCallInit"
],
"ParserAfterParse": [
- "Map\\Singleton::onParserAfterParse"
+ "Kartographer\\Singleton::onParserAfterParse"
]
},
"config": {
- "MapStaticImgUrl":
"https://maps.wikimedia.org/img/osm-intl,%1$s,%2$s,%3$s,%4$sx%5$s.jpeg";,
- "MapSrcsetScales": [1.3, 1.5, 2, 2.6, 3],
- "MapStaticScaledImgUrl":
"https://maps.wikimedia.org/img/osm-intl,%1$s,%2$s,%3$s,%4$sx%5$s@%5$sx.jpeg";
+ "KartographerStaticImgUrl":
"https://maps.wikimedia.org/img/osm-intl,%1$s,%2$s,%3$s,%4$sx%5$s.jpeg";,
+ "KartographerSrcsetScales": [1.3, 1.5, 2, 2.6, 3],
+ "KartographerStaticScaledImgUrl":
"https://maps.wikimedia.org/img/osm-intl,%1$s,%2$s,%3$s,%4$sx%5$s@%5$sx.jpeg";
},
"TrackingCategories": [
- "map-tracking-category",
- "map-mapbroken-category"
+ "kartographer-tracking-category",
+ "kartographer-broken-category"
],
"manifest_version": 1
}
diff --git a/i18n/en.json b/i18n/en.json
index 97f7872..aa0a7b6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,9 +4,9 @@
"Yuri Astrakhan"
]
},
- "map-desc": "Allows <map> tags to insert a map into a wiki page",
- "map-tracking-category": "Pages with maps",
- "map-tracking-category-desc": "The page includes a
<code><nowiki><map></nowiki></code> tag.",
- "map-broken-category": "Pages with broken maps",
- "map-broken-category-desc": "The page includes a
<code><nowiki><map></nowiki></code> tag with invalid usage."
+ "kartographer-desc": "Allows <map> tags to insert a map into a
wiki page",
+ "kartographer-tracking-category": "Pages with maps",
+ "kartographer-tracking-category-desc": "The page includes a
<code><nowiki><map></nowiki></code> tag.",
+ "kartographer-broken-category": "Pages with broken maps",
+ "kartographer-broken-category-desc": "The page includes a
<code><nowiki><map></nowiki></code> tag with invalid usage."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 424d8e4..9e255b4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,12 +1,12 @@
{
"@metadata": {
"authors": [
- "Yuri Astrakhan",
+ "Yuri Astrakhan"
]
},
- "map-desc":
"{{desc|name=Maps|url=https://www.mediawiki.org/wiki/Extension:Maps}}";,
- "map-tracking-category": "Name of the tracking category",
- "map-tracking-category-desc": "Description on
[[Special:TrackingCategories]] for the {{msg-mw|map-tracking-category}}
tracking category.",
- "map-broken-category": "Name of the tracking category",
- "map-broken-category-desc": "Description on
[[Special:TrackingCategories]] for the {{msg-mw|map-broken-category}} tracking
category."
+ "kartographer-desc":
"{{desc|name=Kartographer|url=https://www.mediawiki.org/wiki/Extension:Kartographer}}";,
+ "kartographer-tracking-category": "Name of the tracking category",
+ "kartographer-tracking-category-desc": "Description on
[[Special:TrackingCategories]] for the
{{msg-mw|kartographer-tracking-category}} tracking category.",
+ "kartographer-broken-category": "Name of the tracking category",
+ "kartographer-broken-category-desc": "Description on
[[Special:TrackingCategories]] for the {{msg-mw|kartographer-broken-category}}
tracking category."
}
diff --git a/package.json b/package.json
index 9a03b37..9b0332b 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
- "name": "Map",
+ "name": "Kartographer",
"version": "0.0.0",
"private": true,
- "description": "Build tools for the Map-MediaWiki extension.",
+ "description": "Build tools for the Kartographer-MediaWiki extension.",
"scripts": {
"test": "grunt test"
},
diff --git a/styles/common.less b/styles/common.less
index ac5cd63..ec6e744 100644
--- a/styles/common.less
+++ b/styles/common.less
@@ -1,3 +1,3 @@
-.mw-wiki-map-img {
+.mw-wiki-kartographer-img {
display: inline-block;
}
diff --git a/tests/phpunit/KartographerTest.php
b/tests/phpunit/KartographerTest.php
new file mode 100644
index 0000000..5ff4719
--- /dev/null
+++ b/tests/phpunit/KartographerTest.php
@@ -0,0 +1,12 @@
+<?php
+namespace Kartographer\Tests;
+
+use MediaWikiTestCase;
+
+/**
+ * @package KartographerTests
+ * @group Kartographer
+*/
+class KartographerTest extends MediaWikiTestCase {
+
+}
diff --git a/tests/phpunit/MapTest.php b/tests/phpunit/MapTest.php
deleted file mode 100644
index 12486fe..0000000
--- a/tests/phpunit/MapTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Map\Tests;
-
-use MediaWikiTestCase;
-
-/**
- * @package MapTests
- * @group Map
-*/
-class MapTest extends MediaWikiTestCase {
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/245183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic882c35decf8cad5ccf8f1ae7701d46b2974970e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![https://maps.wikimedia.org/img/osm-intl,%1$s,%2$s,%3$s,%4$sx%5$s.jpeg"](https://maps.wikimedia.org/img/osm-intl,%1$s,%2$s,%3$s,%4$sx%5$s.jpeg"){kind=link}
![https://maps.wikimedia.org/img/osm-intl,%1$s,%2$s,%3$s,%4$sx%5$s@%5$sx.jpeg"](https://maps.wikimedia.org/img/osm-intl,%1$s,%2$s,%3$s,%4$sx%5$s@%5$sx.jpeg"){kind=link}