| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -3693,7 +3693,9 @@ |
| 3694 | 3694 | 'duration-days', |
| 3695 | 3695 | 'duration-weeks', |
| 3696 | 3696 | 'duration-years', |
| | 3697 | + 'duration-decades', |
| 3697 | 3698 | 'duration-centuries', |
| | 3699 | + 'duration-millenniums' |
| 3698 | 3700 | ), |
| 3699 | 3701 | ); |
| 3700 | 3702 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4827,6 +4827,7 @@ |
| 4828 | 4828 | 'duration-days' => '$1 {{PLURAL:$1|day|days}}', |
| 4829 | 4829 | 'duration-weeks' => '$1 {{PLURAL:$1|week|weeks}}', |
| 4830 | 4830 | 'duration-years' => '$1 {{PLURAL:$1|year|years}}', |
| | 4831 | +'duration-decades' => '$1 {{PLURAL:$1|decade|decades}}', |
| 4831 | 4832 | 'duration-centuries' => '$1 {{PLURAL:$1|century|centuries}}', |
| 4832 | | - |
| | 4833 | +'duration-millennia' => '$1 {{PLURAL:$1|millennium|millennia}}', |
| 4833 | 4834 | ); |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -1919,8 +1919,11 @@ |
| 1920 | 1920 | * |
| 1921 | 1921 | * @return string |
| 1922 | 1922 | */ |
| 1923 | | - public function duration( $seconds, array $chosenIntervals = array( 'years', 'days', 'hours', 'minutes', 'seconds' ) ) { |
| | 1923 | + public function duration( $seconds, array $chosenIntervals = array( 'millennia', 'centuries', 'decades', 'years', 'days', 'hours', 'minutes', 'seconds' ) ) { |
| 1924 | 1924 | $intervals = array( |
| | 1925 | + 'millennia' => 1000 * 31557600, |
| | 1926 | + 'centuries' => 100 * 31557600, |
| | 1927 | + 'decades' => 10 * 31557600, |
| 1925 | 1928 | 'years' => 31557600, // 86400 * 365.25 |
| 1926 | 1929 | 'weeks' => 604800, |
| 1927 | 1930 | 'days' => 86400, |