| Index: branches/wmf/1.17wmf1/languages/Language.php |
| — | — | @@ -1561,21 +1561,11 @@ |
| 1562 | 1562 | } |
| 1563 | 1563 | |
| 1564 | 1564 | function getMessage( $key ) { |
| 1565 | | - // Don't change getPreferredVariant() to getCode() / mCode, because: |
| 1566 | | - |
| 1567 | | - // 1. Some language like Chinese has multiple variant languages. Only |
| 1568 | | - // getPreferredVariant() (in LanguageConverter) could return a |
| 1569 | | - // sub-language which would be more suitable for the user. |
| 1570 | | - // 2. To languages without multiple variants, getPreferredVariant() |
| 1571 | | - // (in FakeConverter) functions exactly same as getCode() / mCode, |
| 1572 | | - // it won't break anything. |
| 1573 | | - |
| 1574 | | - // The same below. |
| 1575 | | - return self::$dataCache->getSubitem( $this->getPreferredVariant(), 'messages', $key ); |
| | 1565 | + return self::$dataCache->getSubitem( $this->mCode, 'messages', $key ); |
| 1576 | 1566 | } |
| 1577 | 1567 | |
| 1578 | 1568 | function getAllMessages() { |
| 1579 | | - return self::$dataCache->getItem( $this->getPreferredVariant(), 'messages' ); |
| | 1569 | + return self::$dataCache->getItem( $this->mCode, 'messages' ); |
| 1580 | 1570 | } |
| 1581 | 1571 | |
| 1582 | 1572 | function iconv( $in, $out, $string ) { |
| Property changes on: branches/wmf/1.17wmf1/languages/Language.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1583 | 1573 | Merged /trunk/phase3/languages/Language.php:r82246 |