Commit 91f73841 authored by Kristina Hoeppner's avatar Kristina Hoeppner Committed by Robert Lyon
Browse files

Bug 1684333: Change gender identification question 

To be more inclusive. This is an intermediate short-
term solution until we decide how best to remove
the question entirely without losing data or turning
it into a free form field.

behatnotneeded

Change-Id: If23b36f9b1ee0a112a8a40e41b6e2e3fa75a43bb
(cherry picked from commit d4a26e30)
parent d5e85898

htdocs/artefact/resume/index.php

+3 −3
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ $personalinformationform = pieform(array( 
                        ? $personalinformation->get_composite('gender') : null),

                    'options' => array(

                        '' => get_string('gendernotspecified', 'artefact.resume'),

                        'female' => get_string('female', 'artefact.resume'),

                        'male'   => get_string('male', 'artefact.resume'),

                        'female' => get_string('woman', 'artefact.resume'),

                        'male'   => get_string('man', 'artefact.resume'),

                    ),

                    'title' => get_string('gender', 'artefact.resume'),

                    'title' => get_string('gender1', 'artefact.resume'),

                ),

                'maritalstatus' => array(

                    'type' => 'text',

htdocs/artefact/resume/lang/en.utf8/artefact.resume.php

+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ $string['dateofbirthinvalid1'] = 'This is not a valid date of birth. Please corr 
$string['placeofbirth'] = 'Place of birth';

$string['citizenship'] = 'Citizenship';

$string['visastatus'] = 'Visa status';

$string['female'] = 'Female';

$string['male'] = 'Male';

$string['gender'] = 'Gender';

$string['woman'] = 'Woman';

$string['man'] = 'Man';

$string['gender1'] = 'Gender identity';

$string['gendernotspecified'] = '(Not specified)';

$string['maritalstatus'] = 'Marital status';

$string['resumesaved'] = 'Résumé saved';

test/behat/features/artefact/resume/resume_page.feature

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Scenario: Editing admin resume page (Bug 1426983) 
    | Citizenship | NZ |

    | Visa status | Worker |

    And I set the following fields to these values:

    | Female | 1 |

    | Woman | 1 |

    And I fill in the following:

    | Marital status | It's complicated |

    # Saving the information

htdocs/artefact/resume/db/install.xml

+6 −6

File changed.

Contains only whitespace changes.