Mwjames has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/148615

Change subject: 1.2.0 release
......................................................................

1.2.0 release

- Migrate to JSON i18n
- Remove wfMsg / wfMsgForContent usage
- Raise minimum MW version to 1.20
- Unstrip strip items of 'general' category
- Swap SpecialVersionExtensionTypes for ExtensionTypes

@note: ~1.2 is equivalent to >=1.2,< 2.0

Change-Id: Iacc18361d93f7fb9d29efd49cba11bf897ce6e8c
---
M Lingo.php
D README
A README.md
3 files changed, 87 insertions(+), 74 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Lingo 
refs/changes/15/148615/1

diff --git a/Lingo.php b/Lingo.php
index 7e1f9fc..9cb52c2 100644
--- a/Lingo.php
+++ b/Lingo.php
@@ -8,11 +8,10 @@
  * @author    Barry Coughlan
  * @copyright 2010 Barry Coughlan
  * @author    Stephan Gambke
- * @version   1.2.0-dev
- * @licence   GNU General Public Licence 2.0 or later
+ * @version   1.2.0
+ * @license   GNU General Public Licence 2.0 or later
  * @see       http://www.mediawiki.org/wiki/Extension:Lingo Documentation
  */
-
 
 call_user_func( function () {
 
@@ -20,7 +19,7 @@
                die( 'This file is part of a MediaWiki extension, it is not a 
valid entry point.' );
        }
 
-       define( 'LINGO_VERSION', '1.2.0-dev' );
+       define( 'LINGO_VERSION', '1.2.0' );
 
        // set defaults for settings
 
diff --git a/README b/README
deleted file mode 100644
index 7bb5504..0000000
--- a/README
+++ /dev/null
@@ -1,70 +0,0 @@
-Lingo is a glossary extension to MediaWiki, that lets you define abbreviations
-and their definitions on a wiki page. It displays these definitions whenever an
-abbreviation is hovered over in an article.
-
-See http://www.mediawiki.org/wiki/Extension:Lingo for online documentation.
-
-
-== Installation ==
-
-This extension was developed for MediaWiki 1.16 und upwards. Other version 
might
-work, but are not tested.
-
-1. Download the package. Unpack the folder inside /extensions (so that the 
files
-   are in /extensions/Lingo, rename the folder if necessary).
-
-2. In your LocalSettings.php, add the following line to the end of the file:
-
-   require_once("$IP/extensions/Lingo/Lingo.php");
-
-3. Create the page "Terminology" (no namespace), and insert some entries using
-   the following syntax:
-
-
-;FTP:File Transport Protocol
-;AAAAA:American Association Against Acronym Abuse
-;ACK:Acknowledge
-;AFAIK:As Far As I Know
-;AWGTHTGTATA:Are We Going To Have To Go Through All This Again
-;HTTP:HyperText Transfer Protocol
-
-
-== Customization ==
-
-The following settings may be used:
-
-* $wgexLingoPage to specify the name of the terminology page
-  Example: $wgexLingoPage = 'Glossary';
-
-* $wgexLingoDisplayOnce to specify that each term should be annotated only once
-  per page
-  Example: $wgexLingoDisplayOnce = true;
-
-* $wgexLingoUseNamespaces to specify what namespaces should or should not be 
used
-  Example: $wgexLingoUseNamespaces[NS_TALK] = false;
-
-If you want to use these settings, just include them in LocalSettings.php AFTER
-the require_once("$IP/extensions/Lingo/Lingo.php");
-
-
-== Usage ==
-
-By default Lingo will mark up any page that is not in a forbidden namespace. To
-exclude a page from markup you can include __NOGLOSSARY__ anywhere in the
-article. In some cases it may be necessary to exclude portions of a page, e.g.
-because Lingo interferes with some JavaScript. This can be achieved by wrapping
-the part in an HTML element (e.g. a span or a div) and specify 
class="noglossary".
-
-
-== Credits ==
-
-Lingo is a rewrite of Extension:Terminology, written by BarkerJr with
-modifications by Benjamin Kahn. It was originally written by Barry Coughlan and
-is currently maintained by Stephan Gambke.
-
-
-== Reporting bugs ==
-
-Comments, questions and suggestions should be sent or posted to:
-* the Lingo discussion page: http://www.mediawiki.org/wiki/Extension_talk:Lingo
-* the maintainer: http://www.mediawiki.org/wiki/Special:EmailUser/F.trott
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..50bf208
--- /dev/null
+++ b/README.md
@@ -0,0 +1,84 @@
+# Lingo
+[![Latest Stable 
Version](https://poser.pugx.org/mediawiki/lingo/version.png)](https://packagist.org/packages/mediawiki/lingo)
+[![Packagist download 
count](https://poser.pugx.org/mediawiki/lingo/d/total.png)](https://packagist.org/packages/mediawiki/lingo)
+[![Dependency 
Status](https://www.versioneye.com/php/mediawiki:lingo/badge.png)](https://www.versioneye.com/php/mediawiki:lingo)
+
+Lingo is a glossary extension to MediaWiki, that lets you define abbreviations
+and their definitions on a wiki page. It displays these definitions whenever an
+abbreviation is hovered over in an article.
+
+See http://www.mediawiki.org/wiki/Extension:Lingo for online documentation.
+
+## Requirements
+
+- PHP 5.3.2 or later
+- MediaWiki 1.20 or later
+
+## Installation
+
+The recommended way to install this skin is by using [Composer][composer]. 
Just add the following to the MediaWiki `composer.json` file and run the `php 
composer.phar install/update` command.
+
+```json
+{
+       "require": {
+               "mediawiki/lingo": "~1.2"
+       }
+}
+```
+
+## Customization
+
+The following settings may be used:
+
+* `$wgexLingoPage` to specify the name of the terminology page
+  Example: `$wgexLingoPage = 'Glossary'`;
+
+* `$wgexLingoDisplayOnce` to specify that each term should be annotated only 
once
+  per page
+  Example: `$wgexLingoDisplayOnce = true`;
+
+* `$wgexLingoUseNamespaces` to specify what namespaces should or should not be 
used
+  Example: `$wgexLingoUseNamespaces[NS_TALK] = false`;
+
+If you want to use these settings, just include them in LocalSettings.php AFTER
+the require_once("$IP/extensions/Lingo/Lingo.php");
+
+
+## Usage
+
+By default Lingo will mark up any page that is not in a forbidden namespace. To
+exclude a page from markup you can include __NOGLOSSARY__ anywhere in the
+article. In some cases it may be necessary to exclude portions of a page, e.g.
+because Lingo interferes with some JavaScript. This can be achieved by wrapping
+the part in an HTML element (e.g. a span or a div) and specify 
class="noglossary".
+
+### Terminology page
+
+Create the page "Terminology" (no namespace), and insert some entries using
+the following syntax:
+
+;FTP:File Transport Protocol
+;AAAAA:American Association Against Acronym Abuse
+;ACK:Acknowledge
+;AFAIK:As Far As I Know
+;AWGTHTGTATA:Are We Going To Have To Go Through All This Again
+;HTTP:HyperText Transfer Protocol
+
+## Reporting bugs
+
+Comments, questions and suggestions should be sent or posted to:
+* the Lingo discussion page: http://www.mediawiki.org/wiki/Extension_talk:Lingo
+* the maintainer: http://www.mediawiki.org/wiki/Special:EmailUser/F.trott
+
+## Credits
+
+Lingo is a rewrite of Extension:Terminology, written by BarkerJr with
+modifications by Benjamin Kahn. It was originally written by Barry Coughlan and
+is currently maintained by Stephan Gambke.
+
+## License
+
+[GNU General Public License 2.0][license] or later.
+
+[composer]: https://getcomposer.org/
+[license]: https://www.gnu.org/copyleft/gpl.html

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacc18361d93f7fb9d29efd49cba11bf897ce6e8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lingo
Gerrit-Branch: master
Gerrit-Owner: Mwjames <[email protected]>

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

Reply via email to