C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/361692 )
Change subject: Expand variant list in LC DOM markup.
......................................................................
Expand variant list in LC DOM markup.
Change-Id: Ia1b649082a9f1224635980ec768357296d0221f8
---
M lib/config/WikiConfig.js
M lib/wt2html/tt/LanguageVariantHandler.js
2 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/92/361692/1
diff --git a/lib/config/WikiConfig.js b/lib/config/WikiConfig.js
index 6eefc4b..4e590fe 100644
--- a/lib/config/WikiConfig.js
+++ b/lib/config/WikiConfig.js
@@ -632,17 +632,21 @@
// `general.variants`), because the *page language* could be quite
// different. Use the mechanism introduced in T153341 instead.
this.variants = new Map();
+ this.variantsForBase = new Map();
this.langConverterEnabled = new Set();
Object.keys(languagevariants).forEach(function(code) {
+ var variantList = [];
if (general.langconversion !== undefined) {
this.langConverterEnabled.add(code);
}
Object.keys(languagevariants[code]).forEach(function(v) {
+ variantList.push(v);
this.variants.set(v, {
base: code,
fallbacks: languagevariants[code][v].fallbacks,
});
}.bind(this));
+ this.variantsForBase.set(code, variantList);
}.bind(this));
// Match a wikitext line containing just whitespace, comments, and
diff --git a/lib/wt2html/tt/LanguageVariantHandler.js
b/lib/wt2html/tt/LanguageVariantHandler.js
index b73f6a9..9c885d6 100644
--- a/lib/wt2html/tt/LanguageVariantHandler.js
+++ b/lib/wt2html/tt/LanguageVariantHandler.js
@@ -144,6 +144,17 @@
if (texts.length === 1 && !texts[0].lang &&
!dataMWV.name) {
if (dataMWV.add || dataMWV.remove) {
var variants = [ '*' ];
+ // Expanding the list of variants
bloats the DOM.
+ // But if we wanted to be explicit:
+ if (false) {
+ var env = manager.env;
+ var lang =
+ env.page.pagelanguage ||
+ env.conf.wiki.lang ||
+ 'en';
+ variants =
+
manager.env.conf.wiki.variantsForBase.get(lang);
+ }
bidir = variants.map(function(code) {
return { l: code, t:
texts[0].text };
});
--
To view, visit https://gerrit.wikimedia.org/r/361692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1b649082a9f1224635980ec768357296d0221f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian <canan...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
