Merge pull request #8245 from RainRat/release-3.0

fix typos

Languages/en_US/Help.php

@@ -194,7 +194,7 @@
 $helptxt['cal_short_months'] = 'If this setting is checked, month names within the calendar will be shortened.<br><br><strong>Enabled:</strong> {short} 1<br><strong>Disabled:</strong> {long} 1';
 // argument(s): $txt['days_short'][1], $txt['days'][1]
 $helptxt['cal_short_days'] = 'If this setting is checked, day names within the calendar will be shortened.<br><br><strong>Enabled:</strong> {short}<br><strong>Disabled:</strong> {long}';
-$helptxt['special_rrule_modifier'] = 'Use this to specify an offset from the value calculated by a special recurrence rule.<br><br>The value must be a postive or negative sign followed by an <a href="https://en.wikipedia.org/wiki/ISO_8601#Durations" class="bbc_link" target="_blank">ISO 8601 duration</a> specification. For example, "+P1D" means one day after the date calculated by the special recurrence rule, while "-P2D" means two days before.';
+$helptxt['special_rrule_modifier'] = 'Use this to specify an offset from the value calculated by a special recurrence rule.<br><br>The value must be a positive or negative sign followed by an <a href="https://en.wikipedia.org/wiki/ISO_8601#Durations" class="bbc_link" target="_blank">ISO 8601 duration</a> specification. For example, "+P1D" means one day after the date calculated by the special recurrence rule, while "-P2D" means two days before.';
 
 $helptxt['serversettings'] = '<strong>Server Settings</strong><br>
  Here you can perform some core configuration for your forum. This page includes the database and URL settings, as well as other

Languages/en_US/Reports.php

@@ -7,7 +7,7 @@
 $txt['generate_reports_type'] = 'Select type of Report';
 $txt['gr_type_boards'] = 'Boards';
 $txt['gr_type_desc_boards'] = 'Reports showing the current settings and access levels for each of boards on your forum.';
-$txt['gr_type_board_access'] = 'Board Accesss';
+$txt['gr_type_board_access'] = 'Board Access';
 $txt['gr_type_desc_board_access'] = 'Report on which membergroup has access to which boards on your forum.';
 $txt['gr_type_board_perms'] = 'Board Permissions';
 $txt['gr_type_desc_board_perms'] = 'Generate reports showing permissions each membergroup has across the different boards in your forum.';

Sources/Actions/Admin/Reports.php

@@ -793,7 +793,7 @@ protected function addData(array $inc_data, ?string $custom_table = null): void
  if (str_starts_with((string) $key, '#sep#')) {
  $data[$key]['separator'] = true;
  }
- // Hack in a "seperator" to display a row differently.
+ // Hack in a "separator" to display a row differently.
  elseif (str_starts_with((string) $value, '#sep#')) {
  $data[$key]['header'] = true;
  $data[$key]['v'] = substr((string) $value, 5);

Sources/Calendar/RecurrenceIterator.php

@@ -913,7 +913,7 @@ private function calculate(): void
  private function jumpToVisible(\DateTime &$current): void
  {
  if (
- // Don't jump ahead if $current is aleady in the visible range.
+ // Don't jump ahead if $current is already in the visible range.
  $current >= $this->view_start
  // Can't jump ahead if recurrence rule requires counting the occurrences.
  || isset($this->rrule->count)
@@ -1053,7 +1053,7 @@ private function limit(\DateTime $current): bool
  $allowed_values = $this->rrule->{$prop};
 
  // BYDAY values could have numerical modifiers prepended to them.
- // We only want the plain weekday abbrevations here.
+ // We only want the plain weekday abbreviations here.
  if ($prop === 'byday') {
  foreach ($allowed_values as &$allowed_value) {
  $allowed_value = substr($allowed_value, -2);
@@ -1419,7 +1419,7 @@ private function expandMonthByDay(\DateTime $current, array $expansion_values, s
  $expansion_values = $this->sortWeekdays($expansion_values);
 
  foreach ($expansion_values as $k => $v) {
- // Separate out the numerical modifer (if any) from the day name.
+ // Separate out the numerical modifier (if any) from the day name.
  preg_match('/^([+-]?\d*)(MO|TU|WE|TH|FR|SA|SU)?/', $v, $matches);
 
  $expansion_values[$k] = [
@@ -1434,7 +1434,7 @@ private function expandMonthByDay(\DateTime $current, array $expansion_values, s
  $i = 0;
 
  while ($temp <= $upperlimit) {
- // Positive modifer means nth weekday of the month.
+ // Positive modifier means nth weekday of the month.
  // E.g.: '2TH' means the second Thursday.
  if ($expansion_values[$key]['modifier'] > 0) {
  // To work nicely with PHP's parsing of 'next <dayname>',
@@ -1464,7 +1464,7 @@ private function expandMonthByDay(\DateTime $current, array $expansion_values, s
  break;
  }
  }
- // Negative modifer means nth last weekday of the month.
+ // Negative modifier means nth last weekday of the month.
  // E.g.: '-2TH' means the second last Thursday.
  elseif ($expansion_values[$key]['modifier'] < 0) {
  // To work nicely with PHP's parsing of 'previous <dayname>',
@@ -1493,7 +1493,7 @@ private function expandMonthByDay(\DateTime $current, array $expansion_values, s
  break;
  }
  }
- // No modifer means every matching weekday.
+ // No modifier means every matching weekday.
  // E.g.: 'TH' means every Thursday.
  else {
  // On the first iteration of this loop only, go to the last day
@@ -1539,7 +1539,7 @@ private function expandYearByDay(\DateTime $current, array $expansion_values, st
  $expansion_values = $this->sortWeekdays($expansion_values);
 
  foreach ($expansion_values as $k => $v) {
- // Separate out the numerical modifer (if any) from the day name.
+ // Separate out the numerical modifier (if any) from the day name.
  preg_match('/^([+-]?\d*)(MO|TU|WE|TH|FR|SA|SU)?/', $v, $matches);
 
  $expansion_values[$k] = [
@@ -1553,7 +1553,7 @@ private function expandYearByDay(\DateTime $current, array $expansion_values, st
  $key = 0;
 
  while ($temp <= $upperlimit) {
- // Positive modifer means nth weekday of the year.
+ // Positive modifier means nth weekday of the year.
  // E.g.: '2TH' means the second Thursday.
  if ($expansion_values[$key]['modifier'] > 0) {
  // To work nicely with PHP's parsing of 'next <dayname>',
@@ -1579,7 +1579,7 @@ private function expandYearByDay(\DateTime $current, array $expansion_values, st
  }
  }
  }
- // Negative modifer means nth last weekday of the year.
+ // Negative modifier means nth last weekday of the year.
  // E.g.: '-2TH' means the second last Thursday.
  elseif ($expansion_values[$key]['modifier'] < 0) {
  // To work nicely with PHP's parsing of 'previous <dayname>',
@@ -1605,7 +1605,7 @@ private function expandYearByDay(\DateTime $current, array $expansion_values, st
  }
  }
  }
- // No modifer means every matching weekday.
+ // No modifier means every matching weekday.
  // E.g.: 'TH' means every Thursday.
  else {
  $temp->modify('next ' . self::WEEKDAY_NAMES[$expansion_values[$key]['weekday']] . ' ' . $temp->format('H:i:s e'));
@@ -1642,7 +1642,7 @@ private function sortWeekdays(array $weekdays): array
  $weekday_abbrevs[] = $temp;
  }
 
- // Handle strings with numerical modifers correctly.
+ // Handle strings with numerical modifiers correctly.
  $temp = [];
 
  foreach ($weekdays as $weekday) {

Sources/Tasks/UpdateUnicode.php

@@ -2422,7 +2422,7 @@ private function build_compressed_character_script_data(): bool
  */
  private function build_regex_identifier_status(): bool
  {
- // We also need to distinguish characaters' Identifier_Status value.
+ // We also need to distinguish characters' Identifier_Status value.
  $local_file = $this->fetch_unicode_file('IdentifierStatus.txt', self::DATA_URL_SECURITY);
 
  if (empty($local_file)) {

Themes/default/scripts/event.js

@@ -125,7 +125,7 @@ function updateEventUI()
  // no break
 
  case "MONTHLY":
- // Enable both radio buttons to allow choosing the type of montly recurrence.
+ // Enable both radio buttons to allow choosing the type of monthly recurrence.
  for (const elem of document.querySelectorAll("#monthly_options input[name=\'monthly_option_type\']")) {
  elem.disabled = false;
  }