| Index: trunk/extensions/Translate/ffs/Gettext.php |
| — | — | @@ -282,20 +282,12 @@ |
| 283 | 283 | return $out; |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | | -<<<<<<< .mine |
| 287 | 286 | protected function escape( $line ) { |
| 288 | 287 | #$line = addcslashes( $line, '\\"' ); |
| 289 | 288 | $line = str_replace( "\n", '\n', $line ); |
| 290 | 289 | $line = '"' . $line . '"'; |
| 291 | 290 | return $line; |
| 292 | | -======= |
| 293 | | - public function parseMessages( $filename ) { |
| 294 | | - $messages = array(); |
| 295 | | - require( $filename ); |
| 296 | | - return $messages; |
| 297 | | ->>>>>>> .r35998 |
| 298 | 291 | } |
| 299 | | -<<<<<<< .mine |
| 300 | 292 | |
| 301 | 293 | protected function formatcomments( $comments, $documentation = false, $flags = false ) { |
| 302 | 294 | if ( $documentation ) { |
| — | — | @@ -304,8 +296,6 @@ |
| 305 | 297 | } |
| 306 | 298 | } |
| 307 | 299 | |
| 308 | | -======= |
| 309 | | ->>>>>>> .r35998 |
| 310 | 300 | if ( $flags ) { |
| 311 | 301 | $comments[','][] = implode( ', ', $flags ); |
| 312 | 302 | } |