Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94332
Change subject: Avoid using deprecated method and add some missing deps
......................................................................
Avoid using deprecated method and add some missing deps
Change-Id: Ie7e26533019b8b99ea61fb53ed0a424cc0836d1f
---
M Resources.php
M resources/js/ext.translate.editor.js
M resources/js/ext.translate.messagetable.js
M resources/js/ext.translate.pagetranslation.uls.js
M resources/js/ext.translate.parsers.js
M resources/js/ext.translate.special.aggregategroups.js
6 files changed, 27 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/32/94332/1
diff --git a/Resources.php b/Resources.php
index d3158da..d17b7cd 100644
--- a/Resources.php
+++ b/Resources.php
@@ -152,6 +152,7 @@
'dependencies' => array(
'ext.translate.base',
'ext.translate.hooks',
+ 'mediawiki.Uri',
'mediawiki.util',
'jquery.appear',
'mediawiki.jqueryMsg',
@@ -229,6 +230,7 @@
'scripts' => 'resources/js/ext.translate.pagetranslation.uls.js',
'dependencies' => array(
'ext.uls.init',
+ 'mediawiki.Uri',
'mediawiki.util',
),
) + $resourcePaths;
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index 3faf4f4..11549ed 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -1,6 +1,9 @@
( function ( $, mw ) {
'use strict';
+ // BC for MW <= 1.21
+ var getUrl = mw.util.getUrl || mw.util.wikiGetlink;
+
/**
* TranslateEditor Plugin
* Prepare the translation editor UI for a translation unit (message).
@@ -584,7 +587,7 @@
.text( mw.msg(
'translate-edit-askpermission' ) )
.addClass(
'tux-editor-ask-permission' )
.attr( {
- href:
mw.util.wikiGetlink( mw.config.get( 'wgTranslatePermissionUrl' ) )
+ href: getUrl(
mw.config.get( 'wgTranslatePermissionUrl' ) )
} )
);
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index 80edd4a..a47bd98 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -1,9 +1,7 @@
( function ( $, mw ) {
'use strict';
- mw.translate = mw.translate || {};
-
- var delay, itemsClass;
+ var delay, itemsClass, getUrl;
delay = ( function () {
var timer = 0;
@@ -20,6 +18,10 @@
translate: '.tux-message'
};
+ // BC for MW <= 1.21
+ getUrl = mw.util.getUrl || mw.util.wikiGetlink;
+
+ mw.translate = mw.translate || {};
mw.translate = $.extend( mw.translate, {
getMessages: function ( messageGroup, language, offset, limit,
filter ) {
var api = new mw.Api();
@@ -253,7 +255,7 @@
$( '<a>' )
.attr( {
title:
mw.msg( 'translate-edit-title', message.key ),
- href: (
new mw.Uri( mw.util.wikiGetlink( message.title ) ) )
+ href: (
new mw.Uri( getUrl( message.title ) ) )
.extend( { action: 'edit' } )
} )
.text( mw.msg(
'tux-edit' ) )
@@ -366,7 +368,7 @@
.find( 'div' )
.text( mw.msg(
'tux-message-filter-result', resultCount, query ) );
$result.find( 'button' ).on( 'click', function
() {
- window.location.href = new mw.Uri(
mw.util.wikiGetlink( 'Special:SearchTranslations' ) )
+ window.location.href = new mw.Uri(
getUrl( 'Special:SearchTranslations' ) )
.extend( { query: query } );
} );
}
diff --git a/resources/js/ext.translate.pagetranslation.uls.js
b/resources/js/ext.translate.pagetranslation.uls.js
index d3f4c81..f76eda6 100644
--- a/resources/js/ext.translate.pagetranslation.uls.js
+++ b/resources/js/ext.translate.pagetranslation.uls.js
@@ -1,10 +1,14 @@
( function ( mw ) {
'use strict';
+ // BC for MW <= 1.21
+ var getUrl = mw.util.getUrl || mw.util.wikiGetlink;
+
+
mw.uls.changeLanguage = function ( language ) {
var page, uri;
page = 'Special:MyLanguage/' + mw.config.get( 'wgPageName' );
- uri = new mw.Uri( mw.util.wikiGetlink( page ) );
+ uri = new mw.Uri( getUrl( page ) );
uri.extend( {
setlang: language
diff --git a/resources/js/ext.translate.parsers.js
b/resources/js/ext.translate.parsers.js
index ddd9232..b58fd98 100644
--- a/resources/js/ext.translate.parsers.js
+++ b/resources/js/ext.translate.parsers.js
@@ -9,8 +9,10 @@
( function ( $, mw ) {
'use strict';
- mw.translate = mw.translate || {};
+ // BC for MW <= 1.21
+ var getUrl = mw.util.getUrl || mw.util.wikiGetlink;
+ mw.translate = mw.translate || {};
mw.translate = $.extend( mw.translate, {
/**
* Formats some common wikitext elements
@@ -50,12 +52,12 @@
} );
text = text.replace( /\[\[(.+?)\|(.+?)\]\]/g, function
( match, p1, p2 ) {
- var link = $( '<a>' ).html( p2 ).prop( 'href',
mw.util.wikiGetlink( p1 ) );
+ var link = $( '<a>' ).html( p2 ).prop( 'href',
getUrl( p1 ) );
return $( '<div>' ).append( link ).html();
} );
text = text.replace( /\[\[(.+?)\]\]/g, function (
match, p1 ) {
- var link = $( '<a>' ).html( p1 ).prop( 'href',
mw.util.wikiGetlink( p1 ) );
+ var link = $( '<a>' ).html( p1 ).prop( 'href',
getUrl( p1 ) );
return $( '<div>' ).append( link ).html();
} );
diff --git a/resources/js/ext.translate.special.aggregategroups.js
b/resources/js/ext.translate.special.aggregategroups.js
index c05e2e0..f51cd98 100644
--- a/resources/js/ext.translate.special.aggregategroups.js
+++ b/resources/js/ext.translate.special.aggregategroups.js
@@ -1,6 +1,9 @@
( function ( $, mw ) {
'use strict';
+ // BC for MW <= 1.21
+ getUrl = mw.util.getUrl || mw.util.wikiGetlink;
+
function getApiParams( $target ) {
return {
action: 'aggregategroups',
@@ -51,7 +54,7 @@
var aAttr, $a, spanAttr, $span, $ol;
aAttr = {
- href: mw.util.wikiGetlink( subgroupName
),
+ href: getUrl( subgroupName ),
title: subgroupName
};
--
To view, visit https://gerrit.wikimedia.org/r/94332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7e26533019b8b99ea61fb53ed0a424cc0836d1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
