X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2Fclasses%2FLanguageWa.php;h=98d138dbf1a1131644c198b9e90fc9219092464c;hb=8c6e9e5f2f50352b11671ac665b0889b5eb9799b;hp=5fe4e8fbab6ff43ee64b4571008e91d02a02ab92;hpb=1f8441b6830111631c860c5c677d812de833a58f;p=lhc%2Fweb%2Fwiklou.git diff --git a/languages/classes/LanguageWa.php b/languages/classes/LanguageWa.php index 5fe4e8fbab..98d138dbf1 100644 --- a/languages/classes/LanguageWa.php +++ b/languages/classes/LanguageWa.php @@ -30,30 +30,16 @@ * @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' " for 1st of the month, * " di " for months starting by a consoun, and * " d' " 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 ) { @@ -67,14 +53,14 @@ class LanguageWa extends Language { # # 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 @@ -83,30 +69,32 @@ class LanguageWa extends Language { $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 ); } + if ( $adj ) { + $ts = $this->userAdjust( $ts, $tc ); + } $datePreference = $this->dateFormat( $format ); if ( $datePreference == 'ISO 8601' ) { return parent::timeanddate( $ts, $adj, $format, $tc );