Ganeshaditya1 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62339
Change subject: Bug: 43680 added the MediaWiki logo as the default logo.
......................................................................
Bug: 43680 added the MediaWiki logo as the default logo.
Since the current default logo has a english message and provides little
scope for internationalization. This has been replaced with the default
MediaWiki logo.
In the options screen of the installer the administrator is notified that
if he chooses not to upload any logo the default will be used. The section
of the manual which helps the user change this logo later is also provided
using a info box.
Bug: 43680
Change-Id: I815d3236c60ce0f677615a932f36dad74de3519f
---
M includes/Setup.php
M includes/installer/Installer.i18n.php
M includes/installer/WebInstallerPage.php
3 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/39/62339/1
diff --git a/includes/Setup.php b/includes/Setup.php
index 08ab143..c68acca 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -72,7 +72,7 @@
if ( $wgStyleDirectory === false ) $wgStyleDirectory = "$IP/skins";
if ( $wgExtensionAssetsPath === false ) $wgExtensionAssetsPath =
"$wgScriptPath/extensions";
-if ( $wgLogo === false ) $wgLogo = "$wgStylePath/common/images/wiki.png";
+if ( $wgLogo === false ) $wgLogo = "$wgStylePath/common/images/mediawiki.png";
if ( $wgUploadPath === false ) $wgUploadPath = "$wgScriptPath/images";
if ( $wgUploadDirectory === false ) $wgUploadDirectory = "$IP/images";
diff --git a/includes/installer/Installer.i18n.php
b/includes/installer/Installer.i18n.php
index 9119312..ad6cd5e 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -551,6 +551,7 @@
'config-help' => 'help',
'config-nofile' => 'File "$1" could not be found. Has it been
deleted?',
'mainpagetext' => "'''MediaWiki has been successfully
installed.'''",
+ 'config-change-logo' => "You can change the logo by refering to the
[//www.mediawiki.org/wiki/Manual:FAQ#How_do_I_change_the_logo.3F manual]. Note
that the default Mediawiki logo will be used if the logo is not changed.",
'mainpagedocfooter' => "Consult the
[//meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using
the wiki software.
== Getting started ==
@@ -969,6 +970,7 @@
'mainpagetext' => 'Along with {{msg-mw|mainpagedocfooter}}, the text
you will see on the Main Page when your wiki is installed.',
'mainpagedocfooter' => 'Along with {{msg-mw|mainpagetext}}, the text
you will see on the Main Page when your wiki is installed.
This might be a good place to put information about
<nowiki>{{GRAMMAR:}}</nowiki>. See [[{{NAMESPACE}}:{{BASEPAGENAME}}/fi]] for an
example. For languages having grammatical distinctions and not having an
appropriate <nowiki>{{GRAMMAR:}}</nowiki> software available, a suggestion to
check and possibly amend the messages having <nowiki>{{SITENAME}}</nowiki> may
be valuable. See [[{{NAMESPACE}}:{{BASEPAGENAME}}/ksh]] for an example.',
+'config-change-logo' => 'Shown on the last page of installation to notify that
the default mediawiki logo will be used unless a new logo is uploaded. Also a
link is provided which informs the user on how to change the logo.',
);
/** Afrikaans (Afrikaans)
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index 3f3e50a..85c199f 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -935,8 +935,8 @@
);
// If we're using the default, let the user set it relative to
$wgScriptPath
$curLogo = $this->getVar( 'wgLogo' );
- $logoString = ( $curLogo ==
"/wiki/skins/common/images/wiki.png" ) ?
- '$wgStylePath/common/images/wiki.png' : $curLogo;
+ $logoString = ( $curLogo ==
"/wiki/skins/common/images/mediawiki.png" ) ?
+ '$wgStylePath/common/images/mediawiki.png' : $curLogo;
$uploadwrapperStyle = $this->getVar( 'wgEnableUploads' ) ? '' :
'display: none';
$this->addHTML(
--
To view, visit https://gerrit.wikimedia.org/r/62339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I815d3236c60ce0f677615a932f36dad74de3519f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ganeshaditya1 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
