https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112943
Revision: 112943 Author: jeroendedauw Date: 2012-03-03 12:07:23 +0000 (Sat, 03 Mar 2012) Log Message: ----------- address http://education.wmflabs.org/index.php/Thread:MW_1.18_talk:Community_portal/City_value_required Modified Paths: -------------- trunk/extensions/EducationProgram/EducationProgram.i18n.php trunk/extensions/EducationProgram/EducationProgram.settings.php trunk/extensions/EducationProgram/actions/EditOrgAction.php Modified: trunk/extensions/EducationProgram/EducationProgram.i18n.php =================================================================== --- trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-03-03 12:00:30 UTC (rev 112942) +++ trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-03-03 12:07:23 UTC (rev 112943) @@ -372,6 +372,10 @@ 'orgpage-edit-undelete-revisions' => 'This institution has been deleted. You can $1.', 'orgpage-edit-undelete-link' => 'restore $1 {{PLURAL:$1|revision|revisions}}', + 'educationprogram-org-invalid-name' => 'The name needs to be at least contain $1 {{PLURAL:$1|character|characters}}.', + 'educationprogram-org-invalid-city' => 'The city name needs to be at least contain $1 {{PLURAL:$1|character|characters}}.', + 'educationprogram-org-invalid-country' => 'This is not a valid country.', + // Course editing 'orgpage-edit-legend-add' => 'Add course', 'orgpage-edit-legend-edit' => 'Edit course', Modified: trunk/extensions/EducationProgram/EducationProgram.settings.php =================================================================== --- trunk/extensions/EducationProgram/EducationProgram.settings.php 2012-03-03 12:00:30 UTC (rev 112942) +++ trunk/extensions/EducationProgram/EducationProgram.settings.php 2012-03-03 12:07:23 UTC (rev 112943) @@ -33,6 +33,7 @@ 'wikimedia.org' ), 'ambassadorCommonsUrl' => 'https://commons.wikimedia.org/wiki/Special:UploadWizard', + 'citylessCountries' => array( 'BT', 'BV', 'IO', 'VG', 'TD', 'CX', 'CC', 'KM', 'DJ', 'GQ', 'FK', 'FX', 'TF', 'GW', 'HM', 'KI', 'YT', 'MS', 'NR', 'NU', 'NF', 'PN', 'SH', 'PM', 'WS', 'SC', 'GS', 'SJ', 'TK', 'TP', 'TV', 'UM', 'VU', 'EH' ), ); } Modified: trunk/extensions/EducationProgram/actions/EditOrgAction.php =================================================================== --- trunk/extensions/EducationProgram/actions/EditOrgAction.php 2012-03-03 12:00:30 UTC (rev 112942) +++ trunk/extensions/EducationProgram/actions/EditOrgAction.php 2012-03-03 12:07:23 UTC (rev 112943) @@ -16,7 +16,7 @@ /** * Constructor. - * + *Re * @since 0.1 * * @param Page $page @@ -71,12 +71,15 @@ $fields['city'] = array ( 'type' => 'text', 'label-message' => 'educationprogram-org-edit-city', - 'required' => true, 'validation-callback' => function ( $value, array $alldata = null ) { - return strlen( $value ) < 2 ? wfMsg( 'educationprogram-org-invalid-city' ) : true; + return $value !== '' && strlen( $value ) < 2 ? wfMsg( 'educationprogram-org-invalid-city' ) : true; } , ); + if ( !in_array( $this->getRequest()->getText( 'wpitem-country', '' ), EPSettings::get( 'citylessCountries' ) ) ) { + $fields['city']['required'] = true; + } + $fields['country'] = array ( 'type' => 'select', 'label-message' => 'educationprogram-org-edit-country', _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
