Commit bbfc38d3 authored by Doris Tam's avatar Doris Tam 🌷
Browse files

Bug 1100980: Changing the expiry type form language strings to lowercase 

To be more appropriate gramatically as they are used only at the end of sentences.

behatnotneeded

Change-Id: Iedca86f1ddaf43b8bda5b193beadc9c45b5fe70e
parent 35da77ca

htdocs/auth/lib.php

+1 −1
Original line number Diff line number Diff line
@@ -3222,7 +3222,7 @@ function auth_register_submit(Pieform $form, $values) { 
                $expirystring = get_config('defaultregistrationexpirylifetime') . ' ' . get_string('seconds', 'performance');

            }

            else if ($expirytime['units'] == 'noenddate') {

                $expirystring = get_string('element.expiry.noenddate.lowercase', 'pieforms');

                $expirystring = get_string('element.expiry.noenddate', 'pieforms');

            }

            else {

                $expirystring = get_string('element.expiry.' . $expirytime['units'] . '.lowercase', 'pieforms', $expirytime['number'], $expirytime['number']);

htdocs/lang/en.utf8/pieforms.php

+5 −6
Original line number Diff line number Diff line
@@ -57,12 +57,11 @@ $string['element.expiry.years.lowercase'] = array( 
    1 => '%s years'

);



$string['element.expiry.days'] = 'Days';

$string['element.expiry.weeks'] = 'Weeks';

$string['element.expiry.months'] = 'Months';

$string['element.expiry.years'] = 'Years';

$string['element.expiry.noenddate'] = 'No end date';

$string['element.expiry.noenddate.lowercase'] = 'no end date';

$string['element.expiry.days'] = 'days';

$string['element.expiry.weeks'] = 'weeks';

$string['element.expiry.months'] = 'months';

$string['element.expiry.years'] = 'years';

$string['element.expiry.noenddate'] = 'no end date';



$string['element.files.addattachment'] = 'Add attachment';

test/behat/features/settings/site_option_configuration.feature

+1 −1
Original line number Diff line number Diff line
@@ -53,6 +53,6 @@ Scenario: Setting default account lifetime 
 Given I log in as "admin" with password "Kupuh1pa!"

 And I choose "Site options" in "Configure site" from administration menu

 And I expand all fieldsets

 And I select "Weeks" from "siteoptions_defaultaccountlifetime_units"

 And I select "weeks" from "siteoptions_defaultaccountlifetime_units"

 And I fill in "10" for "siteoptions_defaultaccountlifetime"

 And I press "Update site options"