From e1c3fb68e4a2d17df73b95b69794bf287e400653 Mon Sep 17 00:00:00 2001 From: Translation updater bot Date: Tue, 16 Oct 2018 22:00:23 +0200 Subject: [PATCH 1/9] Localisation updates from https://translatewiki.net. Change-Id: I18a69fe74d743746674da1833c79cfd60dba7698 --- i18n/ru.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/i18n/ru.json b/i18n/ru.json index f975652..26d1d20 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -21,6 +21,8 @@ "mobile-frontend-editor-disabled": "Эта страница защищена ради предотвращения вандализма.", "mobile-frontend-editor-edit": "Править", "minerva-download": "Скачать", + "skin-minerva-share": "Поделиться", + "skin-minerva-mobile-option-MinervaShareButton": "Поделиться", "mobile-frontend-editor-redlink-create": "Создать страницу", "mobile-frontend-editor-redlink-explain": "Эта страница ещё не была создана.", "mobile-frontend-editor-redlink-leave": "Нет, спасибо.", From 4496292268abea4b3c9b60057f989f2b0b5f7189 Mon Sep 17 00:00:00 2001 From: Volker E Date: Sat, 13 Oct 2018 11:55:34 -0700 Subject: [PATCH 2/9] Hygiene: Remove 'blockquotes.less' in print and screen There's no reason to have this as separate style file in content.styles as common text styles are taken care of in 'text.less' and 'print/articles.less' for print. Moving contents rule there. Change-Id: Ie613d95488e9b5a814b6be8f0c856e9e92ab5aed --- minerva.less/minerva.variables.less | 2 +- .../print/article.less | 6 ++++++ .../print/blockquotes.less | 5 ----- .../print/styles.less | 1 - .../blockquotes.less | 20 ------------------- .../skins.minerva.content.styles/styles.less | 1 - .../skins.minerva.content.styles/text.less | 13 ++++++++++-- 7 files changed, 18 insertions(+), 30 deletions(-) delete mode 100644 resources/skins.minerva.base.styles/print/blockquotes.less delete mode 100644 resources/skins.minerva.content.styles/blockquotes.less diff --git a/minerva.less/minerva.variables.less b/minerva.less/minerva.variables.less index 7360d45..4ad5bfa 100644 --- a/minerva.less/minerva.variables.less +++ b/minerva.less/minerva.variables.less @@ -74,7 +74,7 @@ @headingMargin: 0.5em; @sectionIconWidth: 30px; -// blockquotes +// blockquote @blockquotePaddingRight: 25px; @blockquotePaddingLeft: 30px; diff --git a/resources/skins.minerva.base.styles/print/article.less b/resources/skins.minerva.base.styles/print/article.less index 9b96ef3..a616889 100644 --- a/resources/skins.minerva.base.styles/print/article.less +++ b/resources/skins.minerva.base.styles/print/article.less @@ -86,6 +86,12 @@ color: @colorGray2; } + blockquote { + color: @colorGray5; + padding: 5px 39px; + font-style: italic; + } + .section-heading { border-bottom: 0; padding-bottom: 0; diff --git a/resources/skins.minerva.base.styles/print/blockquotes.less b/resources/skins.minerva.base.styles/print/blockquotes.less deleted file mode 100644 index 842d6e4..0000000 --- a/resources/skins.minerva.base.styles/print/blockquotes.less +++ /dev/null @@ -1,5 +0,0 @@ -blockquote { - color: @colorGray5; - font-style: italic; - padding: 5px 39px; -} diff --git a/resources/skins.minerva.base.styles/print/styles.less b/resources/skins.minerva.base.styles/print/styles.less index 28874ff..3580ee5 100644 --- a/resources/skins.minerva.base.styles/print/styles.less +++ b/resources/skins.minerva.base.styles/print/styles.less @@ -43,7 +43,6 @@ @import 'header.less'; @import 'article.less'; - @import 'blockquotes.less'; @import 'references.less'; @import 'footer.less'; } diff --git a/resources/skins.minerva.content.styles/blockquotes.less b/resources/skins.minerva.content.styles/blockquotes.less deleted file mode 100644 index a4024b8..0000000 --- a/resources/skins.minerva.content.styles/blockquotes.less +++ /dev/null @@ -1,20 +0,0 @@ -// Blockquotes -// -// Use the blockquote tag for quoted text. -// -// Markup: -//
In the end, it's not the years in your life that count. It's the life in your years.
-// -// Styleguide 1.8. -@import 'mediawiki.mixins.less'; -@import '../../minerva.less/minerva.variables'; -@import '../../minerva.less/minerva.mixins'; - -blockquote { - border-left: 3px solid @colorGray12; - font-family: @fontFamilyHeading; - font-size: 1.1em; - padding: 1em @blockquotePaddingRight 1em @blockquotePaddingLeft; - position: relative; - overflow: hidden; -} diff --git a/resources/skins.minerva.content.styles/styles.less b/resources/skins.minerva.content.styles/styles.less index 705eb66..447227d 100644 --- a/resources/skins.minerva.content.styles/styles.less +++ b/resources/skins.minerva.content.styles/styles.less @@ -2,7 +2,6 @@ @import 'thumbnails.less'; @import 'images.less'; @import 'headings.less'; -@import 'blockquotes.less'; @import 'lists.less'; @import 'links.less'; @import 'text.less'; diff --git a/resources/skins.minerva.content.styles/text.less b/resources/skins.minerva.content.styles/text.less index 435b64a..d78e5ce 100644 --- a/resources/skins.minerva.content.styles/text.less +++ b/resources/skins.minerva.content.styles/text.less @@ -52,11 +52,20 @@ } } -strong, -b { +b, +strong { font-weight: bold; } +blockquote { + border-left: 3px solid @colorGray12; + font-family: @fontFamilyHeading; + font-size: 1.1em; + padding: 1em @blockquotePaddingRight 1em @blockquotePaddingLeft; + position: relative; + overflow: hidden; +} + em, i { font-style: italic; From 576c7b38a751121a4de81802d657a30b607b34fa Mon Sep 17 00:00:00 2001 From: Volker E Date: Wed, 17 Oct 2018 13:11:53 -0700 Subject: [PATCH 3/9] Update 'edit' icon to standard Bug: T207190 Change-Id: Iffaff60f213ad037f826c960da1d876fb923916a --- resources/skins.minerva.icons.images/edit.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/skins.minerva.icons.images/edit.svg b/resources/skins.minerva.icons.images/edit.svg index b9bca20..fc29e93 100644 --- a/resources/skins.minerva.icons.images/edit.svg +++ b/resources/skins.minerva.icons.images/edit.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 2c66aaed3fb4070a82d39b7ff955064b673a5435 Mon Sep 17 00:00:00 2001 From: Translation updater bot Date: Wed, 17 Oct 2018 23:24:07 +0200 Subject: [PATCH 4/9] Localisation updates from https://translatewiki.net. Change-Id: I86b416de3c968e96cb3f6e23cb5e81fb06dbc834 --- i18n/lv.json | 3 +++ i18n/tr.json | 2 ++ 2 files changed, 5 insertions(+) diff --git a/i18n/lv.json b/i18n/lv.json index 73ae9ec..9f09134 100644 --- a/i18n/lv.json +++ b/i18n/lv.json @@ -9,6 +9,9 @@ "mobile-frontend-editor-disabled": "Šī lapa ir aizsargāta, lai novērstu vandalismu.", "mobile-frontend-editor-edit": "Labot", "minerva-download": "Lejupielādēt", + "skin-minerva-share": "Dalīties", + "skin-minerva-mobile-option-MinervaShareButton": "Dalīties", + "skin-minerva-mobile-option-MinervaShareButton-description": "Dalīties", "mobile-frontend-editor-redlink-create": "Izveidot lapu", "mobile-frontend-editor-redlink-leave": "Nē, paldies.", "mobile-frontend-history": "Apskatīt šīs lapas labojumu vēsturi", diff --git a/i18n/tr.json b/i18n/tr.json index b42b8fe..672f80d 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -19,6 +19,8 @@ "mobile-frontend-editor-disabled": "Bu sayfa vandalizmi önlemek için korunmaktadır.", "mobile-frontend-editor-edit": "Düzenle", "minerva-download": "İndir", + "skin-minerva-share": "Paylaş", + "skin-minerva-mobile-option-MinervaShareButton": "Paylaş", "mobile-frontend-editor-redlink-create": "Sayfayı oluştur", "mobile-frontend-editor-redlink-explain": "Bu sayfa henüz oluşturulmadı.", "mobile-frontend-editor-redlink-leave": "Hayır, teşekkürler.", From 133e806865f0d0254589b1141965928aca519b08 Mon Sep 17 00:00:00 2001 From: Fomafix Date: Mon, 23 Jul 2018 22:12:42 +0200 Subject: [PATCH 5/9] Force type Language for $lang of doEditSectionLink Also make the parameter $tooltip mandatory to ensure that a mandatory parameter does follow an optional parameter. ParserOutput always fill all parameters of doEditSectionLink. Bug: T207413 Depends-On: Ic49d76c7d9357f99b462471696f7e1eb86e70e3d Change-Id: I49c1e3fb7bf72002c7f498d4afe14a06caf411f8 --- includes/skins/SkinMinerva.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index 207ac24..9f21c02 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -266,10 +266,10 @@ class SkinMinerva extends SkinTemplate { * @param Title $nt * @param string $section * @param string|null $tooltip - * @param string|bool $lang + * @param Language $lang * @return string */ - public function doEditSectionLink( Title $nt, $section, $tooltip = null, $lang = false ) { + public function doEditSectionLink( Title $nt, $section, $tooltip, Language $lang ) { if ( $this->isAllowedPageAction( 'edit' ) ) { $message = $this->msg( 'mobile-frontend-editor-edit' )->inLanguage( $lang )->text(); $html = Html::openElement( 'span', [ 'class' => 'mw-editsection' ] ); From 1c034f1d73c4ad27b0b10144717a5ad9812cdc0f Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Fri, 19 Oct 2018 10:51:44 -0700 Subject: [PATCH 6/9] Fix watch star browser test In I06ef42cb1461fde7ca0aa903f174c3b1f39ab154 a button became an a tag and somehow that got through the Jenkins censors. With this change Jenkins on Minerva will be happy again Bug: T207480 Change-Id: I3faedb10e46c3e3e237f5b90d71ffe20606fce6d --- tests/browser/features/support/pages/article_page.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/browser/features/support/pages/article_page.rb b/tests/browser/features/support/pages/article_page.rb index b2d5a23..3e83912 100644 --- a/tests/browser/features/support/pages/article_page.rb +++ b/tests/browser/features/support/pages/article_page.rb @@ -55,8 +55,8 @@ class ArticlePage end ## watch star - button(:watch_star, text: 'Watch this page') - button(:unwatch_star, text: 'Stop watching') + a(:watch_star, text: 'Watch this page') + a(:unwatch_star, text: 'Stop watching') button(:watch_confirm, class: 'mw-htmlform-submit') # search From d95680f73ff78cdb45e7b28a6b87acf9749b1f30 Mon Sep 17 00:00:00 2001 From: Translation updater bot Date: Sat, 20 Oct 2018 22:19:25 +0200 Subject: [PATCH 7/9] Localisation updates from https://translatewiki.net. Change-Id: Ia03f49c5aacb3636111ef960c6ce20a303888502 --- i18n/da.json | 2 ++ i18n/kjp.json | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 i18n/kjp.json diff --git a/i18n/da.json b/i18n/da.json index b5f6c60..7f6bc4a 100644 --- a/i18n/da.json +++ b/i18n/da.json @@ -16,6 +16,8 @@ "mobile-frontend-editor-disabled": "Denne side er beskyttet for at forhindre hærværk.", "mobile-frontend-editor-edit": "Rediger", "minerva-download": "Hent", + "skin-minerva-share": "Del", + "skin-minerva-mobile-option-MinervaShareButton": "Del", "mobile-frontend-editor-redlink-create": "Opret side", "mobile-frontend-editor-redlink-explain": "Denne side er endnu ikke blevet oprettet.", "mobile-frontend-editor-redlink-leave": "Nej, tak.", diff --git a/i18n/kjp.json b/i18n/kjp.json new file mode 100644 index 0000000..8969221 --- /dev/null +++ b/i18n/kjp.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Rul1902" + ] + }, + "skin-minerva-share": "အင်းၮင်ႋဖ်ုရီ့", + "skin-minerva-mobile-option-MinervaShareButton": "အင်းၮင်ႋဖ်ုရီ့" +} From 088faeaf083e019ed0825d7f8eda2ee91b1de038 Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Thu, 18 Oct 2018 14:48:16 -0700 Subject: [PATCH 8/9] WikimediaEvents hook was renamed Depends-On: I1af710c1211131b3936bfa8582ead8f9c0dab77b Bug: T207423 Change-Id: Ib267a0b944c68f00e21cd733a68abf12667339cd --- resources/skins.minerva.scripts/pageIssuesLogger.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/skins.minerva.scripts/pageIssuesLogger.js b/resources/skins.minerva.scripts/pageIssuesLogger.js index 51accb0..9756963 100644 --- a/resources/skins.minerva.scripts/pageIssuesLogger.js +++ b/resources/skins.minerva.scripts/pageIssuesLogger.js @@ -49,9 +49,12 @@ function ( sectionStr ) { return parseInt( sectionStr, 10 ); } ); + // For backwards compatibility with cached WikimediaEvents code + // (remove me in a weeks time!! T207423) + mwTrack( 'wikimedia.event.ReadingDepthSchema.enable', bucketToGroup( newTreatmentEnabled ) ); // Log readingDepth schema.(ReadingDepth is guarded against multiple enables). // See https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/WikimediaEvents/+/437686/ - mwTrack( 'wikimedia.event.ReadingDepthSchema.enable', bucketToGroup( newTreatmentEnabled ) ); + mwTrack( 'wikimedia.ReadingDepthSchema.enable', bucketToGroup( newTreatmentEnabled ) ); // Log PageIssues schema. mwTrack( 'wikimedia.event.PageIssues', mixedData ); } ); From 5e7d7e918fbb3667f2082a345daedad8b8a14859 Mon Sep 17 00:00:00 2001 From: Translation updater bot Date: Mon, 22 Oct 2018 22:00:32 +0200 Subject: [PATCH 9/9] Localisation updates from https://translatewiki.net. Change-Id: Ic3b7bc3222ca682f744550e18be9f0f077199f46 --- i18n/sv.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/i18n/sv.json b/i18n/sv.json index 13c68d1..b992f07 100644 --- a/i18n/sv.json +++ b/i18n/sv.json @@ -14,6 +14,9 @@ "mobile-frontend-editor-disabled": "Denna sida är skyddad för att förhindra vandalism.", "mobile-frontend-editor-edit": "Redigera", "minerva-download": "Ladda ned", + "skin-minerva-share": "Dela", + "skin-minerva-mobile-option-MinervaShareButton": "Dela", + "skin-minerva-mobile-option-MinervaShareButton-description": "Dela nuvarande artikel via webbläsarens delningsfunktion (endast webbläsare som stöds)", "mobile-frontend-editor-redlink-create": "Skapa sida", "mobile-frontend-editor-redlink-explain": "Denna sida har ännu inte skapats.", "mobile-frontend-editor-redlink-leave": "Nej tack.",