Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365110 )
Change subject: Fixups prior to Minerva/MobileFrontend separation ...................................................................... Fixups prior to Minerva/MobileFrontend separation * Correct dependency tree - a MobileFrontend module should not depend on a Minerva module - move "skins.minerva.icons.images.variants" dependency to Minerva entry point * Update jsduck config so that MainMenu is a global (MainMenu will become an abstract concept and the code defined in Minerva) * Messages are defined twice inside mobile.startup and skins.minerva.scripts since the latter depends on the former, remove the messages from it * skins.minerva.watchstar should not double define watchstar messages that are already defined in mobile.watchstar module * skins.minerva.talk module should not reuse a message key meant for another purpose. Give it its own message. Change-Id: I598e9230fc27aae46d8d55c63fb18d5e4aedf939 (cherry picked from commit 30348b80395d99330fd1375c10200f9795671f0f) --- M extension.json M i18n/en.json M i18n/qqq.json M jsduck.json M resources/skins.minerva.talk/init.js 5 files changed, 13 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/10/365110/1 diff --git a/extension.json b/extension.json index 95c150e..77901e6 100644 --- a/extension.json +++ b/extension.json @@ -504,11 +504,17 @@ "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", @@ -908,7 +914,6 @@ "desktop" ], "dependencies": [ - "skins.minerva.icons.images.variants", "mobile.startup" ], "styles": [ @@ -1358,20 +1363,6 @@ "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" @@ -1519,13 +1510,14 @@ "resources/skins.minerva.talk/init.js" ], "messages": [ - "mobile-frontend-talk-add-overlay-submit" + "minerva-talk-add-topic" ] }, "skins.minerva.toggling": { "class": "MFResourceLoaderParsedMessageModule", "dependencies": [ "mobile.toggle", + "skins.minerva.icons.images.variants", "skins.minerva.scripts" ], "scripts": [ @@ -1544,14 +1536,6 @@ ], "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 37469f9..189d6d5 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -236,6 +236,7 @@ "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 056758d..4a2fa1d 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -237,6 +237,7 @@ "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 aa84a93..8e7de6c 100644 --- a/jsduck.json +++ b/jsduck.json @@ -15,6 +15,7 @@ "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 3c310b4..7d8c1d7 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( 'mobile-frontend-talk-add-overlay-submit' ), + label: mw.msg( 'minerva-talk-add-topic' ), href: '#/talk/new', progressive: true } ).prependTo( '#content #bodyContent' ); -- To view, visit https://gerrit.wikimedia.org/r/365110 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I598e9230fc27aae46d8d55c63fb18d5e4aedf939 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: wmf/1.30.0-wmf.9 Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits