From: Sam Reed Date: Sat, 17 Mar 2012 22:14:44 +0000 (+0000) Subject: Followup r114067 X-Git-Tag: 1.31.0-rc.0~24221 X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=6d590e06da4fb68baa8ef382b6bb84ce8c908709;p=lhc%2Fweb%2Fwiklou.git Followup r114067 Add centuries because the messages were already there but not used Add decade and millennia for the luls/completeness --- diff --git a/languages/Language.php b/languages/Language.php index f334b0d435..492c853185 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -1919,8 +1919,11 @@ class Language { * * @return string */ - public function duration( $seconds, array $chosenIntervals = array( 'years', 'days', 'hours', 'minutes', 'seconds' ) ) { + public function duration( $seconds, array $chosenIntervals = array( 'millennia', 'centuries', 'decades', 'years', 'days', 'hours', 'minutes', 'seconds' ) ) { $intervals = array( + 'millennia' => 1000 * 31557600, + 'centuries' => 100 * 31557600, + 'decades' => 10 * 31557600, 'years' => 31557600, // 86400 * 365.25 'weeks' => 604800, 'days' => 86400, diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 043716b0e1..22dd3269d4 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -4827,6 +4827,7 @@ Otherwise, you can use the easy form below. Your comment will be added to the pa 'duration-days' => '$1 {{PLURAL:$1|day|days}}', 'duration-weeks' => '$1 {{PLURAL:$1|week|weeks}}', 'duration-years' => '$1 {{PLURAL:$1|year|years}}', +'duration-decades' => '$1 {{PLURAL:$1|decade|decades}}', 'duration-centuries' => '$1 {{PLURAL:$1|century|centuries}}', - +'duration-millennia' => '$1 {{PLURAL:$1|millennium|millennia}}', ); diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 33b1a2b61c..5aed95fd25 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -3693,7 +3693,9 @@ $wgMessageStructure = array( 'duration-days', 'duration-weeks', 'duration-years', + 'duration-decades', 'duration-centuries', + 'duration-millenniums' ), );