From 2903326d0d5a16bc04722eaa24a8cbe4c6345fca Mon Sep 17 00:00:00 2001 From: Daniel Thee Roperto Date: Mon, 3 Oct 2016 10:18:35 +1100 Subject: [PATCH] Issue #36 - Changed english titles to conform with plugin contribution checklist. --- lang/en/auth_outage.php | 24 ++++++++++++------------ tests/behat/default_settings.feature | 2 +- tests/behat/manage_outages.feature | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lang/en/auth_outage.php b/lang/en/auth_outage.php index b77d248..f290968 100644 --- a/lang/en/auth_outage.php +++ b/lang/en/auth_outage.php @@ -62,11 +62,11 @@ $string['clone'] = 'Clone'; $string['datetimeformat'] = '%a %d %h %Y at %I:%M%P %Z'; $string['defaultlayoutcss'] = 'Layout CSS'; $string['defaultlayoutcssdescription'] = 'This CSS code will be used to display the Outage Warning Bar.'; -$string['defaultoutageautostart'] = 'Outage Auto Start'; +$string['defaultoutageautostart'] = 'Outage auto start'; $string['defaultoutageautostartdescription'] = 'If the outage should automatically trigger maintenance mode once it starts, locking down the whole site.'; -$string['defaultoutageduration'] = 'Outage Duration'; +$string['defaultoutageduration'] = 'Outage duration'; $string['defaultoutagedurationdescription'] = 'Default duration (in minutes) of an outage.'; -$string['defaultwarningduration'] = 'Warning Duration'; +$string['defaultwarningduration'] = 'Warning duration'; $string['defaultwarningdurationdescription'] = 'Default warning time (in minutes) for outages.'; $string['defaulttitle'] = 'Title'; $string['defaulttitledescription'] = 'Default title for outages. Use {{start}} and {{stop}} placeholders as required.'; @@ -84,7 +84,7 @@ $string['infountil'] = 'Until:'; $string['infostart'] = 'start'; $string['infostartofwarning'] = 'start of warning'; $string['infopagestaticgenerated'] = 'This warning was generated on {$a->time}.'; -$string['menudefaults'] = 'Default Settings'; +$string['menudefaults'] = 'Default settings'; $string['menumanage'] = 'Manage'; $string['messageoutagebackonline'] = 'We are back online!'; $string['messageoutagebackonlinedescription'] = 'You may resume browsing safely.'; @@ -92,18 +92,18 @@ $string['messageoutageongoing'] = 'Back online at {$a->stop}.'; $string['messageoutagewarning'] = 'Shutting down in {{countdown}}'; $string['na'] = 'n/a'; $string['notfound'] = 'No outages found.'; -$string['outageedit'] = 'Edit Outage'; +$string['outageedit'] = 'Edit outage'; $string['outageeditcrumb'] = 'Edit'; -$string['outageclone'] = 'Clone Outage'; +$string['outageclone'] = 'Clone outage'; $string['outageclonecrumb'] = 'Clone'; -$string['outagecreate'] = 'Create Outage'; +$string['outagecreate'] = 'Create outage'; $string['outagecreatecrumb'] = 'Create'; -$string['outagedelete'] = 'Delete Outage'; +$string['outagedelete'] = 'Delete outage'; $string['outagedeletewarning'] = 'You are about to permanently delete the outage below. This cannot be undone.'; -$string['outageduration'] = 'Outage Duration'; +$string['outageduration'] = 'Outage duration'; $string['outagedurationerrorinvalid'] = 'Outage duration must be positive.'; $string['outageduration_help'] = 'How long the outage lasts after it starts.'; -$string['outagefinish'] = 'Finish Outage'; +$string['outagefinish'] = 'Finish outage'; $string['outagefinishwarning'] = 'You are about to mark this outage as finished. The system will be immediately back online.'; $string['outageslistfuture'] = 'Planned outages'; $string['outageslistpast'] = 'Outage history'; @@ -111,8 +111,8 @@ $string['pluginname'] = 'Outage manager'; $string['starttime'] = 'Start date and time'; $string['starttime_help'] = 'At which date and time the outage starts, preventing general access to the system.'; $string['tableheaderduration'] = 'Duration'; -$string['tableheaderdurationplanned'] = 'Planned Duration'; -$string['tableheaderdurationactual'] = 'Actual Duration'; +$string['tableheaderdurationplanned'] = 'Planned duration'; +$string['tableheaderdurationactual'] = 'Actual duration'; $string['tableheaderstarttime'] = 'Starts on'; $string['tableheaderwarnbefore'] = 'Warns before'; $string['tableheadertitle'] = 'Title'; diff --git a/tests/behat/default_settings.feature b/tests/behat/default_settings.feature index 033db49..bd97324 100644 --- a/tests/behat/default_settings.feature +++ b/tests/behat/default_settings.feature @@ -13,7 +13,7 @@ Feature: Change the default settings Scenario Outline: Check if I can save the default settings. - When I navigate to "Default Settings" node in "Site administration > Plugins > Authentication > Outage manager" + When I navigate to "Default settings" node in "Site administration > Plugins > Authentication > Outage manager" And I set the following fields to these values: | s_auth_outage_default_autostart | | | s_auth_outage_default_warning_duration[v] | | diff --git a/tests/behat/manage_outages.feature b/tests/behat/manage_outages.feature index 0bc6365..ce4eb38 100644 --- a/tests/behat/manage_outages.feature +++ b/tests/behat/manage_outages.feature @@ -61,7 +61,7 @@ Feature: Manage outages Scenario: Create an outage using defaults. Given I am on Outage Management Page - When I press "Create Outage" + When I press "Create outage" And I press "Save changes" And I should not see "No outages found." in the "#section_planned_outages" "css_element" And I should see "No outages found." in the "#section_outage_history" "css_element" @@ -79,7 +79,7 @@ Feature: Manage outages Given there is a waiting outage And I am on Outage Management Page When I click on the Clone action button - Then I should see "Clone Outage" + Then I should see "Clone outage" And I set the field "title" to "My cloned outage" And I press "Save changes" Then I should see "Example of waiting outage" @@ -91,7 +91,7 @@ Feature: Manage outages And I am on Outage Management Page And I should see "Example of warning outage" When I click on the Edit action button - Then I should see "Edit Outage" + Then I should see "Edit outage" And I set the field "title" to "My previous warning outage" And I press "Save changes" Then I should not see "Example of warning outage" @@ -103,7 +103,7 @@ Feature: Manage outages And I am on Outage Management Page And I should see "Example of warning outage" When I click on the Delete action button - Then I should see "Delete Outage" + Then I should see "Delete outage" And I should see "Example of warning outage" Then I press "Delete" And I should not see "Example of warning outage" @@ -114,7 +114,7 @@ Feature: Manage outages And I am on Outage Management Page And I should see "Example of ongoing outage" in the "#section_planned_outages" "css_element" When I click on the Finish action button - Then I should see "Finish Outage" + Then I should see "Finish outage" And I should see "Example of ongoing outage" Then I click on "input[value='Finish']" "css_element" And I should not see "Example of ongoing outage" in the "#section_planned_outages" "css_element"