* Exif::validate(): Using $this->debug() rather than wfDebug()

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

diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php
index d1d2ccc..19f5ccb 100644 (file)
--- a/languages/LanguageCy.php
+++ b/languages/LanguageCy.php
@@ -66,7 +66,6 @@
     MAG_CURRENTTIME          => array( 1,    "CURRENTTIME", "AMSERCYFOES"                 ),
     MAG_NUMBEROFARTICLES    => array( 1, "NUMBEROFARTICLES","NIFEROERTHYGLAU"       ),
     MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN", "GENENWMISCYFOES"     ),
-    MAG_MSG                  => array( 1,    "MSG:"                                       ),
     MAG_SUBST                => array( 1,    "SUBST:"                                     ),
     MAG_MSGNW                => array( 0,    "MSGNW:"                                     ),
     MAG_END                 => array( 0, "DIWEDD"                                   ),
@@ -133,8 +132,6 @@
 );
 
 /* private */ $wgAllMessagesCy = array(
-'special_version_prefix' => '',
-'special_version_postfix' => '',
 # User Toggles
 
 "tog-underline" => "Tanllinellu cysylltiadau",
@@ -253,7 +250,7 @@
 "lastmodified" => "Pryd cafodd ei newid diwethaf $1.",
 "viewcount" => "Mae'r tudalen hyn wedi cael ei gweld $1 o weithiau.",
 "gnunote" => "Mae pob testun ar gael o dan term<a class=internal href='$wgScriptPath/GNU_FDL'>Goddefiad dogfennau rhad GNU</a>.",
-"printsubtitle" => "(Oddiwrth http://www.wikipedia.org/)",
+"printsubtitle" => "(Oddiwrth {{SERVER}})",
 "protectedpage" => "Tudalen amddiffyniol",
 "administrators" => "$wgMetaNamespace:Gweinyddwyr",
 "sysoptitle" => "Mynediad Sysop yn unig",
@@ -776,7 +773,7 @@ Pan fydd y tudalen hon, a'i tudalen Sgwrs, yn newid, fyddynt yn dangos  <b>yn cr
 "watchdetails" => "(Yn gwylio $1 tudalennau, nid yn cyfri tudalennau sgwrs;
 wedi olygu $2 tudalennau ers y toriad;
 $3...
-<a href='$4'>dangos ac olygu y rhestr cyfan</a>.)",
+[$4 dangos ac olygu y rhestr cyfan].)",
 "watchmethod-recent"=> "gwiriwch golygiadau diweddar am tudalennau gwyliad",
 "watchmethod-list" => "yn gwirio tudalennau gwyliad am olygiadau diweddar",
 "removechecked" => "Dileuwch eitemau sydd gyda tic o'ch rhestr gwylio",
@@ -795,8 +792,8 @@ y botwm 'dileu' ar gwaelod y sgrîn.",
 #
 "deletepage" => "Dileuwch y tudalen",
 "confirm" => "Cadarnhau",
-"excontent" => "y cynnwys oedd:",
-"exbeforeblank" => "y cynnwys cyn blancio oedd:",
+"excontent" => "y cynnwys oedd: '$1'",
+"exbeforeblank" => "y cynnwys cyn blancio oedd: '$1'",
 "exblank" => "y tudalen oedd yn wâg",
 "confirmdelete" => "Cadarnhaewch y dileuad",
 "deletesub" => "(Yn dileuo \"$1\")",
@@ -1013,8 +1010,10 @@ amusement.",
 );
 
 
-require_once( "LanguageUtf8.php" );
+/** */
+require_once( 'LanguageUtf8.php' );
 
+/** @package MediaWiki */
 class LanguageCy extends LanguageUtf8 {
 
        function getBookstoreList () {
@@ -1027,21 +1026,6 @@ class LanguageCy extends LanguageUtf8 {
                return $wgNamespaceNamesCy;
        }
 
-       function getNsText( $index ) {
-               global $wgNamespaceNamesCy;
-               return $wgNamespaceNamesCy[$index];
-       }
-
-       function getNsIndex( $text ) {
-               global $wgNamespaceNamesCy;
-
-               foreach ( $wgNamespaceNamesCy as $i => $n ) {
-                       if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
-               }
-               # Fallback to English names for compatibility
-               return Language::getNsIndex( $text );
-       }
-
        function getQuickbarSettings() {
                global $wgQuickbarSettingsCy;
                return $wgQuickbarSettingsCy;
@@ -1081,7 +1065,7 @@ class LanguageCy extends LanguageUtf8 {
                if( isset( $wgAllMessagesCy[$key] ) ) {
                        return $wgAllMessagesCy[$key];
                } else {
-                       return Language::getMessage( $key );
+                       return parent::getMessage( $key );
                }
        }