diff --git a/i18n/en.json b/i18n/en.json
index 9eef776..4c61b7c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,7 +5,6 @@
"minerva-last-modified-date": "Last edited on $1, at $2",
"minerva-talk-add-topic": "Add discussion",
"mobile-frontend-cookies-required": "Cookies are required to switch view modes. Please enable them and try again.",
- "mobile-frontend-editor-blocked-info-loggedin": "Your account is blocked from editing. The block was made by {{GENDER:$2|$2}} for the following reason: $1",
"mobile-frontend-editor-cta": "Help improve this page!",
"minerva-pointer-dismiss": "Dismiss",
"mobile-frontend-editor-disabled": "This page is protected to prevent vandalism.",
@@ -61,9 +60,5 @@
"skin-minerva-mobile-option-MinervaShowCategoriesButton": "Categories",
"skin-minerva-mobile-option-MinervaShowCategoriesButton-description": "View categories of pages",
"skin-minerva-mobile-option-MinervaEnableBackToTop": "Jump to top",
- "skin-minerva-mobile-option-MinervaEnableBackToTop-description": "Jump to top of the current page using a floating button",
- "skin-minerva-blocked-drawer-title": "Your account has been blocked from editing {{SITENAME}}",
- "skin-minerva-blocked-drawer-reason-header": "Reason for the block",
- "skin-minerva-blocked-drawer-creator-header": "{{GENDER:$1|Blocked}} by",
- "skin-minerva-blocked-drawer-expiry-header": "Block will expire in"
+ "skin-minerva-mobile-option-MinervaEnableBackToTop-description": "Jump to top of the current page using a floating button"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9766b70..50bda07 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -14,7 +14,6 @@
"minerva-last-modified-date": "Text that displays the date the page was last modified. Parameters:\n* $1 - date\n* $2 - time\n{{Related|Mobile-frontend-last-modified}}",
"minerva-talk-add-topic": "Label for button which shows at bottom of talk pages in mobile view prompting addition of topic",
"mobile-frontend-cookies-required": "Error message shown when user attempts to switch site modes and cookies are not enabled.",
- "mobile-frontend-editor-blocked-info-loggedin": "Toast message for logged in users that appears (before the user see the editor) when a user tries to edit a page, but is blocked from editing with reason and blocked by information.\n\nParameters:\n* $1 - blocked by information (Username of the user who crated this block)\n* $2 - Reason for this block, if any",
"mobile-frontend-editor-cta": "Caption for call to action when an anonymous user clicks on edit icon. (Note the mobile site currently doesn't allow anonymous editing.)\n{{Identical|Help improve this page}}",
"minerva-pointer-dismiss": "Label of button that dismisses overlay pointing at a particular new feature.",
"mobile-frontend-editor-disabled": "Toast message that appears when a user is unable to edit a page and clicks edit icon.",
@@ -70,9 +69,5 @@
"skin-minerva-mobile-option-MinervaShowCategoriesButton": "Label for categories mobile web beta feature.\n{{Identical|Category}}",
"skin-minerva-mobile-option-MinervaShowCategoriesButton-description": "Description label for categories mobile web beta feature.",
"skin-minerva-mobile-option-MinervaEnableBackToTop": "Label for jump to top mobile web beta feature",
- "skin-minerva-mobile-option-MinervaEnableBackToTop-description": "Description label for jump to top mobile web beta feature",
- "skin-minerva-blocked-drawer-title": "Title for the drawer that appears when a blocked user attempts to edit.",
- "skin-minerva-blocked-drawer-reason-header": "Header for the block reason message that appears when a blocked user attempts to edit.",
- "skin-minerva-blocked-drawer-creator-header": "Header for the block creator that appears when a blocked user attempts to edit. \nParameters:\n* $1 - user's gender",
- "skin-minerva-blocked-drawer-expiry-header": "Header for the block expiry that appears when a blocked user attempts to edit."
+ "skin-minerva-mobile-option-MinervaEnableBackToTop-description": "Description label for jump to top mobile web beta feature"
}
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 7465042..8d7c79d 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1272,45 +1272,7 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
];
if ( $this->isAuthenticatedUser() ) {
- $blockInfo = false;
- if ( $user->isBlockedFrom( $title, true ) ) {
- $block = $user->getBlock();
-
- $blockReason = $block->mReason ?
- Linker::formatComment( $block->mReason ) :
- false;
-
- $blockCreator = User::newFromName( $block->getByName() );
-
- $blockExpiry = null;
- $blockDuration = null;
- if ( !wfIsInfinity( $block->getExpiry() ) ) {
- $blockExpiry = $this->getLanguage()->translateBlockExpiry(
- $block->getExpiry(),
- $this->getUser(),
- time()
- );
- // Use the largest unit returned from Language::formatDuraiton() since
- // we do not need to display the level of percision that the method
- // returns.
- list( $blockDuration ) = explode(
- ', ',
- $this->getLanguage()->formatDuration( wfTimestamp( TS_UNIX, $block->getExpiry() ) - time() )
- );
- }
- $blockInfo = [
- 'creator' => [
- 'name' => $blockCreator->getName(),
- 'url' => $blockCreator->getUserPage()->getLinkURL(),
- 'gender' => $blockCreator->getOption( 'gender' ),
- ],
- 'expiry' => $blockExpiry,
- 'duration' => $blockDuration,
- // check, if a reason for this block is saved, otherwise use "no reason given" msg
- 'reason' => $blockReason,
- ];
- }
- $vars['wgMinervaUserBlockInfo'] = $blockInfo;
+ $vars['wgMinervaUserBlockInfo'] = $user->isBlockedFrom( $title, true );
}
return $vars;
diff --git a/resources/skins.minerva.editor/BlockMessage.hogan b/resources/skins.minerva.editor/BlockMessage.hogan
deleted file mode 100644
index ff52548..0000000
--- a/resources/skins.minerva.editor/BlockMessage.hogan
+++ /dev/null
@@ -1,34 +0,0 @@
-{{#collapseIcon}}{{>icon}}{{/collapseIcon}}
-