| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -2992,9 +2992,8 @@ |
| 2993 | 2993 | } |
| 2994 | 2994 | |
| 2995 | 2995 | /** |
| 2996 | | - * Maybe translate block durations. Note that this function is somewhat misnamed: it |
| 2997 | | - * deals with translating the *duration* ("1 week", "4 days", etc), not the expiry time |
| 2998 | | - * (which is an absolute timestamp). |
| | 2996 | + * This translates the duration ("1 week", "4 days", etc) |
| | 2997 | + * as well as the expiry time (which is an absolute timestamp). |
| 2999 | 2998 | * @param $str String: the validated block duration in English |
| 3000 | 2999 | * @return Somehow translated block duration |
| 3001 | 3000 | * @see LanguageFi.php for example implementation |
| — | — | @@ -3018,8 +3017,8 @@ |
| 3019 | 3018 | } |
| 3020 | 3019 | } |
| 3021 | 3020 | } |
| 3022 | | - // If all else fails, return the original string. |
| 3023 | | - return $str; |
| | 3021 | + // If no duration is given, but a timestamp, display that |
| | 3022 | + return $this->timeanddate( $str ); |
| 3024 | 3023 | } |
| 3025 | 3024 | |
| 3026 | 3025 | /** |
| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -148,6 +148,7 @@ |
| 149 | 149 | * (bug 27410) The tag filter on a history page is now within a <label> element |
| 150 | 150 | * (bug 29779) DairikiDiff/WikiDiff <ins> and <del> should undo browser default |
| 151 | 151 | styling (strike/underline). |
| | 152 | +* Translate the block expiry date |
| 152 | 153 | |
| 153 | 154 | === API changes in 1.19 === |
| 154 | 155 | * BREAKING CHANGE: action=watch now requires POST and token. |