X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguage.php;h=3ae261e4fecec457e1b16d26bc490ec79efad03e;hb=e7c7f2164aab4c7812c449adb21ad2597eb37749;hp=355adcb3be8e7909c9c3f05ad2a018c28cb7d3e2;hpb=974c884d7341c0da03ac981082ea3238d6e68732;p=lhc%2Fweb%2Fwiklou.git
diff --git a/languages/Language.php b/languages/Language.php
index 355adcb3be..3ae261e4fe 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -25,7 +25,7 @@
"contextlines" => 5, "contextchars" => 50,
"skin" => 0, "math" => 1, "rcdays" => 7, "rclimit" => 50,
"highlightbroken" => 1, "stubthreshold" => 0,
- "previewontop" => 1, "editsection"=>1, "showtoc"=>1,
+ "previewontop" => 1, "editsection"=>1,"editsectiononrightclick"=>0, "showtoc"=>1,
"date" => 0
);
@@ -61,12 +61,13 @@ this (alternative: like this?).",
"hideminor" => "Hide minor edits in recent changes",
"usenewrc" => "Enhanced recent changes (not for all browsers)",
"numberheadings" => "Auto-number headings",
- "editsection"=>"Show links for editing individual sections",
- "showtoc"=>"Show table of contents for articles with more than 3 headings",
+ "editondblclick" => "Edit pages on double click (JavaScript)",
+ "editsection"=>"Enable section editing via [edit] links",
+ "editsectiononrightclick"=>"Enable section editing by right clicking
on section titles (JavaScript)",
+ "showtoc"=>"Show table of contents
(for articles with more than 3 headings)",
"rememberpassword" => "Remember password across sessions",
"editwidth" => "Edit box has full width",
- "editondblclick" => "Edit pages on double click (JavaScript)",
- "watchdefault" => "Watch new and modified articles",
+ "watchdefault" => "Add pages you edit to your watchlist",
"minordefault" => "Mark all edits minor by default",
"previewontop" => "Show preview before edit box and not after it",
"nocache" => "Disable page caching"
@@ -274,7 +275,8 @@ this (alternative: like this?).",
"Whatlinkshere" => "",
"Recentchangeslinked" => "",
"Movepage" => "",
- "Booksources" => "External book sources"
+ "Booksources" => "External book sources",
+"Categories" => "Page categories",
);
/* private */ $wgSysopSpecialPagesEn = array(
@@ -293,6 +295,11 @@ this (alternative: like this?).",
# Bits of text used by many pages:
#
+"categories" => "Page categories",
+"category" => "category",
+"category_header" => "Articles in category \"$1\"",
+"subcategories" => "Subcategories",
+
"linktrail" => "/^([a-z]+)(.*)\$/sD",
"mainpage" => "Main Page",
"mainpagetext" => "Wiki software successfully installed.",
@@ -333,6 +340,7 @@ this (alternative: like this?).",
"unprotectthispage" => "Unprotect this page",
"newpage" => "New page",
"talkpage" => "Discuss this page",
+"postcomment" => "Post a comment",
"articlepage" => "View article",
"subjectpage" => "View subject", # For compatibility
"userpage" => "View user page",
@@ -365,6 +373,8 @@ See $1.",
"newmessageslink" => "new messages",
"editsection"=>"edit",
"toc" => "Table of contents",
+"showtoc" => "show",
+"hidetoc" => "hide",
# Main script and global functions
#
@@ -391,8 +401,9 @@ The last attempted database query was:
\"$1\"
from within function \"$2\".
MySQL returned error \"$3: $4\".\n",
-"noconnect" => "Could not connect to DB on $1",
+"noconnect" => "Sorry! The wiki is experiencing some technical difficulties, and cannot contact the database server.",
"nodb" => "Could not select database $1",
+"cachederror" => "The following is a cached copy of the requested page, and may not be up to date.",
"readonly" => "Database locked",
"enterlockreason" => "Enter a reason for the lock, including an estimate
of when the lock will be released",
@@ -485,6 +496,7 @@ Please log in again after you receive it.",
# Edit pages
#
"summary" => "Summary",
+"subject" => "Subject/headline",
"minoredit" => "This is a minor edit",
"watchthis" => "Watch this article",
"savearticle" => "Save page",
@@ -509,6 +521,7 @@ If you are here by mistake, just click your browser's '''back''' button.",
text editing area as it will appear if you choose to save.",
"editing" => "Editing $1",
"sectionedit" => " (section)",
+"commentedit" => " (comment)",
"editconflict" => "Edit conflict: $1",
"explainconflict" => "Someone else has changed this page since you
started editing it.
@@ -601,7 +614,7 @@ containing all of the search terms will appear in the result).",
Search in namespaces :
$1
$2 List redirects Search for $3 $9",
-
+"blanknamespace" => "(Main)",
# Preferences page
#
@@ -611,7 +624,9 @@ $2 List redirects Search for $3 $9",
wfLocalUrl( "Special:Userlogin" ) . "\">logged in
to set user preferences.",
"prefslogintext" => "You are logged in as \"$1\".
-Your internal ID number is $2.",
+Your internal ID number is $2.
+
+See [[Wikipedia:User preferences help]] for help deciphering the options.",
"prefsreset" => "Preferences have been reset from storage.",
"qbsettings" => "Quickbar settings",
"changepassword" => "Change password",
@@ -693,7 +708,7 @@ See also the [http://meta.wikipedia.org/wiki/Special:Recentchanges recent meta d
"uploadnologintext" => "You must be logged in
to upload files.",
-"uploadfile" => "Upload file",
+"uploadfile" => "Upload images, sounds, documents etc.",
"uploaderror" => "Upload error",
"uploadtext" => "STOP! Before you upload here,
make sure to read and follow Wikipedia's $5 average edits per page, and $6 views per edit.",
"longpages" => "Long pages",
"listusers" => "User list",
"specialpages" => "Special pages",
-"spheading" => "Special pages",
-"sysopspheading" => "Special pages for sysop use",
-"developerspheading" => "Special pages for developer use",
+"spheading" => "Special pages for all users",
+"sysopspheading" => "For sysop use only",
+"developerspheading" => "For developer use only",
"protectpage" => "Protect page",
"recentchangeslinked" => "Related changes",
"rclsub" => "(to pages linked from \"$1\")",
@@ -1222,12 +1237,16 @@ class Language {
function date( $ts, $adj = false )
{
- global $wgAmericanDates, $wgUser;
+ global $wgAmericanDates, $wgUser, $wgUseDynamicDates;
if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-
- $datePreference = $wgUser->getOption( 'date' );
- if ( $datePreference == 0 ) {
+
+ if ( $wgUseDynamicDates ) {
+ $datePreference = $wgUser->getOption( 'date' );
+ if ( $datePreference == 0 ) {
+ $datePreference = $wgAmericanDates ? 1 : 2;
+ }
+ } else {
$datePreference = $wgAmericanDates ? 1 : 2;
}
@@ -1371,13 +1390,18 @@ class Language {
function replaceDates( $text )
{
- global $wgUser, $wgInputEncoding;
+ global $wgUser, $wgInputEncoding, $wgUseDynamicDates;
+ # Feature can be disabled
+ if ( !$wgUseDynamicDates ) {
+ return;
+ }
+
# Setup
$datePreference = $wgUser->getOption( 'date' );
- static $monthNames = "", $rxDM, $rxMD, $rxY, $rxDMY, $rxYMD, $rxMDY, $rxYMD;
+ static $monthNames = "", $rxDM, $rxMD, $rxY, $rxDMY, $rxYDM, $rxMDY, $rxYMD;
if ( $monthNames == "" ) {
$monthNames = $this->getMonthRegex();
@@ -1437,6 +1461,9 @@ class Language {
}
return $text;
}
+
+ # For right-to-left language support
+ function isRTL() { return false; }
}
global $IP;