jenkins-bot has submitted this change and it was merged.
Change subject: Fix variant URLs in beta JS language list
......................................................................
Fix variant URLs in beta JS language list
Bug: 60440
Change-Id: Ifc2f8133dc71556b1676f33a9021259c0a11b95b
---
M javascripts/common/PageApi.js
M tests/javascripts/common/test_PageApi.js
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/common/PageApi.js b/javascripts/common/PageApi.js
index 24902e1..e0e88aa 100644
--- a/javascripts/common/PageApi.js
+++ b/javascripts/common/PageApi.js
@@ -187,8 +187,8 @@
};
if ( variantPath ) {
variant.url = variantPath
- .replace( '$1', item.code )
- .replace( '$2', title );
+ .replace( '$1', title )
+ .replace( '$2', item.code );
} else {
variant.url = mw.util.getUrl( title, {
'variant' : item.code } );
}
diff --git a/tests/javascripts/common/test_PageApi.js
b/tests/javascripts/common/test_PageApi.js
index 1aa504b..d6f272a 100644
--- a/tests/javascripts/common/test_PageApi.js
+++ b/tests/javascripts/common/test_PageApi.js
@@ -212,7 +212,7 @@
"name": "Latinica"
}
],
- "variantarticlepath": "/wiki/$1/$2",
+ "variantarticlepath": "/$2/$1"
},
"languages": [
{
@@ -268,17 +268,17 @@
{
"lang":"sr",
"langname":"sr",
- "url":"/wiki/sr/Test",
+ "url":"/sr/Test"
},
{
"lang":"sr-ec",
"langname":"\u040b\u0438\u0440\u0438\u043b\u0438\u0446\u0430",
- "url":"/wiki/sr-ec/Test",
+ "url":"/sr-ec/Test"
},
{
"lang":"sr-el",
"langname":"Latinica",
- "url":"/wiki/sr-el/Test",
+ "url":"/sr-el/Test"
}
], 'return augmented language variant links' );
} );
--
To view, visit https://gerrit.wikimedia.org/r/111369
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc2f8133dc71556b1676f33a9021259c0a11b95b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
