| Index: branches/wmf/1.18wmf1/languages/Language.php |
| — | — | @@ -3051,8 +3051,12 @@ |
| 3052 | 3052 | } |
| 3053 | 3053 | |
| 3054 | 3054 | /** |
| 3055 | | - * This translates the duration ("1 week", "4 days", etc) |
| 3056 | | - * as well as the expiry time (which is an absolute timestamp). |
| | 3055 | + * @todo Maybe translate block durations. Note that this function is somewhat misnamed: it |
| | 3056 | + * deals with translating the *duration* ("1 week", "4 days", etc), not the expiry time |
| | 3057 | + * (which is an absolute timestamp). Please note: do NOT add this blindly, as it is used |
| | 3058 | + * on old expiry lengths recorded in log entries. You'd need to provide the start date to |
| | 3059 | + * match up with it. |
| | 3060 | + * |
| 3057 | 3061 | * @param $str String: the validated block duration in English |
| 3058 | 3062 | * @return Somehow translated block duration |
| 3059 | 3063 | * @see LanguageFi.php for example implementation |
| — | — | @@ -3076,8 +3080,8 @@ |
| 3077 | 3081 | } |
| 3078 | 3082 | } |
| 3079 | 3083 | } |
| 3080 | | - // If no duration is given, but a timestamp, display that |
| 3081 | | - return ( strtotime( $str ) ? $this->timeanddate( strtotime( $str ) ) : $str ); |
| | 3084 | + // If all else fails, return the original string. |
| | 3085 | + return $str; |
| 3082 | 3086 | } |
| 3083 | 3087 | |
| 3084 | 3088 | /** |
| Property changes on: branches/wmf/1.18wmf1/languages/Language.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 3085 | 3089 | Merged /branches/REL1_17/phase3/languages/Language.php:r81445,81448 |
| 3086 | 3090 | Merged /branches/nikola/phase3/languages/Language.php:r85224,85239,85308 |
| 3087 | 3091 | Merged /branches/sqlite/languages/Language.php:r58211-58321 |
| 3088 | 3092 | Merged /trunk/phase3/languages/Language.php:r92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94630,94728,94825,94862,94995-94997,95042,95155,95332,95410,95442,95468,95601,95812,99154 |
| 3089 | 3093 | Merged /branches/new-installer/phase3/languages/Language.php:r43664-66004 |
| 3090 | 3094 | Merged /branches/REL1_15/phase3/languages/Language.php:r51646 |