Hello Chad, Niedzielski, jenkins-bot, Siebrand, Jdlrobson, I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/365183 to review the following change. Change subject: Revert "Fixups prior to Minerva/MobileFrontend separation" ...................................................................... Revert "Fixups prior to Minerva/MobileFrontend separation" This reverts commit 85b56aa6e4ed4e89e7996f849e205f1028a7919c. Change-Id: I1e544177b7f34493d312ac633ca708ef023a4b7a --- M extension.json M i18n/en.json M i18n/qqq.json M jsduck.json M resources/skins.minerva.talk/init.js 5 files changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/83/365183/1 diff --git a/extension.json b/extension.json index c9201fc..2186a1d 100644 --- a/extension.json +++ b/extension.json @@ -504,17 +504,11 @@ "mobile-frontend-overlay-continue", "mobile-frontend-last-modified-with-user-seconds", "mobile-frontend-last-modified-with-user-minutes", + "mobile-frontend-last-modified-with-user-hours", "mobile-frontend-last-modified-with-user-days", "mobile-frontend-last-modified-with-user-months", "mobile-frontend-last-modified-with-user-years", "mobile-frontend-last-modified-with-user-just-now", - "mobile-frontend-joined-just-now", - "mobile-frontend-joined-seconds", - "mobile-frontend-joined-minutes", - "mobile-frontend-joined-hours", - "mobile-frontend-joined-days", - "mobile-frontend-joined-months", - "mobile-frontend-joined-years", "mobile-frontend-loading-message", "mobile-frontend-editor-licensing", "mobile-frontend-editor-licensing-with-terms", @@ -914,6 +908,7 @@ "desktop" ], "dependencies": [ + "skins.minerva.icons.images.variants", "mobile.startup" ], "styles": [ @@ -1363,6 +1358,20 @@ "mobile-frontend-meta-data-issues-header", "mobile-frontend-meta-data-issues-header-talk", "mobile-frontend-languages-not-available", + "mobile-frontend-last-modified-with-user-seconds", + "mobile-frontend-last-modified-with-user-minutes", + "mobile-frontend-last-modified-with-user-hours", + "mobile-frontend-last-modified-with-user-days", + "mobile-frontend-last-modified-with-user-months", + "mobile-frontend-last-modified-with-user-years", + "mobile-frontend-last-modified-with-user-just-now", + "mobile-frontend-joined-just-now", + "mobile-frontend-joined-seconds", + "mobile-frontend-joined-minutes", + "mobile-frontend-joined-hours", + "mobile-frontend-joined-days", + "mobile-frontend-joined-months", + "mobile-frontend-joined-years", "mobile-frontend-cookies-required", "mobile-frontend-console-recruit", "mobile-frontend-redirected-from" @@ -1510,14 +1519,13 @@ "resources/skins.minerva.talk/init.js" ], "messages": [ - "minerva-talk-add-topic" + "mobile-frontend-talk-add-overlay-submit" ] }, "skins.minerva.toggling": { "class": "MFResourceLoaderParsedMessageModule", "dependencies": [ "mobile.toggle", - "skins.minerva.icons.images.variants", "skins.minerva.scripts" ], "scripts": [ @@ -1536,6 +1544,14 @@ ], "scripts": [ "resources/skins.minerva.watchstar/init.js" + ], + "messages": [ + "watchthispage", + "unwatchthispage", + "mobile-frontend-watchlist-add", + "mobile-frontend-watchlist-removed", + "mobile-frontend-watchlist-cta", + "mobile-frontend-watchlist-please-wait" ] }, "skins.minerva.fontchanger": { diff --git a/i18n/en.json b/i18n/en.json index 189d6d5..37469f9 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -236,7 +236,6 @@ "mobile-frontend-talk-add-overlay-content-placeholder": "What is on your mind?", "mobile-frontend-talk-add-overlay-subject-placeholder": "Subject", "mobile-frontend-talk-add-overlay-submit": "Add discussion", - "minerva-talk-add-topic": "Add discussion", "mobile-frontend-talk-back-to-page": "Return to \"$1\" page.", "mobile-frontend-talk-back-to-userpage": "Return to the user page of \"{{GENDER:$1|$1}}\".", "mobile-frontend-talk-back-to-projectpage": "Return to the project page \"$1\".", diff --git a/i18n/qqq.json b/i18n/qqq.json index 4a2fa1d..056758d 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -237,7 +237,6 @@ "mobile-frontend-talk-add-overlay-content-placeholder": "Placeholder text to prompt user to add content to talk page content", "mobile-frontend-talk-add-overlay-subject-placeholder": "Placeholder text to prompt user to add a new talk page topic subject. This corresponds to {{msg-mw|subject}} in desktop MediaWiki.\n{{Identical|Subject}}", "mobile-frontend-talk-add-overlay-submit": "Label for button which submits a new talk page topic", - "minerva-talk-add-topic": "Label for button which shows at bottom of talk pages in mobile view prompting addition of topic", "mobile-frontend-talk-back-to-page": "Used as generic label for link from talk page to subject page. Parameters:\n* $1 - page title", "mobile-frontend-talk-back-to-userpage": "Used as label for link from user talk page to user page. Parameters:\n* $1 - username", "mobile-frontend-talk-back-to-projectpage": "Used as label for link from project talk page to project page. Parameters:\n* $1 - page title", diff --git a/jsduck.json b/jsduck.json index 8e7de6c..aa84a93 100644 --- a/jsduck.json +++ b/jsduck.json @@ -15,7 +15,6 @@ "jqXHR", "File", "Router", - "MainMenu", "mw.user", "mw.Api", "mw.ForeignApi", diff --git a/resources/skins.minerva.talk/init.js b/resources/skins.minerva.talk/init.js index 7d8c1d7..3c310b4 100644 --- a/resources/skins.minerva.talk/init.js +++ b/resources/skins.minerva.talk/init.js @@ -76,7 +76,7 @@ ( page.inNamespace( 'talk' ) || page.inNamespace( 'user_talk' ) ) ) { new Button( { - label: mw.msg( 'minerva-talk-add-topic' ), + label: mw.msg( 'mobile-frontend-talk-add-overlay-submit' ), href: '#/talk/new', progressive: true } ).prependTo( '#content #bodyContent' ); -- To view, visit https://gerrit.wikimedia.org/r/365183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e544177b7f34493d312ac633ca708ef023a4b7a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: wmf/1.30.0-wmf.7 Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits