Merge "build: Updating mediawiki/mediawiki-codesniffer to 23.0.0"

[lhc/web/wiklou.git] / languages / classes / LanguageWa.php

diff --git a/languages/classes/LanguageWa.php b/languages/classes/LanguageWa.php
index 5fe4e8f..078b068 100644 (file)
--- a/languages/classes/LanguageWa.php
+++ b/languages/classes/LanguageWa.php
@@ -30,33 +30,19 @@
  * @ingroup Language
  */
 class LanguageWa extends Language {
-       /**
-        * Use singular form for zero
-        *
-        * @param $count int
-        * @param $forms array
-        *
-        * @return string
-        */
-       function convertPlural( $count, $forms ) {
-               if ( !count( $forms ) ) { return ''; }
-               $forms = $this->preConvertPlural( $forms, 2 );
-
-               return ( $count <= 1 ) ? $forms[0] : $forms[1];
-       }
 
        /**
         * Dates in Walloon are "1î d' <monthname>" for 1st of the month,
         * "<day> di <monthname>" for months starting by a consoun, and
         * "<day> d' <monthname>" for months starting with a vowel
         *
-        * @param $ts string
-        * @param $adj bool
-        * @param $format bool
-        * @param $tc bool
+        * @param string $ts
+        * @param bool $adj
+        * @param bool $format
+        * @param bool $tc
         * @return string
         */
-       function date( $ts, $adj = false, $format = true, $tc = false ) {
+       public function date( $ts, $adj = false, $format = true, $tc = false ) {
                $ts = wfTimestamp( TS_MW, $ts );
                if ( $adj ) {
                        $ts = $this->userAdjust( $ts, $tc );
@@ -64,49 +50,49 @@ class LanguageWa extends Language {
                $datePreference = $this->dateFormat( $format );
 
                # ISO (YYYY-mm-dd) format
-               #
                # we also output this format for YMD (eg: 2001 January 15)
                if ( $datePreference == 'ISO 8601' ) {
-                      $d = substr( $ts, 0, 4 ) . '-' . substr( $ts, 4, 2 ) . '-' . substr( $ts, 6, 2 );
-                      return $d;
+                       $d = substr( $ts, 0, 4 ) . '-' . substr( $ts, 4, 2 ) . '-' . substr( $ts, 6, 2 );
+                       return $d;
                }
 
                # dd/mm/YYYY format
                if ( $datePreference == 'walloon short' ) {
-                      $d = substr( $ts, 6, 2 ) . '/' . substr( $ts, 4, 2 ) . '/' . substr( $ts, 0, 4 );
-                      return $d;
+                       $d = substr( $ts, 6, 2 ) . '/' . substr( $ts, 4, 2 ) . '/' . substr( $ts, 0, 4 );
+                       return $d;
                }
 
                # Walloon format
-               #
                # we output this in all other cases
                $m = substr( $ts, 4, 2 );
                $n = substr( $ts, 6, 2 );
                if ( $n == 1 ) {
-                   $d = "1î d' " . $this->getMonthName( $m ) .
-                       " " . substr( $ts, 0, 4 );
+                       $d = "1î d' " . $this->getMonthName( $m ) .
+                               " " . substr( $ts, 0, 4 );
                } elseif ( $n == 2 || $n == 3 || $n == 20 || $n == 22 || $n == 23 ) {
-                   $d = ( 0 + $n ) . " d' " . $this->getMonthName( $m ) .
-                       " " . substr( $ts, 0, 4 );
+                       $d = ( 0 + $n ) . " d' " . $this->getMonthName( $m ) .
+                               " " . substr( $ts, 0, 4 );
                } elseif ( $m == 4 || $m == 8 || $m == 10 ) {
-                   $d = ( 0 + $n ) . " d' " . $this->getMonthName( $m ) .
-                       " " . substr( $ts, 0, 4 );
+                       $d = ( 0 + $n ) . " d' " . $this->getMonthName( $m ) .
+                               " " . substr( $ts, 0, 4 );
                } else {
-                   $d = ( 0 + $n ) . " di " . $this->getMonthName( $m ) .
-                       " " . substr( $ts, 0, 4 );
+                       $d = ( 0 + $n ) . " di " . $this->getMonthName( $m ) .
+                               " " . substr( $ts, 0, 4 );
                }
                return $d;
        }
 
        /**
-        * @param $ts string
-        * @param $adj bool
-        * @param $format bool
-        * @param $tc bool
+        * @param string $ts
+        * @param bool $adj
+        * @param bool $format
+        * @param bool $tc
         * @return string
         */
-       function timeanddate( $ts, $adj = false, $format = true, $tc = false ) {
-               if ( $adj ) { $ts = $this->userAdjust( $ts, $tc ); }
+       public function timeanddate( $ts, $adj = false, $format = true, $tc = false ) {
+               if ( $adj ) {
+                       $ts = $this->userAdjust( $ts, $tc );
+               }
                $datePreference = $this->dateFormat( $format );
                if ( $datePreference == 'ISO 8601' ) {
                        return parent::timeanddate( $ts, $adj, $format, $tc );