| Index: trunk/translatewiki/PageTranslationAgg.yaml |
| — | — | @@ -12,4 +12,4 @@ |
| 13 | 13 | namespace: NS_TRANSLATIONS |
| 14 | 14 | |
| 15 | 15 | GROUPS: |
| 16 | | - - page|* |
| | 16 | + - page-* |
| Index: trunk/extensions/Translate/check-blacklist.php |
| — | — | @@ -651,7 +651,7 @@ |
| 652 | 652 | ), |
| 653 | 653 | // translatewiki.net specific |
| 654 | 654 | array( |
| 655 | | - 'group' => 'page|Translating:Intro', |
| | 655 | + 'group' => 'page-Translating:Intro', |
| 656 | 656 | 'check' => 'links', |
| 657 | 657 | 'message' => array( |
| 658 | 658 | 'Translating:Intro/intro', // Contains links that are translated |
| Index: trunk/extensions/Translate/MessageGroups.php |
| — | — | @@ -1184,6 +1184,8 @@ |
| 1185 | 1185 | * @return MessageGroup|null if it doesn't exist. |
| 1186 | 1186 | */ |
| 1187 | 1187 | public static function getGroup( $id ) { |
| | 1188 | + // BC with page| which is now page- |
| | 1189 | + $id = strtr( $id, '|', '-' ); |
| 1188 | 1190 | self::init(); |
| 1189 | 1191 | |
| 1190 | 1192 | global $wgTranslateEC, $wgTranslateAC, $wgTranslateCC; |
| Index: trunk/extensions/Translate/tag/TranslatablePage.php |
| — | — | @@ -181,7 +181,7 @@ |
| 182 | 182 | * @return \string |
| 183 | 183 | */ |
| 184 | 184 | public static function getMessageGroupIdFromTitle( Title $title ) { |
| 185 | | - return 'page|' . $title->getPrefixedText(); |
| | 185 | + return 'page-' . $title->getPrefixedText(); |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | /** |
| Index: trunk/extensions/Translate/README |
| — | — | @@ -29,6 +29,9 @@ |
| 30 | 30 | http://translatewiki.net/docs/Translate/html/ |
| 31 | 31 | |
| 32 | 32 | == Change log == |
| | 33 | +* 2012-01-11 |
| | 34 | +- Translate page group id prefix was changed from page| to page-. Some old |
| | 35 | + links need to be updated, some still work. |
| 33 | 36 | * 2012-01-10 |
| 34 | 37 | - Translate extension no longer unconditionally suppresses edit intros |
| 35 | 38 | - Fixed compatibility issue with logs on < MW 1.18 |
| Index: trunk/extensions/Translate/specials/SpecialTranslationStats.php |
| — | — | @@ -78,7 +78,8 @@ |
| 79 | 79 | $values = array_map( 'trim', explode( ',', $opts[$t] ) ); |
| 80 | 80 | $values = array_splice( $values, 0, 4 ); |
| 81 | 81 | if ( $t === 'group' ) { |
| 82 | | - $values = preg_replace( '~^page_~', 'page|', $values ); |
| | 82 | + // BC for old syntax which replaced _ to | which was not allowed |
| | 83 | + $values = preg_replace( '~^page_~', 'page-', $values ); |
| 83 | 84 | } |
| 84 | 85 | $opts[$t] = implode( ',', $values ); |
| 85 | 86 | } |
| Index: trunk/extensions/Translate/api/ApiGroupReview.php |
| — | — | @@ -97,11 +97,7 @@ |
| 98 | 98 | global $wgTranslateWorkflowStates; |
| 99 | 99 | return array( |
| 100 | 100 | 'group' => array( |
| 101 | | - /* API borks with | if defined multiple allowed values even |
| 102 | | - * though we are expecting only one value, which can and will |
| 103 | | - * contain | for page translation pages, which have group id |
| 104 | | - * of format page|Pagename. This is fixed in 1.19 and up */ |
| 105 | | - ApiBase::PARAM_TYPE => 'string',//array_keys( MessageGroups::getAllGroups() ), |
| | 101 | + ApiBase::PARAM_TYPE => array_keys( MessageGroups::getAllGroups() ), |
| 106 | 102 | ApiBase::PARAM_REQUIRED => true, |
| 107 | 103 | ), |
| 108 | 104 | 'language' => array( |