Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
tonisevener committed Feb 25, 2021
2 parents da84625 + 0d13bc4 commit 3661785
Show file tree
Hide file tree
Showing 161 changed files with 5,428 additions and 3,961 deletions.
3 changes: 1 addition & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
private/compare-sections/
private/page-lists/top-pages/*/top-pages.*.json
test/diff/results/data_javascript_mobile-meta.wikimedia.org-pagelib.js
test/diff/results/page_definition-enwiktionary-*.json
test/diff/results/page_*MCS_Test_Frankenstein.json
tmp/
coverage/
pagelib/
pagelib/
47 changes: 28 additions & 19 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
extends: wikimedia/server
rules: {
'array-bracket-spacing': 0,
'arrow-parens': 0,
'camelcase': 0,
'comma-dangle': 0,
'comma-spacing': 0,
'computed-property-spacing': 0,
'indent': 0,
'key-spacing': 0,
'max-statements-per-line': 0,
'no-multi-spaces': 0,
'no-underscore-dangle': 0,
'no-unused-expressions': 0,
'no-restricted-syntax': 0,
'no-unused-vars': 0,
'one-var': 0,
'operator-linebreak': 0,
'space-before-function-paren': 0,
'space-in-parens': 0,
'valid-jsdoc': 0,
'array-bracket-spacing': 'off',
'arrow-parens': 'off',
'camelcase': 'off',
'comma-dangle': 'off',
'comma-spacing': 'off',
'computed-property-spacing': 'off',
'indent': ['error', 4],
'key-spacing': 'off',
'max-statements-per-line': 'off',
'no-multi-spaces': 'off',
'no-underscore-dangle': 'off',
'no-unused-expressions': 'off',
'no-restricted-syntax': 'off',
'no-unused-vars': 'off',
'one-var': 'off',
'operator-linebreak': 'off',
'space-before-function-paren': 'off',
'space-in-parens': 'off',
'jsdoc/no-undefined-types': 'off',
'jsdoc/valid-types': 'off',

'jsdoc/check-access': 'off',
'jsdoc/check-param-names': 'off',
'jsdoc/check-types': 'off',
'jsdoc/require-param': 'off',
'jsdoc/require-param-type': 'off',
'jsdoc/require-returns': 'off',
'jsdoc/require-returns-check': 'off',
}
16 changes: 8 additions & 8 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ function loadPreProcessingScripts(app, dir) {
_validate(script);
app.conf.processing_scripts[name] = script;
})
.catch(e => app.logger.log('warn/loading', `Error loading processing scripts: ${e}`)))
.then(() => BBPromise.resolve(app));
.catch(e => app.logger.log('warn/loading', `Error loading processing scripts: ${e}`)))
.then(() => BBPromise.resolve(app));
}

/**
Expand Down Expand Up @@ -286,12 +286,12 @@ function createServer(app) {
module.exports = (options) => {

return initApp(options)
.then(app => loadRoutes(app, `${__dirname}/routes`))
.then(app => loadPreProcessingScripts(app, `${__dirname}/processing`))
.then((app) => {
.then(app => loadRoutes(app, `${__dirname}/routes`))
.then(app => loadPreProcessingScripts(app, `${__dirname}/processing`))
.then((app) => {
// serve static files from static/
app.use('/static', express.static(`${__dirname}/static`));
return app;
}).then(createServer);
app.use('/static', express.static(`${__dirname}/static`));
return app;
}).then(createServer);

};
8 changes: 5 additions & 3 deletions i18n/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
"@metadata": {
"authors": [
"Meno25",
"NEHAOUA",
"Sonic N800",
"Tala Ali"
]
},
"description-add-link-title": "إضافة وصف للعنوان",
"description-add-link-title": "إضافة وصف المقالة",
"article-read-more-title": "قراءة المزيد",
"table-title-other": "مزيد من المعلومات",
"page-edit-history": "عرض تاريخ التعديلات",
Expand All @@ -26,8 +28,8 @@
"article-edit-button": "عدل هذا القسم",
"article-edit-protected-button": "عدل القسم على الصفحة المحمية",
"article-section-expand": "وسع القسم",
"article-section-collapse": "طوي القسم",
"article-section-collapse": "طَيّ القسم",
"table-expand": "تمديد الجدول",
"table-collapse": "طوي الجدول",
"table-collapse": "طَيّ الجداول",
"references-preview-header": "معاينة المراجع"
}
17 changes: 17 additions & 0 deletions i18n/az.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"@metadata": {
"authors": [
"Şeyx Şamil"
]
},
"article-read-more-title": "Daha çox oxu",
"table-title-other": "Əlavə məlumat",
"page-edit-history": "Redaktə tarixçəsini göstər",
"info-box-close-text": "Bağla",
"page-location": "Xəritədə göstər",
"page-similar-titles": "Oxşar səhifələr",
"article-about-title": "Bu məqalə haqqında",
"article-edit-button": "Bölməni reaktə et",
"article-section-expand": "Bölməni genişləndir",
"table-expand": "Cədvəli genişləndir"
}
13 changes: 8 additions & 5 deletions i18n/azb.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"table-title-other" : "آرتیق بیلگیلر",
"info-box-close-text" : "باغلا",
"article-read-more-title" : "داها چوْخ اوْخویون",
"article-about-title" : "بۇ مقاله‌یه گؤره"
}
"@metadata": {
"authors": []
},
"article-read-more-title": "داها چوْخ اوْخویون",
"table-title-other": "آرتیق بیلگیلر",
"info-box-close-text": "باغلا",
"article-about-title": "بۇ مقاله‌یه گؤره"
}
5 changes: 3 additions & 2 deletions i18n/br.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Fulup"
]
},
"description-add-link-title": "Ouzhpennañ deskvrivadur an titl",
"description-add-link-title": "Ouzhpennañ deskrivadur ar pennad",
"article-read-more-title": "Lenn muioc'h",
"table-title-other": "Muioc'h a ditouroù",
"page-edit-history": "Istor klok ar c'hemmoù",
Expand All @@ -27,5 +27,6 @@
"article-section-expand": "Dispakañ ar rannbennad",
"article-section-collapse": "Dastum ar rannbennad",
"table-expand": "Dispakañ an daolenn",
"table-collapse": "Dastum an daolenn"
"table-collapse": "Dastum an daolenn",
"references-preview-header": "Rakwel an daveennoù"
}
9 changes: 6 additions & 3 deletions i18n/ce.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"info-box-close-text" : "ДӀачӀагӀа",
"license-footer-name" : "CC-BY-SA 3.0"
}
"@metadata": {
"authors": []
},
"info-box-close-text": "ДӀачӀагӀа",
"license-footer-name": "CC-BY-SA 3.0"
}
25 changes: 23 additions & 2 deletions i18n/cy.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
{
"@metadata": {
"authors": []
"authors": [
"Robin Owain"
]
},
"description-add-link-title": "Ychwanegwch disgrifiad o'r erthygl",
"article-read-more-title": "Darllen rhagor",
"table-title-other": "Rhagor o wybodaeth",
"page-edit-history": "Fweld hanes y golygiadau",
"info-box-close-text": "Cau",
"page-talk-page-subtitle": "Trafod gwelliannau i'r erthygl hon",
"page-talk-page": "Gweld y dudalen Sgwrs",
"info-box-title": "Ffeithiau sydyn",
"article-about-title": "Ynglŷn â'r erthygl hon"
"view-in-browser-footer-link": "Gweld yr erthygl yn y porwr",
"page-location": "Gweld ar fap",
"page-similar-titles": "Tudalennau tebyg",
"page-last-edited": "{{PLURAL:$1|Diweddarwyd ddoe|Diweddarwyd $1 diwrnod yn ol|0=Diweddarwyd heddiw}}",
"article-about-title": "Ynglŷn â'r erthygl hon",
"page-issues": "Trafferthion gyda'r dudalen hon",
"license-footer-name": "CC BY-SA 3.0",
"license-footer-text": "Mae'r cynnwys ar gael dan $1 oni noder yn wahanol.",
"page-read-in-other-languages": "Ar gael mewn {{PLURAL:$1|$1 iaith|iaith}} arall",
"article-edit-button": "Adran golygu",
"article-edit-protected-button": "Adran golygu tudalen wedi'i chloi",
"article-section-expand": "Ehangu'r adran",
"article-section-collapse": "Lleihau'r adran",
"table-expand": "Ehangu'r tabl",
"table-collapse": "Lleihau'r tabl",
"references-preview-header": "Rhagweld ffynonellau"
}
16 changes: 13 additions & 3 deletions i18n/de.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"@metadata": {
"authors": []
"authors": [
"ManuelFranz"
]
},
"description-add-link-title": "Titelbeschreibung hinzufügen",
"description-add-link-title": "Artikelbeschreibung hinzufügen",
"article-read-more-title": "Mehr lesen",
"table-title-other": "Weitere Informationen",
"page-edit-history": "Vollständige Versionsgeschichte",
"info-box-close-text": "Schließen",
"page-talk-page-subtitle": "Diskutieren Sie Verbesserungen zu diesem Artikel",
"page-talk-page": "Diskussionsseite ansehen",
"info-box-title": "Schnelle Fakten",
"view-in-browser-footer-link": "Artikel im Browser ansehen",
Expand All @@ -17,5 +20,12 @@
"page-issues": "Seitenprobleme",
"license-footer-name": "CC-BY-SA 3.0",
"license-footer-text": "Der Inhalt ist verfügbar unter $1, sofern nicht anders angegeben.",
"page-read-in-other-languages": "In {{PLURAL:$1|einer weiteren Sprache|$1 weiteren Sprachen}} verfügbar"
"page-read-in-other-languages": "In {{PLURAL:$1|einer weiteren Sprache|$1 weiteren Sprachen}} verfügbar",
"article-edit-button": "Abschnitt bearbeiten",
"article-edit-protected-button": "Abschnitt auf der geschützten Seite bearbeiten",
"article-section-expand": "Abschnitt erweitern",
"article-section-collapse": "Abschnitt einklappen",
"table-expand": "Tabelle erweitern",
"table-collapse": "Tabelle einklappen",
"references-preview-header": "Vorschau von Einzelnachweisen"
}
11 changes: 6 additions & 5 deletions i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@
"@metadata": {
"authors": [
"Gomoko",
"Verdy p",
"Wladek92"
]
},
"description-add-link-title": "Ajouter la description de l'article",
"description-add-link-title": "Ajouter la description de larticle",
"article-read-more-title": "En savoir plus",
"table-title-other": "Plus d’informations",
"page-edit-history": "Voir l'historique des modifications",
"page-edit-history": "Voir lhistorique des modifications",
"info-box-close-text": "Fermer",
"page-talk-page-subtitle": "Discuter des améliorations à cet article",
"page-issues-subtitle": "Alertes sur un contenu trop moyen ou problématique",
"page-issues-subtitle": "Alertes sur un contenu de basse qualité ou problématique",
"page-talk-page": "Afficher la page de discussion",
"info-box-title": "Faits en bref",
"view-in-browser-footer-link": "Afficher l’article dans le navigateur",
"page-location": "Afficher sur une carte",
"page-similar-titles": "Pages similaires",
"page-last-edited": "Mis à jour {{PLURAL:$1|0=aujourd’hui|1=hier|il y a $1 jours}}",
"page-last-edited": "Mis à jour {{PLURAL:$1|hier|il y a $1 jours|0=aujourd’hui}}",
"article-about-title": "À propos de cet article",
"page-issues": "Problèmes de page",
"license-footer-name": "CC BY-SA 3.0",
"license-footer-text": "Le contenu est disponible sous $1 sauf spécification contraire.",
"license-footer-text": "Le contenu est disponible sous $1 sauf mention contraire.",
"page-read-in-other-languages": "Disponible dans $1 autre{{PLURAL:$1||s}} langue{{PLURAL:$1||s}}",
"article-edit-button": "Modifier la section",
"article-edit-protected-button": "Modifier la section sur la page protégée",
Expand Down
32 changes: 32 additions & 0 deletions i18n/fy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"@metadata": {
"authors": [
"PiefPafPier"
]
},
"description-add-link-title": "Artikelbeskriuwing tafoegje",
"article-read-more-title": "Mear lêze",
"table-title-other": "Mear ynformaasje",
"page-edit-history": "Bewurkingsskiednis besjen",
"info-box-close-text": "Slute",
"page-talk-page-subtitle": "Ferbetterings oan dit artikel beprate",
"page-issues-subtitle": "Sinjalearing fan suboptimale of probleemynhâld",
"page-talk-page": "Oerlisside besjen",
"info-box-title": "Fluch de feiten",
"view-in-browser-footer-link": "Artikel yn webblêder besjen",
"page-location": "Op 'e kaart besjen",
"page-similar-titles": "Besibbe siden",
"page-last-edited": "{{PLURAL:$1|Juster bywurke|$1 dagen lyn bywurke|0=Hjoed bywurke}}",
"article-about-title": "Oer dit artikel",
"page-issues": "Sideproblemen",
"license-footer-name": "CC BY-SA 3.0",
"license-footer-text": "Ynhâld is beskikber ûnder $1, at net oars neamd wurdt.",
"page-read-in-other-languages": "Beskikber yn {{PLURAL:$1|$1 oare taal|$1 oare talen}}",
"article-edit-button": "Dielside bewurkje",
"article-edit-protected-button": "Befeilige dielside bewurkje",
"article-section-expand": "Dielside útklappe",
"article-section-collapse": "Dielside ynklappe",
"table-expand": "Tabel útklappe",
"table-collapse": "Tabel ynklappe",
"references-preview-header": "Proefbyld fan 'e referinsjes"
}
15 changes: 12 additions & 3 deletions i18n/gl.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"@metadata": {
"authors": []
"authors": [
"Maria zaos"
]
},
"description-add-link-title": "Engadir unha descrición de título",
"description-add-link-title": "Engadir unha descrición do artigo",
"article-read-more-title": "Ler máis",
"table-title-other": "Máis información",
"page-edit-history": "Historial de edición completo",
Expand All @@ -17,5 +19,12 @@
"page-issues": "Problemas na páxina",
"license-footer-name": "CC BY-SA 3.0",
"license-footer-text": "O contido está dispoñible baixo a $1, salvo que se indique o contrario.",
"page-read-in-other-languages": "Dispoñible {{PLURAL:$1|noutra lingua|noutras $1 linguas}}"
"page-read-in-other-languages": "Dispoñible {{PLURAL:$1|noutra lingua|noutras $1 linguas}}",
"article-edit-button": "Editar a sección",
"article-edit-protected-button": "Editar unha sección nunha páxina protexida",
"article-section-expand": "Expandir a sección",
"article-section-collapse": "Contraer a sección",
"table-expand": "Expandir a táboa",
"table-collapse": "Contraer a táboa",
"references-preview-header": "Previsualización de referencias"
}
2 changes: 1 addition & 1 deletion i18n/he.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"דגש חזק"
]
},
"description-add-link-title": "הוספת תיאור כותרת",
"description-add-link-title": "הוספת תיאור ערך",
"article-read-more-title": "לקרוא עוד",
"table-title-other": "מידע נוסף",
"page-edit-history": "הצגת היסטוריית עריכה מלאה",
Expand Down
2 changes: 2 additions & 0 deletions i18n/hy.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
"Kareyac"
]
},
"description-add-link-title": "Ավելացնել հոդվածի նկարագրություն",
"article-read-more-title": "Կարդալ ավելին",
"table-title-other": "Մանրամասն տեղեկատվություն",
"page-edit-history": "Դիտել խմբագրումների պատմությունը",
"info-box-close-text": "Փակել",
"info-box-title": "Արագ փաստեր",
"page-location": "Դիտել քարտեզի վրա",
Expand Down
17 changes: 14 additions & 3 deletions i18n/id.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
{
"@metadata": {
"authors": []
"authors": [
"Daud I.F. Argana"
]
},
"description-add-link-title": "Tambah deskripsi judul",
"description-add-link-title": "Tambah deskripsi artikel",
"article-read-more-title": "Baca lebih lanjut",
"table-title-other": "Informasi lebih lanjut",
"page-edit-history": "Semua riwayat suntingan",
"info-box-close-text": "Tutup",
"page-talk-page-subtitle": "Diskusikan perbaikan untuk artikel ini",
"page-issues-subtitle": "Peringatan tentang konten yang berkualitas rendah atau bermasalah",
"page-talk-page": "Lihat halaman pembicaraan",
"info-box-title": "Fakta Singkat",
"view-in-browser-footer-link": "Lihat artikel di peramban",
Expand All @@ -17,5 +21,12 @@
"page-issues": "Masalah halaman",
"license-footer-name": "CC BY-SA 3.0",
"license-footer-text": "Konten tersedia di bawah $1 kecuali dinyatakan lain.",
"page-read-in-other-languages": "Tersedia dalam {{PLURAL:$1|$1 bahasa lain|$1 bahasa lain}}"
"page-read-in-other-languages": "Tersedia dalam {{PLURAL:$1|$1 bahasa lain|$1 bahasa lain}}",
"article-edit-button": "Sunting bagian",
"article-edit-protected-button": "Sunting bagian di halaman yang dilindungi",
"article-section-expand": "Kembangkan bagian",
"article-section-collapse": "Ciutkan bagian",
"table-expand": "Kembangkan tabel",
"table-collapse": "Ciutkan tabel",
"references-preview-header": "Pratayang referensi"
}
Loading

0 comments on commit 3661785

Please sign in to comment.