Third batch of files modified to replace selected wgLang with wgContLang

[lhc/web/wiklou.git] / languages / LanguageJa.php

diff --git a/languages/LanguageJa.php b/languages/LanguageJa.php
index a04e771..916b9af 100644 (file)
--- a/languages/LanguageJa.php
+++ b/languages/LanguageJa.php
@@ -167,7 +167,7 @@ require_once( "LanguageUtf8.php" );
 #
 "mainpage"             => "メインページ",
 "about"                        => "About",
-"aboutwikipedia" => "{{SITENAME}}について",
+"aboutsite"      => "{{SITENAME}}について",
 "aboutpage"            => "{{ns:4}}:About",
 "help"                 => "ヘルプ",
 "helppage"             => "{{ns:4}}:Help",
@@ -190,7 +190,7 @@ require_once( "LanguageUtf8.php" );
 "currentevents" => "最近の出来事",
 "errorpagetitle" => "エラー",
 "returnto"             => "$1 に戻る。",
-"fromwikipedia"        => "出典: フリー百科事典『ウィキペディア（{{SITENAME}}）』",
+"tagline"              => "出典: フリー百科事典『ウィキペディア（{{SITENAME}}）』",
 "whatlinkshere"        => "ここにリンクしているページ",
 "help"                 => "ヘルプ",
 "search"               => "検索",
@@ -233,8 +233,6 @@ require_once( "LanguageUtf8.php" );
 "error"                        => "エラー",
 "databaseerror" => "データベース・エラー",
 "dberrortext"  => "データベース検索の文法エラー。
-検索問合わせが間違っているか($5 を参照),
-あるいはソフトウェアのバグかもしれません。
 最後に実行を試みた問い合わせ:
 <blockquote><tt>$1</tt></blockquote>
 from within function \"<tt>$2</tt>\".
@@ -981,7 +979,7 @@ class LanguageJa extends LanguageUtf8 {
                global $wgWeekdayAbbreviationsJa;
                if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
-               $x = getdate(mktime(( (int)substr( $ts, 8, 2) ) + $diff,
+               $x = getdate(mktime(( (int)substr( $ts, 8, 2) ),
                        (int)substr( $ts, 10, 2 ), (int)substr( $ts, 12, 2 ),
                        (int)substr( $ts, 4, 2 ), (int)substr( $ts, 6, 2 ),
                        (int)substr( $ts, 0, 4 )));
@@ -1057,11 +1055,8 @@ class LanguageJa extends LanguageUtf8 {
                $s = preg_replace( '/\xef\xbc([\x80-\xbf])/e', 'chr((ord("$1") & 0x3f) + 0x20)', $s );
                $s = preg_replace( '/\xef\xbd([\x80-\x99])/e', 'chr((ord("$1") & 0x3f) + 0x60)', $s );
 
-               return trim( preg_replace(
-                 "/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-                 "'U8' . bin2hex( strtr( \"\$1\", \$wikiLowerChars ) )",
-                 $s ) );
-               return $s;
+               # Do general case folding and UTF-8 armoring
+               return LanguageUtf8::stripForSearch( $s );
        }
 
        # Italic is not appropriate for Japanese script