| Index: branches/wmf/1.18wmf1/extensions/CentralNotice/CentralNotice.db.php |
| — | — | @@ -421,9 +421,6 @@ |
| 422 | 422 | if ( is_callable( array( 'CountryNames', 'getNames' ) ) ) { |
| 423 | 423 | // Retrieve the list of countries in user's language (via CLDR) |
| 424 | 424 | $countries = CountryNames::getNames( $code ); |
| 425 | | - unset( $countries['CU'] ); // Cuba |
| 426 | | - unset( $countries['IR'] ); // Iran |
| 427 | | - unset( $countries['SY'] ); // Syria |
| 428 | 425 | } |
| 429 | 426 | |
| 430 | 427 | if ( !$countries ) { |
| — | — | @@ -483,7 +480,7 @@ |
| 484 | 481 | 'CR'=>'Costa Rica', |
| 485 | 482 | 'CI'=>'Côte d\'Ivoire', |
| 486 | 483 | 'HR'=>'Croatia', |
| 487 | | - //'CU'=>'Cuba', |
| | 484 | + 'CU'=>'Cuba', |
| 488 | 485 | 'CY'=>'Cyprus', |
| 489 | 486 | 'CZ'=>'Czech Republic', |
| 490 | 487 | 'DK'=>'Denmark', |
| — | — | @@ -529,7 +526,7 @@ |
| 530 | 527 | 'IS'=>'Iceland', |
| 531 | 528 | 'IN'=>'India', |
| 532 | 529 | 'ID'=>'Indonesia', |
| 533 | | - //'IR'=>'Iran', |
| | 530 | + 'IR'=>'Iran', |
| 534 | 531 | 'IQ'=>'Iraq', |
| 535 | 532 | 'IE'=>'Ireland', |
| 536 | 533 | 'IL'=>'Israel', |
| — | — | @@ -637,7 +634,7 @@ |
| 638 | 635 | 'SZ'=>'Swaziland', |
| 639 | 636 | 'SE'=>'Sweden', |
| 640 | 637 | 'CH'=>'Switzerland', |
| 641 | | - //'SY'=>'Syrian Arab Republic', |
| | 638 | + 'SY'=>'Syrian Arab Republic', |
| 642 | 639 | 'TW'=>'Taiwan', |
| 643 | 640 | 'TJ'=>'Tajikistan', |
| 644 | 641 | 'TZ'=>'Tanzania', |
| Property changes on: branches/wmf/1.18wmf1/extensions/CentralNotice/CentralNotice.db.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 645 | 642 | Merged /trunk/extensions/CentralNotice/CentralNotice.db.php:r108789 |
| Property changes on: branches/wmf/1.18wmf1/extensions/CentralNotice |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 646 | 643 | Merged /trunk/extensions/CentralNotice:r108789 |
| Property changes on: branches/wmf/1.18wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 647 | 644 | Merged /trunk/extensions:r108789 |