| Index: branches/wmf/1.18wmf1/extensions/LocalisationUpdate/LocalisationUpdate.class.php |
| — | — | @@ -478,7 +478,9 @@ |
| 479 | 479 | return 0; |
| 480 | 480 | } |
| 481 | 481 | |
| 482 | | - $new_messages = array(); |
| | 482 | + // This function is run once for core and once for each extension, |
| | 483 | + // so make sure messages from previous runs aren't lost |
| | 484 | + $new_messages = self::readFile( $langcode ); |
| 483 | 485 | |
| 484 | 486 | //foreach ( $changedStrings as $key => $value ) { |
| 485 | 487 | // HACK for r103763 CR: store all messages, even unchanged ones |
| — | — | @@ -503,6 +505,10 @@ |
| 504 | 506 | // Use that previous translation rather than falling back to the .i18n.php file |
| 505 | 507 | $new_messages[$key] = $compare_messages[$key]; |
| 506 | 508 | } |
| | 509 | + // Other possible cases: |
| | 510 | + // * The messages is no longer in the SVN file, but is present in the local i18n file or in the cache |
| | 511 | + // * The message was changed in English, and there is no previous translation in the i18n file or in the cache |
| | 512 | + // In both cases, we can safely do nothing |
| 507 | 513 | } |
| 508 | 514 | self::writeFile( $langcode, $new_messages ); |
| 509 | 515 | |
| Property changes on: branches/wmf/1.18wmf1/extensions/LocalisationUpdate |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 510 | 516 | Merged /trunk/extensions/LocalisationUpdate:r106351 |