From 786db07dded0ca30f3696127ec417edf6ff7a4b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Wed, 26 Oct 2005 15:45:30 +0000 Subject: [PATCH] * (bug 2324) image for redirects should be without text and oriented according to content language --- RELEASE-NOTES | 1 + includes/Article.php | 6 ++++-- languages/Language.php | 1 + skins/common/images/redirect.png | Bin 413 -> 0 bytes skins/common/images/redirectltr.png | Bin 0 -> 1023 bytes skins/common/images/redirectrtl.png | Bin 0 -> 1016 bytes 6 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 skins/common/images/redirect.png create mode 100644 skins/common/images/redirectltr.png create mode 100644 skins/common/images/redirectrtl.png diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 2cc8e166f6..3f3b241f0d 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -173,6 +173,7 @@ fully support the editing toolbar, but was found to be too confusing. * Sanitizer CSS comment processing order fix * Edit box now remembers scrollbar position on preview * (bug 3798) DoubleRedirects no longer has hard coded arrows +* (bug 2324) image for redirects should be without text and oriented according to content language === Caveats === diff --git a/includes/Article.php b/includes/Article.php index 51c2c9970a..35fb57be3c 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -671,7 +671,7 @@ class Article { * the given title. */ function view() { - global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgLang; + global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgLang, $wgContLang; global $wgLinkCache, $IP, $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol; global $wgEnotif, $wgParser, $wgParserCache, $wgUseTrackbacks; $sk = $wgUser->getSkin(); @@ -778,7 +778,9 @@ class Article { $wgOut->addHTML( '
'.htmlspecialchars($this->mContent)."\n
" ); } else if ( $rt = Title::newFromRedirect( $text ) ) { # Display redirect - $imageUrl = $wgStylePath.'/common/images/redirect.png'; + $imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr'; + $imageUrl = $wgStylePath.'/common/images/redirect' . $imageDir . '.png'; + $wgOut->setSubtitle( wfMsgHtml( 'redirectpagesub' ) ); $targetUrl = $rt->escapeLocalURL(); $titleText = htmlspecialchars( $rt->getPrefixedText() ); $link = $sk->makeLinkObj( $rt ); diff --git a/languages/Language.php b/languages/Language.php index efeba091ee..2ce4513aca 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -442,6 +442,7 @@ parent class in order maintain consistency across languages. 'viewtalkpage' => 'View discussion', 'otherlanguages' => 'In other languages', 'redirectedfrom' => '(Redirected from $1)', +'redirectpagesub' => 'Redirect page', 'lastmodified' => 'This page was last modified $1.', 'viewcount' => 'This page has been accessed $1 times.', 'copyright' => 'Content is available under $1.', diff --git a/skins/common/images/redirect.png b/skins/common/images/redirect.png deleted file mode 100644 index 7b2b071f8c964a6de1fa678c4cc418315c3f6e5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^`amql!3-q3?{A+5q*&4&eH|GX)}JtE?Rp91OP07s zlmzFem6RtIr7}3CJlvU=d)Jn%>w@)xh91IXy*Xft*6ag)7E} zf&u&j4og&`tR-sa=mTWePH2GU=#Yx?Z7Z`70^D9 zP@r8AS04L1F)$us;Iv{3`MP5($YCy%Iv4y52n3qCBAwwjlZxUqV?zT&1x`c9U@->< z$GgnsY)p#90?&XByiubT!R2tZNx*3Z(9LWuDwEPLwh91U&2e&n!eNOCIgLdRR6J~f fHcG`qeZkC-DaSwQdTzZlD5yML{an^LB{Ts5JtKam diff --git a/skins/common/images/redirectltr.png b/skins/common/images/redirectltr.png new file mode 100644 index 0000000000000000000000000000000000000000..8d228c99d1f3eb367b583661c0073c331b903438 GIT binary patch literal 1023 zcmV004R=004l4008;_004mL004C`008P>0026e z000+nl3&F}00093P)t-sz`($OfPer1000001Ox;H1qB8M1_uWR2nYxX2?+`c3JVJh z3=9kk3JMMm4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM92^`S z9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7EiEoC zE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?K0iM{ zKtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuyP*6}& zQBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?WjVPRro zVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2Ta&vQY zbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyDgoK2J zg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}m6ev3 zmY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(rl+T; zsHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#pxVX5v zxw*Q!y1To(yu7@dCU$jHda$;ryf z%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4?Ck9A z?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg={r&#_ z{{R2~)XFm)00004bW%=J|Ns90Kq{&900009a7bBm000XU000XU0RWnu7ytkOO-V#S zR5;6HU?vJMpm7;UQ_sjqntCRtQT0TrXJjBvJrfgl9T@5vVGQg#(Bqd01z_qxPd|*L tsYh}cQSL$Z2r>Rec!ap{BnW7&9suj03XvNTQwsn9002ovPDHLkV1gC?%q{=` literal 0 HcmV?d00001 diff --git a/skins/common/images/redirectrtl.png b/skins/common/images/redirectrtl.png new file mode 100644 index 0000000000000000000000000000000000000000..0122eefdcf6cd3ec5ccdfe251fd4ad6c6bca7e30 GIT binary patch literal 1016 zcmV004R=004l4008;_004mL004C`008P>0026e z000+nl3&F}00093P)t-sz`($OfPer1000001Ox;H1qB8M1_uWR2nYxX2?+`c3JVJh z3=9kk3JMMm4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM92^`S z9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7EiEoC zE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?K0iM{ zKtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuyP*6}& zQBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?WjVPRro zVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2Ta&vQY zbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyDgoK2J zg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}m6ev3 zmY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(rl+T; zsHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#pxVX5v zxw*Q!y1To(yu7@dCU$jHda$;ryf z%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4?Ck9A z?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg={r&#_ z{{R2~)XFm)00004bW%=J|Ns90Kq{&900009a7bBm000XU000XU0RWnu7ytkOMoC0L zR5;7+(z^-(APhs%MF0PvMa0J-w0ChbYtK+ZR9O_=#k|dYDc|2}H}Udf3E%Z(4*k$O mX5K>o