- $date = (0 + substr( $ts, 6, 2 )) . '. ' .
- $this->getMonthName( substr( $ts, 4, 2 ) ) . ' ' .
- substr($ts, 0, 4);
- return $date;
+
+ switch( $wgUser->getOption( 'date' ) ) {
+ case 5: return substr( $ts, 8, 2 ) . ':' . substr( $ts, 10, 2 ) . ':' . substr( $ts, 12, 2 );
+ default: return substr( $ts, 8, 2 ) . ':' . substr( $ts, 10, 2 );
+ }
+
+ }
+
+ function timeanddate( $ts, $adj = false ) {
+ global $wgUser;
+
+ switch ( $wgUser->getOption( 'date' ) ) {
+ # 16:12, 15. janúar 2001 || 16:12, 15. jan. 2001
+ case 3: case 4: return $this->time( $ts, $adj ) . ', ' . $this->date( $ts, $adj );
+ # 2001-01-15 16:12:34
+ case 5: return $this->date( $ts, $adj ) . ' ' . $this->time( $ts, $adj );
+ default: return $this->date( $ts, $adj ) . ' kl. ' . $this->time( $ts, $adj );
+
+ }
+