Mhurd has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373748 )
Change subject: Add Russian to 'On this day' endpoint.
......................................................................
Add Russian to 'On this day' endpoint.
Bug: T169274
Change-Id: I047ab65683757dcc0b0fa4fb6f92d1e665ba90c1
---
M lib/feed/on-this-day.languages.js
M routes/on-this-day.js
2 files changed, 41 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/48/373748/1
diff --git a/lib/feed/on-this-day.languages.js
b/lib/feed/on-this-day.languages.js
index 06226a9..91787e1 100644
--- a/lib/feed/on-this-day.languages.js
+++ b/lib/feed/on-this-day.languages.js
@@ -9,7 +9,7 @@
],
dayPage : {
// https://en.wikipedia.org/wiki/May_22
- nameFormatter : (monthName, dayNumber) =>
`${monthName}_${dayNumber}`,
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
`${monthName}_${dayNumber}`,
headingIds: {
births: ['Births'],
deaths: ['Deaths'],
@@ -19,7 +19,7 @@
},
selectedPage : {
//
https://en.wikipedia.org/wiki/Wikipedia:Selected_anniversaries/May_22
- nameFormatter : (monthName, dayNumber) =>
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
`Wikipedia:Selected_anniversaries/${monthName}_${dayNumber}`,
listElementSelector: 'body > ul li'
},
@@ -33,7 +33,7 @@
],
dayPage : {
// https://de.wikipedia.org/wiki/22._Mai
- nameFormatter : (monthName, dayNumber) =>
`${dayNumber}._${monthName}`,
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
`${dayNumber}._${monthName}`,
headingIds: {
births: ['Geboren'],
deaths: ['Gestorben'],
@@ -47,7 +47,7 @@
},
selectedPage: {
//
https://de.wikipedia.org/wiki/Wikipedia:Hauptseite/Jahrestage/Mai/22
- nameFormatter : (monthName, dayNumber) =>
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
`Wikipedia:Hauptseite/Jahrestage/${monthName}/${dayNumber}`,
listElementSelector: 'body > ul li'
},
@@ -61,7 +61,7 @@
],
dayPage : {
// https://fr.wikipedia.org/wiki/22_mai
- nameFormatter : (monthName, dayNumber) => {
+ nameFormatter : (monthName, monthNumber, dayNumber) => {
if (dayNumber === 1) {
dayNumber = '1er';
}
@@ -76,7 +76,7 @@
},
selectedPage: {
//
https://fr.wikipedia.org/wiki/Wikip%C3%A9dia:%C3%89ph%C3%A9m%C3%A9ride/22_mai
- nameFormatter : (monthName, dayNumber) =>
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
`Wikipédia:Éphéméride/${dayNumber}_${monthName}`,
listElementSelector: 'body > ul li'
},
@@ -91,7 +91,7 @@
dayPage : {
// https://sv.wikipedia.org/wiki/22_maj
// https://sv.wikipedia.org/api/rest_v1/page/html/22_maj
- nameFormatter : (monthName, dayNumber) =>
`${dayNumber}_${monthName}`,
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
`${dayNumber}_${monthName}`,
headingIds: {
births: ['F.C3.B6dda'], // Födda
deaths: ['Avlidna'],
@@ -102,7 +102,7 @@
selectedPage : {
// https://sv.wikipedia.org/wiki/Mall:22_maj
// https://sv.wikipedia.org/api/rest_v1/page/html/Mall:22_maj
- nameFormatter : (monthName, dayNumber) =>
`Mall:${dayNumber}_${monthName}`,
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
`Mall:${dayNumber}_${monthName}`,
listElementSelector: 'body > ul li'
},
yearListElementRegEx : /^\s*(\d+)\s*(f\.Kr\.)?\s*–\s(.+)/i
@@ -115,7 +115,7 @@
],
dayPage : {
// https://pt.wikipedia.org/wiki/15_de_maio
- nameFormatter : (monthName, dayNumber) =>
`${dayNumber}_${monthName}`,
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
`${dayNumber}_${monthName}`,
headingIds: {
births: ['Nascimentos'],
deaths: ['Mortes', 'Falecimentos'],
@@ -125,11 +125,36 @@
},
selectedPage : {
// https://pt.wikipedia.org/wiki/Wikipédia:Efemérides/15_de_maio
- nameFormatter : (monthName, dayNumber) =>
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
`Wikipédia:Efemérides/${dayNumber}_${monthName}`,
listElementSelector: 'body > ul li'
},
yearListElementRegEx :
/^\s*(\d+)\s*(a\.C\.)?\s*[\u002D\u2013\u2014\u2212]\s(.+)/i
+ },
+
+ ru: {
+ monthNames : [
+ 'января', 'февраля', 'марта', 'апреля', 'мая', 'июня',
+ 'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря'
+ ],
+ dayPage : {
+ // https://ru.wikipedia.org/wiki/22_мая
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
`${dayNumber}_${monthName}`,
+ headingIds: {
+ births: ['.D0.A0.D0.BE.D0.B4.D0.B8.D0.BB.D0.B8.D1.81.D1.8C'],
+ deaths:
['.D0.A1.D0.BA.D0.BE.D0.BD.D1.87.D0.B0.D0.BB.D0.B8.D1.81.D1.8C'],
+ events: ['.D0.A1.D0.BE.D0.B1.D1.8B.D1.82.D0.B8.D1.8F'],
+ // eslint-disable-next-line
+ holidays:
['.D0.9F.D1.80.D0.B0.D0.B7.D0.B4.D0.BD.D0.B8.D0.BA.D0.B8',
'.D0.9F.D1.80.D0.B0.D0.B7.D0.B4.D0.BD.D0.B8.D0.BA.D0.B8_.D0.B8_.D0.BF.D0.B0.D0.BC.D1.8F.D1.82.D0.BD.D1.8B.D0.B5_.D0.B4.D0.BD.D0.B8']
+ }
+ },
+ selectedPage : {
+ // https://ru.wikipedia.org/wiki/Шаблон:События_дня:05-30
+ nameFormatter : (monthName, monthNumber, dayNumber) =>
+ `Шаблон:События_дня:${monthNumber < 10 ? `0${monthNumber}` :
monthNumber}-${dayNumber}`,
+ listElementSelector: 'body > ul li'
+ },
+ yearListElementRegEx :
/^\s*(\d+)\s*(до\s*н\.\s*э\.)?\s*[\u002D\u2013\u2014\u2212]\s(.+)/i
}
};
diff --git a/routes/on-this-day.js b/routes/on-this-day.js
index 99e06e3..a151c11 100644
--- a/routes/on-this-day.js
+++ b/routes/on-this-day.js
@@ -20,9 +20,10 @@
* @return {!String} day page title. Example, inputs ('5', '20') returns
'May_20'
*/
function titleForDayPageFromMonthDayNumberStrings(monthNumberString,
dayNumberString, lang) {
- const monthName = languages[lang].monthNames[parseInt(monthNumberString,
10) - 1];
+ const monthNumber = parseInt(monthNumberString, 10);
+ const monthName = languages[lang].monthNames[monthNumber - 1];
const dayNumber = parseInt(dayNumberString, 10);
- return languages[lang].dayPage.nameFormatter(monthName, dayNumber);
+ return languages[lang].dayPage.nameFormatter(monthName, monthNumber,
dayNumber);
}
/**
@@ -47,9 +48,10 @@
* 'Wikipedia:Selected_anniversaries/May_20'
*/
function titleForSelectedPageFromMonthDayNumberStrings(monthNumberString,
dayNumberString, lang) {
- const monthName = languages[lang].monthNames[parseInt(monthNumberString,
10) - 1];
+ const monthNumber = parseInt(monthNumberString, 10);
+ const monthName = languages[lang].monthNames[monthNumber - 1];
const dayNumber = parseInt(dayNumberString, 10);
- return languages[lang].selectedPage.nameFormatter(monthName, dayNumber);
+ return languages[lang].selectedPage.nameFormatter(monthName, monthNumber,
dayNumber);
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/373748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I047ab65683757dcc0b0fa4fb6f92d1e665ba90c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mhurd <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
