From 4c639bbe3e8f13c9b3c421547263a4ef23294917 Mon Sep 17 00:00:00 2001
From: Mark Nelson <mdjnelson@gmail.com>
Date: Tue, 28 May 2019 14:20:30 +0800
Subject: [PATCH] Minor changes (#185)

---
 element/daterange/lang/en/customcertelement_daterange.php | 8 ++++----
 element/daterange/tests/{phpunit => }/element_test.php    | 2 +-
 .../{phpunit => }/fixtures/fake_datarange_element.php     | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename element/daterange/tests/{phpunit => }/element_test.php (99%)
 rename element/daterange/tests/{phpunit => }/fixtures/fake_datarange_element.php (100%)

diff --git a/element/daterange/lang/en/customcertelement_daterange.php b/element/daterange/lang/en/customcertelement_daterange.php
index cecb0a0..b8037d8 100644
--- a/element/daterange/lang/en/customcertelement_daterange.php
+++ b/element/daterange/lang/en/customcertelement_daterange.php
@@ -30,11 +30,11 @@ $string['coursegradedate'] = 'Course grade date';
 $string['coursestartdate'] = 'Course start date';
 $string['dateitem'] = 'Date item';
 $string['dateitem_help'] = 'This will be the date that is printed on the certificate';
-$string['dateranges'] = 'Dateranges';
+$string['dateranges'] = 'Date ranges';
 $string['fallbackstring'] = 'Fallback string';
-$string['fallbackstring_help'] = 'This string will be displayed if no daterange applies to a date. If Fallback string is not set, then there will be no output at all.';
-$string['help'] = 'Configure a string representation for each daterange. Make sure your ranges do not overlap, otherwise the first matched daterange will be applied. If no daterange matched a date, then Fallback string will be displayed. If Fallback string is not set, then there will be no output.<br/> If you mark a date range as Recurring, then the configured year will not be considered. As the year of a recurring date range is not considered, you are not allowed to configure a recurring date range with more than 12 months as it would become ambiguous otherwise.';
-$string['placeholders'] = 'Also following placeholders could be used in the string representation or fallback string. <br/> {{range_first_year}} - first year of the matched range,<br/> {{range_last_year}} - last year of the matched range,<br/> {{recurring_range_first_year}} - first year of the matched recurring period,<br/> {{recurring_range_last_year}} - last year of the matched recurring period,<br/> {{current_year}} - the current year,<br/>  {{date_year}} - a year of the users\'s date.';
+$string['fallbackstring_help'] = 'This string will be displayed if no date range applies to a date. If the fallback string is not set, then there will be no output at all.';
+$string['help'] = 'Configure a string representation for each date range. Make sure your ranges do not overlap, otherwise the first matched date range will be applied. If no date range matches then the fallback string will be displayed (if it is set).<br/><br /> If you mark a date range as recurring, then the configured year will not be considered.';
+$string['placeholders'] = 'The following placeholders can be used in the string representation or fallback string. <br/><br /> {{range_first_year}} - first year of the matched range,<br/> {{range_last_year}} - last year of the matched range,<br/> {{recurring_range_first_year}} - first year of the matched recurring period,<br/> {{recurring_range_last_year}} - last year of the matched recurring period,<br/> {{current_year}} - the current year,<br/>  {{date_year}} - a year of the users\'s date.';
 $string['issueddate'] = 'Issued date';
 $string['pluginname'] = 'Date range';
 $string['privacy:metadata'] = 'The Date range plugin does not store any personal data.';
diff --git a/element/daterange/tests/phpunit/element_test.php b/element/daterange/tests/element_test.php
similarity index 99%
rename from element/daterange/tests/phpunit/element_test.php
rename to element/daterange/tests/element_test.php
index 1936746..7ac47af 100644
--- a/element/daterange/tests/phpunit/element_test.php
+++ b/element/daterange/tests/element_test.php
@@ -25,7 +25,7 @@ defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
 
-require_once($CFG->dirroot . '/mod/customcert/element/daterange/tests/phpunit/fixtures/fake_datarange_element.php');
+require_once($CFG->dirroot . '/mod/customcert/element/daterange/tests/fixtures/fake_datarange_element.php');
 
 class customcertelement_daterange_element_test extends advanced_testcase {
 
diff --git a/element/daterange/tests/phpunit/fixtures/fake_datarange_element.php b/element/daterange/tests/fixtures/fake_datarange_element.php
similarity index 100%
rename from element/daterange/tests/phpunit/fixtures/fake_datarange_element.php
rename to element/daterange/tests/fixtures/fake_datarange_element.php