From 03f01e242c72233923cea3d6d5ab4b55cced2953 Mon Sep 17 00:00:00 2001 From: Isarra Date: Wed, 12 Sep 2018 21:37:05 +0000 Subject: [PATCH] Use default search placeholder The custom one as-is is never going to actually be accurate due to caching, with an implementation that was basically just a bad joke. A more thoughtful implementation with rounding and stuff per the winter prototype is probably in order, but that will require a different implementation anyway (T182345)... bug: T160647 Change-Id: Id2776d69a7d42b9907b4363977134fea48dc2440 --- i18n/en.json | 1 - i18n/qqq.json | 1 - includes/TimelessTemplate.php | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/i18n/en.json b/i18n/en.json index c75768d..fd2df3e 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -4,7 +4,6 @@ }, "skinname-timeless": "Timeless", "timeless-desc": "A timeless skin designed after the Winter prototype by Brandon Harris, and various styles by the Wikimedia Foundation", - "timeless-search-placeholder": "Search {{NUMBEROFARTICLES}} pages", "timeless-loggedin": "Your account", "timeless-anonymous": "Anonymous", "timeless-loggedinas": "Logged in as '''$1'''", diff --git a/i18n/qqq.json b/i18n/qqq.json index 7473f97..ce6cf51 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -11,7 +11,6 @@ }, "skinname-timeless": "{{name}}", "timeless-desc": "{{desc|what=skin|name=Timeless|url=https://www.mediawiki.org/wiki/Skin:Timeless}}", - "timeless-search-placeholder": "Main search input placeholder text. Feel free to use {{PLURAL:{{NUMBEROFARTICLES}}|page|pages}}.", "timeless-loggedin": "Label for logged in users' user menu (if their username is too long to fit)", "timeless-anonymous": "Label for anonymous (not logged in) user menu\n{{Identical|Anonymous}}", "timeless-loggedinas": "Note for personal menu for logged in users noting their current username\n\nParameters:\n* $1 - username", diff --git a/includes/TimelessTemplate.php b/includes/TimelessTemplate.php index 6f6a600..151f900 100644 --- a/includes/TimelessTemplate.php +++ b/includes/TimelessTemplate.php @@ -322,8 +322,7 @@ class TimelessTemplate extends BaseTemplate { Html::rawElement( 'div', [ 'id' => 'simpleSearch' ], Html::rawElement( 'div', [ 'id' => 'searchInput-container' ], $this->makeSearchInput( [ - 'id' => 'searchInput', - 'placeholder' => $this->getMsg( 'timeless-search-placeholder' )->text(), + 'id' => 'searchInput' ] ) ) . Html::hidden( 'title', $this->get( 'searchtitle' ) ) .