diff options
Diffstat (limited to 'app')
85 files changed, 370 insertions, 370 deletions
diff --git a/app/Auth.php b/app/Auth.php index bcad5ccfd1..7744bf6fa1 100644 --- a/app/Auth.php +++ b/app/Auth.php @@ -136,7 +136,7 @@ class Auth { } /** - * Is the current visitor a search engine? The global is set in session.php + * Is the current visitor a search engine? The global is set in session.php * * @return bool */ diff --git a/app/Census/CensusOfDenmark1890.php b/app/Census/CensusOfDenmark1890.php index 9e21f32f3d..5ef128a0cd 100644 --- a/app/Census/CensusOfDenmark1890.php +++ b/app/Census/CensusOfDenmark1890.php @@ -37,7 +37,7 @@ class CensusOfDenmark1890 extends CensusOfDenmark implements CensusInterface { return array( new CensusColumnFullName($this, 'Navn', 'Samtlige Personers fulde Navn.'), new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'), - new CensusColumnAge($this, 'Alder', 'Alder. Alderen anføres med det fyldte Aar, men for Børn, der ikke have fyldt 1 Aar, anføres „Under 1 Aar“ of Fødselsdagen.'), + new CensusColumnAge($this, 'Alder', 'Alder. Alderen anføres med det fyldte Aar, men for Børn, der ikke have fyldt 1 Aar, anføres „Under 1 Aar“ of Fødselsdagen.'), new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).'), new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund („Folkekirken“ eller andetSamfund, saasom „det frilutheranske“, „det romersk katholske“, det „mosaiske“ o.s.v.).'), new CensusColumnBirthPlace($this, 'Fødested', 'Fødested, nemlig Sognets og Amtets eller Kjøbstadens (eller Handelpladsens) Navn, og for de i Bilandene Fødte samt for Udlændinge Landet, hvori de ere fødte.'), diff --git a/app/Census/CensusOfDenmark1940.php b/app/Census/CensusOfDenmark1940.php index 1b50304f1d..ce21982073 100644 --- a/app/Census/CensusOfDenmark1940.php +++ b/app/Census/CensusOfDenmark1940.php @@ -37,14 +37,14 @@ class CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface { return array( new CensusColumnSurnameGivenNames($this, 'Navn', ''), new CensusColumnNull($this, 'Nærværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg nærværende d.v.s. har fast Bopæl ????? (er optaget under en anden Address i Folkeregistret), anføres her den faste Bopæls Adresse (Kommunens Navn og den fuldstændige Adresse i denne; for Udlændinge dog kun Landets Navn).'), - new CensusColumnNull($this, 'Fraværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg fraværende d.v.s. har fast Bopæl paa Tællingsstedet (er optaget underdenne Address i Folkeregistret), men den 5. Novemer ikke er til Stede paa Tællingsstedet, anføres her „fraværende“ og Adressen paa det midlertidige Opholdssted (ved Ophold i Udlandet anføres jun Landets Navn).'), + new CensusColumnNull($this, 'Fraværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg fraværende d.v.s. har fast Bopæl paa Tællingsstedet (er optaget underdenne Address i Folkeregistret), men den 5. Novemer ikke er til Stede paa Tællingsstedet, anføres her „fraværende“ og Adressen paa det midlertidige Opholdssted (ved Ophold i Udlandet anføres jun Landets Navn).'), new CensusColumnSexMK($this, 'Køn', 'Køn Mand (M) Kvinde (K)'), new CensusColumnBirthDaySlashMonth($this, 'Fødselsdag', ''), new CensusColumnBirthYear($this, 'Fødselsaar', ''), new CensusColumnBirthPlace($this, 'Fødested', ''), new CensusColumnNull($this, 'Statsbergerferhold', ''), new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'), - new CensusColumnNull($this, 'Indgaaelse', 'Date for det nuværende Ægteskabs Indgaaelse. NB." RUbrikken udfyldes ikke al Enkemaend, Enker, Separerede eller Fraskilte.'), + new CensusColumnNull($this, 'Indgaaelse', 'Date for det nuværende Ægteskabs Indgaaelse. NB." RUbrikken udfyldes ikke al Enkemaend, Enker, Separerede eller Fraskilte.'), new CensusColumnRelationToHead($this, 'Stilling i familien', ''), new CensusColumnOccupation($this, 'Erhverv', ''), new CensusColumnNull($this, 'Virksomhedens', 'Virksomhedens (Branchens) Art'), diff --git a/app/Census/CensusOfUnitedStates1890.php b/app/Census/CensusOfUnitedStates1890.php index 27eca4dcb7..99e7bb536a 100644 --- a/app/Census/CensusOfUnitedStates1890.php +++ b/app/Census/CensusOfUnitedStates1890.php @@ -41,7 +41,7 @@ class CensusOfUnitedStates1890 extends CensusOfUnitedStates implements CensusInt new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of family'), new CensusColumnNull($this, 'Race', 'Whether white, black, mulatto, quadroon, octoroon, Chinese, Japanese, or Indian'), new CensusColumnSexMF($this, 'Sex', 'Sex'), - new CensusColumnAge($this, 'Age', 'Age at nearest birthday. If under one year, give age in months'), + new CensusColumnAge($this, 'Age', 'Age at nearest birthday. If under one year, give age in months'), new CensusColumnNull($this, 'Condition', 'Whether single, married, widowed, or divorced'), new CensusColumnMonthIfMarriedWithinYear($this, 'Mar', 'Whether married duirng the census year (June 1, 1889, to May 31, 1890)'), new CensusColumnNull($this, 'Children', 'Mother of how many children, and number of these children living'), @@ -55,7 +55,7 @@ class CensusOfUnitedStates1890 extends CensusOfUnitedStates implements CensusInt new CensusColumnNull($this, 'Unemployed', 'Months unemployed during the census year (June 1, 1889, to May 31, 1890)'), new CensusColumnNull($this, 'Read', 'Able to read'), new CensusColumnNull($this, 'Write', 'Able to write'), - new CensusColumnNull($this, 'English', 'Able to speak English. If not the language or dialect spoken'), + new CensusColumnNull($this, 'English', 'Able to speak English. If not the language or dialect spoken'), new CensusColumnNull($this, 'Disease', 'Whether suffering from acute or chronic disease, with name of disease and length of time afflicted'), new CensusColumnNull($this, 'Infirm', 'Whether defective in mind, sight, hearing, or speech, or whether crippled, maimed, or deformed, with name of defect'), new CensusColumnNull($this, 'Prisoner', 'Whether a prisoner, convict, homeless child, or pauper'), diff --git a/app/Config.php b/app/Config.php index 70b08bc131..b7e8b50064 100644 --- a/app/Config.php +++ b/app/Config.php @@ -16,7 +16,7 @@ namespace Fisharebest\Webtrees; /** - * Application configuration data. Data here has no GUI to edit it, + * Application configuration data. Data here has no GUI to edit it, * although most of it can be altered to customise local installations. */ class Config { diff --git a/app/Controller/AdvancedSearchController.php b/app/Controller/AdvancedSearchController.php index 98ad882e96..851a95b312 100644 --- a/app/Controller/AdvancedSearchController.php +++ b/app/Controller/AdvancedSearchController.php @@ -400,7 +400,7 @@ class AdvancedSearchController extends SearchController { } $sql .= ' AND (' . implode(' OR ', $sdx) . ')'; } else { - // No phonetic content? Use a substring match + // No phonetic content? Use a substring match $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')"; $bind[] = $value; } @@ -416,7 +416,7 @@ class AdvancedSearchController extends SearchController { } $sql .= ' AND (' . implode(' OR ', $sdx) . ')'; } else { - // No phonetic content? Use a substring match + // No phonetic content? Use a substring match $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')"; $bind[] = $value; } @@ -447,7 +447,7 @@ class AdvancedSearchController extends SearchController { } $sql .= " AND (" . implode(' OR ', $sdx) . ")"; } else { - // No phonetic content? Use a substring match + // No phonetic content? Use a substring match $sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')"; $bind[] = $value; } @@ -464,7 +464,7 @@ class AdvancedSearchController extends SearchController { $sql .= " AND (" . implode(' OR ', $sdx) . ")"; break; } else { - // No phonetic content? Use a substring match + // No phonetic content? Use a substring match $sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')"; $bind[] = $value; } @@ -549,7 +549,7 @@ class AdvancedSearchController extends SearchController { } $sql .= ' AND (' . implode(' OR ', $sdx) . ')'; } else { - // No phonetic content? Use a substring match + // No phonetic content? Use a substring match $sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')"; $bind[] = $value; } @@ -566,7 +566,7 @@ class AdvancedSearchController extends SearchController { $sql .= ' AND (' . implode(' OR ', $sdx) . ')'; break; } else { - // No phonetic content? Use a substring match + // No phonetic content? Use a substring match $sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')"; $bind[] = $value; } @@ -596,7 +596,7 @@ class AdvancedSearchController extends SearchController { } $sql .= ' AND (' . implode(' OR ', $sdx) . ')'; } else { - // No phonetic content? Use a substring match + // No phonetic content? Use a substring match $sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')"; $bind[] = $value; } @@ -612,7 +612,7 @@ class AdvancedSearchController extends SearchController { } $sql .= ' AND (' . implode(' OR ', $sdx) . ')'; } else { - // No phonetic content? Use a substring match + // No phonetic content? Use a substring match $sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')"; $bind[] = $value; } diff --git a/app/Controller/BranchesController.php b/app/Controller/BranchesController.php index 1e5609b54f..74d3e04546 100644 --- a/app/Controller/BranchesController.php +++ b/app/Controller/BranchesController.php @@ -186,7 +186,7 @@ class BranchesController extends PageController { * @return string */ private function getDescendantsHtml(Individual $individual, Family $parents = null) { - // A person has many names. Select the one that matches the searched surname + // A person has many names. Select the one that matches the searched surname $person_name = ''; foreach ($individual->getAllNames() as $name) { list($surn1) = explode(",", $name['sort']); @@ -202,7 +202,7 @@ class BranchesController extends PageController { } } - // No matching name? Typically children with a different surname. The branch stops here. + // No matching name? Typically children with a different surname. The branch stops here. if (!$person_name) { return '<li title="' . strip_tags($individual->getFullName()) . '">' . $individual->getSexImage() . '…</li>'; } @@ -278,7 +278,7 @@ class BranchesController extends PageController { } /** - * Convert a SOSA number into a generation number. e.g. 8 = great-grandfather = 3 generations + * Convert a SOSA number into a generation number. e.g. 8 = great-grandfather = 3 generations * * @param int $sosa * diff --git a/app/Controller/ChartController.php b/app/Controller/ChartController.php index 21ca7ebf93..7917f797c6 100644 --- a/app/Controller/ChartController.php +++ b/app/Controller/ChartController.php @@ -48,7 +48,7 @@ class ChartController extends PageController { $rootid = Filter::get('rootid', WT_REGEX_XREF); $this->root = Individual::getInstance($rootid, $WT_TREE); if (!$this->root) { - // Missing root individual? Show the chart for someone. + // Missing root individual? Show the chart for someone. $this->root = $this->getSignificantIndividual(); } @@ -89,7 +89,7 @@ class ChartController extends PageController { } /** - * Find the direct-line ancestors of an individual. Array indexes are SOSA numbers. + * Find the direct-line ancestors of an individual. Array indexes are SOSA numbers. * * @param int $generations * diff --git a/app/Controller/FamilyController.php b/app/Controller/FamilyController.php index 9b1b2d4401..b1fe3774db 100644 --- a/app/Controller/FamilyController.php +++ b/app/Controller/FamilyController.php @@ -96,7 +96,7 @@ class FamilyController extends GedcomRecordController { // delete if (Auth::isEditor($this->record->getTree())) { $menu->addSubmenu(new Menu(I18N::translate('Delete'), '#', 'menu-fam-del', array( - 'onclick' => 'return delete_family("' . I18N::translate('Deleting the family will unlink all of the individuals from each other but will leave the individuals in place. Are you sure you want to delete this family?') . '", "' . $this->record->getXref() . '");', + 'onclick' => 'return delete_family("' . I18N::translate('Deleting the family will unlink all of the individuals from each other but will leave the individuals in place. Are you sure you want to delete this family?') . '", "' . $this->record->getXref() . '");', ))); } @@ -110,7 +110,7 @@ class FamilyController extends GedcomRecordController { // add to favorites if (Module::getModuleByName('user_favorites')) { $menu->addSubmenu(new Menu( - /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), + /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), '#', 'menu-fam-addfav', array( diff --git a/app/Controller/GedcomRecordController.php b/app/Controller/GedcomRecordController.php index a02498e3d7..372c77ce8c 100644 --- a/app/Controller/GedcomRecordController.php +++ b/app/Controller/GedcomRecordController.php @@ -61,7 +61,7 @@ class GedcomRecordController extends PageController { } } foreach ($this->record->getFacts('NOTE|SOUR|OBJE') as $fact) { - // These can be links or inline. Only delete links. + // These can be links or inline. Only delete links. if (!$fact->isPendingDeletion() && $fact->getTarget() === null && preg_match('/^@.*@$/', $fact->getValue())) { $this->record->deleteFact($fact->getFactId(), false); FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $this->record->getFullName(), $fact->getValue())); @@ -123,7 +123,7 @@ class GedcomRecordController extends PageController { // add to favorites if (Module::getModuleByName('user_favorites')) { $menu->addSubmenu(new Menu( - /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), + /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), '#', 'menu-record-addfav', array( diff --git a/app/Controller/IndividualController.php b/app/Controller/IndividualController.php index ab2883dc20..07854489a3 100644 --- a/app/Controller/IndividualController.php +++ b/app/Controller/IndividualController.php @@ -273,7 +273,7 @@ class IndividualController extends GedcomRecordController { 'onclick' => 'return false;', )); - // What behaviour shall we give the main menu? If we leave it blank, the framework + // What behaviour shall we give the main menu? If we leave it blank, the framework // will copy the first submenu - which may be edit-raw or delete. // As a temporary solution, make it edit the name if (Auth::isEditor($this->record->getTree())) { @@ -330,7 +330,7 @@ class IndividualController extends GedcomRecordController { // add to favorites if (Module::getModuleByName('user_favorites')) { $menu->addSubmenu(new Menu( - /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), + /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), '#', 'menu-indi-addfav', array( 'onclick' => 'jQuery.post("module.php?mod=user_favorites&mod_action=menu-add-favorite",{xref:"' . $this->record->getXref() . '"},function(){location.reload();})', diff --git a/app/Controller/MediaController.php b/app/Controller/MediaController.php index cc15dcaadf..666f85f011 100644 --- a/app/Controller/MediaController.php +++ b/app/Controller/MediaController.php @@ -81,7 +81,7 @@ class MediaController extends GedcomRecordController { // add to favorites if (Module::getModuleByName('user_favorites')) { $menu->addSubmenu(new Menu( - /* I18N: Menu option. Add [the current page] to the list of favorites */ + /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), '#', 'menu-obje-addfav', diff --git a/app/Controller/NoteController.php b/app/Controller/NoteController.php index b04ae6b3c5..d1713d35e9 100644 --- a/app/Controller/NoteController.php +++ b/app/Controller/NoteController.php @@ -53,7 +53,7 @@ class NoteController extends GedcomRecordController { // add to favorites if (Module::getModuleByName('user_favorites')) { $menu->addSubmenu(new Menu( - /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), + /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), '#', 'menu-note-addfav', array( diff --git a/app/Controller/RepositoryController.php b/app/Controller/RepositoryController.php index 8fa821c9e7..b9f425105b 100644 --- a/app/Controller/RepositoryController.php +++ b/app/Controller/RepositoryController.php @@ -69,7 +69,7 @@ class RepositoryController extends GedcomRecordController { // add to favorites if (Module::getModuleByName('user_favorites')) { $menu->addSubmenu(new Menu( - /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), + /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), '#', 'menu-repo-addfav', array( diff --git a/app/Controller/SourceController.php b/app/Controller/SourceController.php index cba149a408..5a0f1deea7 100644 --- a/app/Controller/SourceController.php +++ b/app/Controller/SourceController.php @@ -69,7 +69,7 @@ class SourceController extends GedcomRecordController { // add to favorites if (Module::getModuleByName('user_favorites')) { $menu->addSubmenu(new Menu( - /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), + /* I18N: Menu option. Add [the current page] to the list of favorites */ I18N::translate('Add to favorites'), '#', 'menu-sour-addfav', array( diff --git a/app/Database.php b/app/Database.php index eaa9a9fbe9..a935111720 100644 --- a/app/Database.php +++ b/app/Database.php @@ -304,7 +304,7 @@ class Database { Site::setPreference($schema_name, ++$current_version); } } catch (PDOException $ex) { - // The schema update scripts should never fail. If they do, there is no clean recovery. + // The schema update scripts should never fail. If they do, there is no clean recovery. FlashMessages::addMessage($ex->getMessage(), 'danger'); header('Location: ' . WT_BASE_URL . 'site-unavailable.php'); throw $ex; diff --git a/app/Date.php b/app/Date.php index e8d7e8523c..8f1255ee21 100644 --- a/app/Date.php +++ b/app/Date.php @@ -32,7 +32,7 @@ use Fisharebest\Webtrees\Date\RomanDate; * midnight, solar midnight, sunset, sunrise, etc.), we convert on the basis of * midday. * - * We assume that years start on the first day of the first month. Where + * We assume that years start on the first day of the first month. Where * this is not the case (e.g. England prior to 1752), we need to use modified * years or the OS/NS notation "4 FEB 1750/51". */ @@ -569,9 +569,9 @@ class Date { } /** - * Calculate the gregorian year for a date. This should NOT be used internally + * Calculate the gregorian year for a date. This should NOT be used internally * within WT - we should keep the code "calendar neutral" to allow support for - * jewish/arabic users. This is only for interfacing with external entities, + * jewish/arabic users. This is only for interfacing with external entities, * such as the ancestry.com search interface or the dated fact icons. * * @return int diff --git a/app/Date/CalendarDate.php b/app/Date/CalendarDate.php index 9db4a8d2ff..42c1b0d73e 100644 --- a/app/Date/CalendarDate.php +++ b/app/Date/CalendarDate.php @@ -363,13 +363,13 @@ class CalendarDate { if ($translated_day_names === null) { $translated_day_names = array( - 0 => /* I18N: abbreviation for Monday */ I18N::translate('Mon'), - 1 => /* I18N: abbreviation for Tuesday */ I18N::translate('Tue'), + 0 => /* I18N: abbreviation for Monday */ I18N::translate('Mon'), + 1 => /* I18N: abbreviation for Tuesday */ I18N::translate('Tue'), 2 => /* I18N: abbreviation for Wednesday */ I18N::translate('Wed'), - 3 => /* I18N: abbreviation for Thursday */ I18N::translate('Thu'), - 4 => /* I18N: abbreviation for Friday */ I18N::translate('Fri'), - 5 => /* I18N: abbreviation for Saturday */ I18N::translate('Sat'), - 6 => /* I18N: abbreviation for Sunday */ I18N::translate('Sun'), + 3 => /* I18N: abbreviation for Thursday */ I18N::translate('Thu'), + 4 => /* I18N: abbreviation for Friday */ I18N::translate('Fri'), + 5 => /* I18N: abbreviation for Saturday */ I18N::translate('Sat'), + 6 => /* I18N: abbreviation for Sunday */ I18N::translate('Sun'), ); } @@ -453,7 +453,7 @@ class CalendarDate { $dm += $this->calendar->monthsInYear(); $dy--; } - // Not a full age? Then just the years + // Not a full age? Then just the years if (!$full) { return $dy; } @@ -525,7 +525,7 @@ class CalendarDate { return $this->calendar->daysInMonth($this->y, $this->m); } catch (\InvalidArgumentException $ex) { // calendar.php calls this with "DD MMM" dates, for which we cannot calculate - // the length of a month. Should we validate this before calling this function? + // the length of a month. Should we validate this before calling this function? return 0; } } @@ -781,7 +781,7 @@ class CalendarDate { /** * Generate the %y format for a date. * - * NOTE Short year is NOT a 2-digit year. It is for calendars such as hebrew + * NOTE Short year is NOT a 2-digit year. It is for calendars such as hebrew * which have a 3-digit form of 4-digit years. * * @return string @@ -840,7 +840,7 @@ class CalendarDate { } /** - * Which months follows this one? Calendars with leap-months should provide their own implementation. + * Which months follows this one? Calendars with leap-months should provide their own implementation. * * @return int[] */ diff --git a/app/Date/HijriDate.php b/app/Date/HijriDate.php index 411b9c1004..5869332fe6 100644 --- a/app/Date/HijriDate.php +++ b/app/Date/HijriDate.php @@ -55,18 +55,18 @@ class HijriDate extends CalendarDate { if ($translated_month_names === null) { $translated_month_names = array( 0 => '', - 1 => /* I18N: http://en.wikipedia.org/wiki/Muharram */ I18N::translateContext('NOMINATIVE', 'Muharram'), - 2 => /* I18N: http://en.wikipedia.org/wiki/Safar */ I18N::translateContext('NOMINATIVE', 'Safar'), - 3 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-awwal */ I18N::translateContext('NOMINATIVE', 'Rabi’ al-awwal'), - 4 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-thani */ I18N::translateContext('NOMINATIVE', 'Rabi’ al-thani'), - 5 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-awwal */ I18N::translateContext('NOMINATIVE', 'Jumada al-awwal'), - 6 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-thani */ I18N::translateContext('NOMINATIVE', 'Jumada al-thani'), - 7 => /* I18N: http://en.wikipedia.org/wiki/Rajab */ I18N::translateContext('NOMINATIVE', 'Rajab'), - 8 => /* I18N: http://en.wikipedia.org/wiki/Sha%27aban */ I18N::translateContext('NOMINATIVE', 'Sha’aban'), + 1 => /* I18N: http://en.wikipedia.org/wiki/Muharram */ I18N::translateContext('NOMINATIVE', 'Muharram'), + 2 => /* I18N: http://en.wikipedia.org/wiki/Safar */ I18N::translateContext('NOMINATIVE', 'Safar'), + 3 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-awwal */ I18N::translateContext('NOMINATIVE', 'Rabi’ al-awwal'), + 4 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-thani */ I18N::translateContext('NOMINATIVE', 'Rabi’ al-thani'), + 5 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-awwal */ I18N::translateContext('NOMINATIVE', 'Jumada al-awwal'), + 6 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-thani */ I18N::translateContext('NOMINATIVE', 'Jumada al-thani'), + 7 => /* I18N: http://en.wikipedia.org/wiki/Rajab */ I18N::translateContext('NOMINATIVE', 'Rajab'), + 8 => /* I18N: http://en.wikipedia.org/wiki/Sha%27aban */ I18N::translateContext('NOMINATIVE', 'Sha’aban'), 9 => /* I18N: http://en.wikipedia.org/wiki/Ramadan_%28calendar_month%29 */ I18N::translateContext('NOMINATIVE', 'Ramadan'), - 10 => /* I18N: http://en.wikipedia.org/wiki/Shawwal */ I18N::translateContext('NOMINATIVE', 'Shawwal'), - 11 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Qi%27dah */ I18N::translateContext('NOMINATIVE', 'Dhu al-Qi’dah'), - 12 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Hijjah */ I18N::translateContext('NOMINATIVE', 'Dhu al-Hijjah'), + 10 => /* I18N: http://en.wikipedia.org/wiki/Shawwal */ I18N::translateContext('NOMINATIVE', 'Shawwal'), + 11 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Qi%27dah */ I18N::translateContext('NOMINATIVE', 'Dhu al-Qi’dah'), + 12 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Hijjah */ I18N::translateContext('NOMINATIVE', 'Dhu al-Hijjah'), ); } @@ -87,18 +87,18 @@ class HijriDate extends CalendarDate { if ($translated_month_names === null) { $translated_month_names = array( 0 => '', - 1 => /* I18N: http://en.wikipedia.org/wiki/Muharram */ I18N::translateContext('GENITIVE', 'Muharram'), - 2 => /* I18N: http://en.wikipedia.org/wiki/Safar */ I18N::translateContext('GENITIVE', 'Safar'), - 3 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-awwal */ I18N::translateContext('GENITIVE', 'Rabi’ al-awwal'), - 4 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-thani */ I18N::translateContext('GENITIVE', 'Rabi’ al-thani'), - 5 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-awwal */ I18N::translateContext('GENITIVE', 'Jumada al-awwal'), - 6 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-thani */ I18N::translateContext('GENITIVE', 'Jumada al-thani'), - 7 => /* I18N: http://en.wikipedia.org/wiki/Rajab */ I18N::translateContext('GENITIVE', 'Rajab'), - 8 => /* I18N: http://en.wikipedia.org/wiki/Sha%27aban */ I18N::translateContext('GENITIVE', 'Sha’aban'), + 1 => /* I18N: http://en.wikipedia.org/wiki/Muharram */ I18N::translateContext('GENITIVE', 'Muharram'), + 2 => /* I18N: http://en.wikipedia.org/wiki/Safar */ I18N::translateContext('GENITIVE', 'Safar'), + 3 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-awwal */ I18N::translateContext('GENITIVE', 'Rabi’ al-awwal'), + 4 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-thani */ I18N::translateContext('GENITIVE', 'Rabi’ al-thani'), + 5 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-awwal */ I18N::translateContext('GENITIVE', 'Jumada al-awwal'), + 6 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-thani */ I18N::translateContext('GENITIVE', 'Jumada al-thani'), + 7 => /* I18N: http://en.wikipedia.org/wiki/Rajab */ I18N::translateContext('GENITIVE', 'Rajab'), + 8 => /* I18N: http://en.wikipedia.org/wiki/Sha%27aban */ I18N::translateContext('GENITIVE', 'Sha’aban'), 9 => /* I18N: http://en.wikipedia.org/wiki/Ramadan_%28calendar_month%29 */ I18N::translateContext('GENITIVE', 'Ramadan'), - 10 => /* I18N: http://en.wikipedia.org/wiki/Shawwal */ I18N::translateContext('GENITIVE', 'Shawwal'), - 11 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Qi%27dah */ I18N::translateContext('GENITIVE', 'Dhu al-Qi’dah'), - 12 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Hijjah */ I18N::translateContext('GENITIVE', 'Dhu al-Hijjah'), + 10 => /* I18N: http://en.wikipedia.org/wiki/Shawwal */ I18N::translateContext('GENITIVE', 'Shawwal'), + 11 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Qi%27dah */ I18N::translateContext('GENITIVE', 'Dhu al-Qi’dah'), + 12 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Hijjah */ I18N::translateContext('GENITIVE', 'Dhu al-Hijjah'), ); } @@ -119,18 +119,18 @@ class HijriDate extends CalendarDate { if ($translated_month_names === null) { $translated_month_names = array( 0 => '', - 1 => /* I18N: http://en.wikipedia.org/wiki/Muharram */ I18N::translateContext('LOCATIVE', 'Muharram'), - 2 => /* I18N: http://en.wikipedia.org/wiki/Safar */ I18N::translateContext('LOCATIVE', 'Safar'), - 3 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-awwal */ I18N::translateContext('LOCATIVE', 'Rabi’ al-awwal'), - 4 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-thani */ I18N::translateContext('LOCATIVE', 'Rabi’ al-thani'), - 5 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-awwal */ I18N::translateContext('LOCATIVE', 'Jumada al-awwal'), - 6 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-thani */ I18N::translateContext('LOCATIVE', 'Jumada al-thani'), - 7 => /* I18N: http://en.wikipedia.org/wiki/Rajab */ I18N::translateContext('LOCATIVE', 'Rajab'), - 8 => /* I18N: http://en.wikipedia.org/wiki/Sha%27aban */ I18N::translateContext('LOCATIVE', 'Sha’aban'), + 1 => /* I18N: http://en.wikipedia.org/wiki/Muharram */ I18N::translateContext('LOCATIVE', 'Muharram'), + 2 => /* I18N: http://en.wikipedia.org/wiki/Safar */ I18N::translateContext('LOCATIVE', 'Safar'), + 3 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-awwal */ I18N::translateContext('LOCATIVE', 'Rabi’ al-awwal'), + 4 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-thani */ I18N::translateContext('LOCATIVE', 'Rabi’ al-thani'), + 5 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-awwal */ I18N::translateContext('LOCATIVE', 'Jumada al-awwal'), + 6 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-thani */ I18N::translateContext('LOCATIVE', 'Jumada al-thani'), + 7 => /* I18N: http://en.wikipedia.org/wiki/Rajab */ I18N::translateContext('LOCATIVE', 'Rajab'), + 8 => /* I18N: http://en.wikipedia.org/wiki/Sha%27aban */ I18N::translateContext('LOCATIVE', 'Sha’aban'), 9 => /* I18N: http://en.wikipedia.org/wiki/Ramadan_%28calendar_month%29 */ I18N::translateContext('LOCATIVE', 'Ramadan'), - 10 => /* I18N: http://en.wikipedia.org/wiki/Shawwal */ I18N::translateContext('LOCATIVE', 'Shawwal'), - 11 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Qi%27dah */ I18N::translateContext('LOCATIVE', 'Dhu al-Qi’dah'), - 12 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Hijjah */ I18N::translateContext('LOCATIVE', 'Dhu al-Hijjah'), + 10 => /* I18N: http://en.wikipedia.org/wiki/Shawwal */ I18N::translateContext('LOCATIVE', 'Shawwal'), + 11 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Qi%27dah */ I18N::translateContext('LOCATIVE', 'Dhu al-Qi’dah'), + 12 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Hijjah */ I18N::translateContext('LOCATIVE', 'Dhu al-Hijjah'), ); } @@ -151,18 +151,18 @@ class HijriDate extends CalendarDate { if ($translated_month_names === null) { $translated_month_names = array( 0 => '', - 1 => /* I18N: http://en.wikipedia.org/wiki/Muharram */ I18N::translateContext('INSTRUMENTAL', 'Muharram'), - 2 => /* I18N: http://en.wikipedia.org/wiki/Safar */ I18N::translateContext('INSTRUMENTAL', 'Safar'), - 3 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-awwal */ I18N::translateContext('INSTRUMENTAL', 'Rabi’ al-awwal'), - 4 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-thani */ I18N::translateContext('INSTRUMENTAL', 'Rabi’ al-thani'), - 5 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-awwal */ I18N::translateContext('INSTRUMENTAL', 'Jumada al-awwal'), - 6 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-thani */ I18N::translateContext('INSTRUMENTAL', 'Jumada al-thani'), - 7 => /* I18N: http://en.wikipedia.org/wiki/Rajab */ I18N::translateContext('INSTRUMENTAL', 'Rajab'), - 8 => /* I18N: http://en.wikipedia.org/wiki/Sha%27aban */ I18N::translateContext('INSTRUMENTAL', 'Sha’aban'), + 1 => /* I18N: http://en.wikipedia.org/wiki/Muharram */ I18N::translateContext('INSTRUMENTAL', 'Muharram'), + 2 => /* I18N: http://en.wikipedia.org/wiki/Safar */ I18N::translateContext('INSTRUMENTAL', 'Safar'), + 3 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-awwal */ I18N::translateContext('INSTRUMENTAL', 'Rabi’ al-awwal'), + 4 => /* I18N: http://en.wikipedia.org/wiki/Rabi%27_al-thani */ I18N::translateContext('INSTRUMENTAL', 'Rabi’ al-thani'), + 5 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-awwal */ I18N::translateContext('INSTRUMENTAL', 'Jumada al-awwal'), + 6 => /* I18N: http://en.wikipedia.org/wiki/Jumada_al-thani */ I18N::translateContext('INSTRUMENTAL', 'Jumada al-thani'), + 7 => /* I18N: http://en.wikipedia.org/wiki/Rajab */ I18N::translateContext('INSTRUMENTAL', 'Rajab'), + 8 => /* I18N: http://en.wikipedia.org/wiki/Sha%27aban */ I18N::translateContext('INSTRUMENTAL', 'Sha’aban'), 9 => /* I18N: http://en.wikipedia.org/wiki/Ramadan_%28calendar_month%29 */ I18N::translateContext('INSTRUMENTAL', 'Ramadan'), - 10 => /* I18N: http://en.wikipedia.org/wiki/Shawwal */ I18N::translateContext('INSTRUMENTAL', 'Shawwal'), - 11 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Qi%27dah */ I18N::translateContext('INSTRUMENTAL', 'Dhu al-Qi’dah'), - 12 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Hijjah */ I18N::translateContext('INSTRUMENTAL', 'Dhu al-Hijjah'), + 10 => /* I18N: http://en.wikipedia.org/wiki/Shawwal */ I18N::translateContext('INSTRUMENTAL', 'Shawwal'), + 11 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Qi%27dah */ I18N::translateContext('INSTRUMENTAL', 'Dhu al-Qi’dah'), + 12 => /* I18N: http://en.wikipedia.org/wiki/Dhu_al-Hijjah */ I18N::translateContext('INSTRUMENTAL', 'Dhu al-Hijjah'), ); } diff --git a/app/Date/JalaliDate.php b/app/Date/JalaliDate.php index eea1080431..83bee0eb1b 100644 --- a/app/Date/JalaliDate.php +++ b/app/Date/JalaliDate.php @@ -52,15 +52,15 @@ class JalaliDate extends CalendarDate { if ($translated_month_names === null) { $translated_month_names = array( 0 => '', - 1 => /* I18N: 1st month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Farvardin'), - 2 => /* I18N: 2nd month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Ordibehesht'), - 3 => /* I18N: 3rd month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Khordad'), - 4 => /* I18N: 4th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Tir'), - 5 => /* I18N: 5th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Mordad'), - 6 => /* I18N: 6th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Shahrivar'), - 7 => /* I18N: 7th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Mehr'), - 8 => /* I18N: 8th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Aban'), - 9 => /* I18N: 9th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Azar'), + 1 => /* I18N: 1st month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Farvardin'), + 2 => /* I18N: 2nd month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Ordibehesht'), + 3 => /* I18N: 3rd month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Khordad'), + 4 => /* I18N: 4th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Tir'), + 5 => /* I18N: 5th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Mordad'), + 6 => /* I18N: 6th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Shahrivar'), + 7 => /* I18N: 7th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Mehr'), + 8 => /* I18N: 8th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Aban'), + 9 => /* I18N: 9th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Azar'), 10 => /* I18N: 10th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Dey'), 11 => /* I18N: 11th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Bahman'), 12 => /* I18N: 12th month in the Persian/Jalali calendar */ I18N::translateContext('NOMINATIVE', 'Esfand'), @@ -84,15 +84,15 @@ class JalaliDate extends CalendarDate { if ($translated_month_names === null) { $translated_month_names = array( 0 => '', - 1 => /* I18N: 1st month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Farvardin'), - 2 => /* I18N: 2nd month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Ordibehesht'), - 3 => /* I18N: 3rd month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Khordad'), - 4 => /* I18N: 4th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Tir'), - 5 => /* I18N: 5th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Mordad'), - 6 => /* I18N: 6th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Shahrivar'), - 7 => /* I18N: 7th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Mehr'), - 8 => /* I18N: 8th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Aban'), - 9 => /* I18N: 9th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Azar'), + 1 => /* I18N: 1st month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Farvardin'), + 2 => /* I18N: 2nd month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Ordibehesht'), + 3 => /* I18N: 3rd month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Khordad'), + 4 => /* I18N: 4th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Tir'), + 5 => /* I18N: 5th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Mordad'), + 6 => /* I18N: 6th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Shahrivar'), + 7 => /* I18N: 7th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Mehr'), + 8 => /* I18N: 8th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Aban'), + 9 => /* I18N: 9th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Azar'), 10 => /* I18N: 10th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Dey'), 11 => /* I18N: 11th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Bahman'), 12 => /* I18N: 12th month in the Persian/Jalali calendar */ I18N::translateContext('GENITIVE', 'Esfand'), @@ -116,15 +116,15 @@ class JalaliDate extends CalendarDate { if ($translated_month_names === null) { $translated_month_names = array( 0 => '', - 1 => /* I18N: 1st month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Farvardin'), - 2 => /* I18N: 2nd month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Ordibehesht'), - 3 => /* I18N: 3rd month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Khordad'), - 4 => /* I18N: 4th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Tir'), - 5 => /* I18N: 5th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Mordad'), - 6 => /* I18N: 6th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Shahrivar'), - 7 => /* I18N: 7th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Mehr'), - 8 => /* I18N: 8th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Aban'), - 9 => /* I18N: 9th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Azar'), + 1 => /* I18N: 1st month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Farvardin'), + 2 => /* I18N: 2nd month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Ordibehesht'), + 3 => /* I18N: 3rd month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Khordad'), + 4 => /* I18N: 4th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Tir'), + 5 => /* I18N: 5th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Mordad'), + 6 => /* I18N: 6th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Shahrivar'), + 7 => /* I18N: 7th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Mehr'), + 8 => /* I18N: 8th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Aban'), + 9 => /* I18N: 9th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Azar'), 10 => /* I18N: 10th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Dey'), 11 => /* I18N: 11th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Bahman'), 12 => /* I18N: 12th month in the Persian/Jalali calendar */ I18N::translateContext('LOCATIVE', 'Esfand'), @@ -148,15 +148,15 @@ class JalaliDate extends CalendarDate { if ($translated_month_names === null) { $translated_month_names = array( 0 => '', - 1 => /* I18N: 1st month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Farvardin'), - 2 => /* I18N: 2nd month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Ordibehesht'), - 3 => /* I18N: 3rd month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Khordad'), - 4 => /* I18N: 4th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Tir'), - 5 => /* I18N: 5th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Mordad'), - 6 => /* I18N: 6th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Shahrivar'), - 7 => /* I18N: 7th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Mehr'), - 8 => /* I18N: 8th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Aban'), - 9 => /* I18N: 9th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Azar'), + 1 => /* I18N: 1st month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Farvardin'), + 2 => /* I18N: 2nd month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Ordibehesht'), + 3 => /* I18N: 3rd month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Khordad'), + 4 => /* I18N: 4th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Tir'), + 5 => /* I18N: 5th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Mordad'), + 6 => /* I18N: 6th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Shahrivar'), + 7 => /* I18N: 7th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Mehr'), + 8 => /* I18N: 8th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Aban'), + 9 => /* I18N: 9th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Azar'), 10 => /* I18N: 10th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Dey'), 11 => /* I18N: 11th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Bahman'), 12 => /* I18N: 12th month in the Persian/Jalali calendar */ I18N::translateContext('INSTRUMENTAL', 'Esfand'), diff --git a/app/Date/JewishDate.php b/app/Date/JewishDate.php index 9d5f68c082..1185f79e15 100644 --- a/app/Date/JewishDate.php +++ b/app/Date/JewishDate.php @@ -54,7 +54,7 @@ class JewishDate extends CalendarDate { /** * Generate the %y format for a date. * - * NOTE Short year is NOT a 2-digit year. It is for calendars such as hebrew + * NOTE Short year is NOT a 2-digit year. It is for calendars such as hebrew * which have a 3-digit form of 4-digit years. * * @return string @@ -245,7 +245,7 @@ class JewishDate extends CalendarDate { } /** - * Which months follows this one? Calendars with leap-months should provide their own implementation. + * Which months follows this one? Calendars with leap-months should provide their own implementation. * * @return int[] */ diff --git a/app/Date/JulianDate.php b/app/Date/JulianDate.php index 023a1c0969..ec535c15dc 100644 --- a/app/Date/JulianDate.php +++ b/app/Date/JulianDate.php @@ -81,13 +81,13 @@ class JulianDate extends CalendarDate { */ protected function formatLongYear() { if ($this->y < 0) { - return /* I18N: BCE=Before the Common Era, for Julian years < 0. See http://en.wikipedia.org/wiki/Common_Era */ + return /* I18N: BCE=Before the Common Era, for Julian years < 0. See http://en.wikipedia.org/wiki/Common_Era */ I18N::translate('%s BCE', I18N::digits(-$this->y)); } else { if ($this->new_old_style) { return I18N::translate('%s CE', I18N::digits(sprintf('%d/%02d', $this->y - 1, $this->y % 100))); } else { - return /* I18N: CE=Common Era, for Julian years > 0. See http://en.wikipedia.org/wiki/Common_Era */ + return /* I18N: CE=Common Era, for Julian years > 0. See http://en.wikipedia.org/wiki/Common_Era */ I18N::translate('%s CE', I18N::digits($this->y)); } } diff --git a/app/Date/RomanDate.php b/app/Date/RomanDate.php index 7506f9eacd..33f31490e8 100644 --- a/app/Date/RomanDate.php +++ b/app/Date/RomanDate.php @@ -19,7 +19,7 @@ namespace Fisharebest\Webtrees\Date; * Definitions for the Roman calendar * * The 5.5.1 gedcom spec mentions this calendar, but gives no details of - * how it is to be represented.... This class is just a place holder so that + * how it is to be represented.... This class is just a place holder so that * webtrees won’t compain if it receives one. */ class RomanDate extends JulianDate { diff --git a/app/Fact.php b/app/Fact.php index b468f6b085..99aeb55e67 100644 --- a/app/Fact.php +++ b/app/Fact.php @@ -405,7 +405,7 @@ class Fact { return '<div class="' . $class . '">' . - /* I18N: a label/value pair, such as “Occupation: Farmer”. Some languages may need to change the punctuation. */ + /* I18N: a label/value pair, such as “Occupation: Farmer”. Some languages may need to change the punctuation. */ I18N::translate('<span class="label">%1$s:</span> <span class="field" dir="auto">%2$s</span>', $this->getLabel(), implode(' — ', $attributes)) . '</div>'; } diff --git a/app/File.php b/app/File.php index 61fd93a874..f61574c5b4 100644 --- a/app/File.php +++ b/app/File.php @@ -52,7 +52,7 @@ class File { // The first part of the response include the HTTP headers $response = fread($fp, 65536); - // The file has moved? Follow it. + // The file has moved? Follow it. if (preg_match('/^HTTP\/1.[01] 30[123].+\nLocation: ([^\r\n]+)/s', $response, $match)) { fclose($fp); diff --git a/app/Filter.php b/app/Filter.php index 49f7127092..d2bdad50d0 100644 --- a/app/Filter.php +++ b/app/Filter.php @@ -429,8 +429,8 @@ class Filter { */ public static function server($variable, $regexp = null, $default = null) { // On some servers, variables that are present in $_SERVER cannot be - // found via filter_input(INPUT_SERVER). Instead, they are found via - // filter_input(INPUT_ENV). Since we cannot rely on filter_input(), + // found via filter_input(INPUT_SERVER). Instead, they are found via + // filter_input(INPUT_ENV). Since we cannot rely on filter_input(), // we must use the superglobal directly. if (array_key_exists($variable, $_SERVER) && ($regexp === null || preg_match('/^(' . $regexp . ')$/', $_SERVER[$variable]))) { @@ -475,9 +475,9 @@ $_SERVER[$variable]))) { */ public static function checkCsrf() { if (self::post('csrf') !== self::getCsrfToken()) { - // Oops. Something is not quite right + // Oops. Something is not quite right Log::addAuthenticationLog('CSRF mismatch - session expired or malicious attack'); - FlashMessages::addMessage(I18N::translate('This form has expired. Try again.'), 'error'); + FlashMessages::addMessage(I18N::translate('This form has expired. Try again.'), 'error'); return false; } diff --git a/app/Functions/Functions.php b/app/Functions/Functions.php index 734a61a935..020f80319a 100644 --- a/app/Functions/Functions.php +++ b/app/Functions/Functions.php @@ -32,7 +32,7 @@ class Functions { * Check with the webtrees.net server for the latest version of webtrees. * Fetching the remote file can be slow, so check infrequently, and cache the result. * Pass the current versions of webtrees, PHP and MySQL, as the response - * may be different for each. The server logs are used to generate + * may be different for each. The server logs are used to generate * installation statistics which can be found at http://svn.webtrees.net/statistics.html * * @return null|string @@ -74,10 +74,10 @@ class Functions { return I18N::translate('The uploaded file exceeds the allowed size.'); case UPLOAD_ERR_PARTIAL: // I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php - return I18N::translate('The file was only partially uploaded. Please try again.'); + return I18N::translate('The file was only partially uploaded. Please try again.'); case UPLOAD_ERR_NO_FILE: // I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php - return I18N::translate('No file was received. Please try again.'); + return I18N::translate('No file was received. Please try again.'); case UPLOAD_ERR_NO_TMP_DIR: // I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php return I18N::translate('The PHP temporary folder is missing.'); @@ -95,7 +95,7 @@ class Functions { /** * get a gedcom subrecord * - * searches a gedcom record and returns a subrecord of it. A subrecord is defined starting at a + * searches a gedcom record and returns a subrecord of it. A subrecord is defined starting at a * line with level N and all subsequent lines greater than N until the next N level is reached. * For example, the following is a BIRT subrecord: * <code>1 BIRT @@ -107,9 +107,9 @@ class Functions { * @param int $level the N level of the subrecord to get * @param string $tag a gedcom tag or string to search for in the record (ie 1 BIRT or 2 DATE) * @param string $gedrec the parent gedcom record to search in - * @param int $num this allows you to specify which matching <var>$tag</var> to get. Oftentimes a - * gedcom record will have more that 1 of the same type of subrecord. An individual may have - * multiple events for example. Passing $num=1 would get the first 1. Passing $num=2 would get the + * @param int $num this allows you to specify which matching <var>$tag</var> to get. Oftentimes a + * gedcom record will have more that 1 of the same type of subrecord. An individual may have + * multiple events for example. Passing $num=1 would get the first 1. Passing $num=2 would get the * second one, etc. * * @return string the subrecord that was found or an empty string "" if not found. @@ -451,7 +451,7 @@ class Functions { $path = array_slice($nodes['relations'], 1); // Look for paths with *specific* names first. // Note that every combination must be listed separately, as the same English - // name can be used for many different relationships. e.g. + // name can be used for many different relationships. e.g. // brother’s wife & husband’s sister = sister-in-law. // // $path is an array of the 12 possible gedcom family relationships: @@ -485,52 +485,52 @@ class Functions { case 'M': switch ($n) { case 1: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'first cousin'); case 2: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'second cousin'); case 3: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'third cousin'); case 4: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'fourth cousin'); case 5: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'fifth cousin'); case 6: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'sixth cousin'); case 7: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'seventh cousin'); case 8: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'eighth cousin'); case 9: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'ninth cousin'); case 10: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'tenth cousin'); case 11: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'eleventh cousin'); case 12: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'twelfth cousin'); case 13: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'thirteenth cousin'); case 14: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'fourteenth cousin'); case 15: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', 'fifteenth cousin'); default: - /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ + /* I18N: Note that for Italian and Polish, “N’th cousins” are different from English “N’th cousins”, and the software has already generated the correct “N” for your language. You only need to translate - you do not need to convert. For other languages, if your cousin rules are different from English, please contact the developers. */ return I18N::translateContext('MALE', '%s × cousin', I18N::number($n)); } case 'F': @@ -683,13 +683,13 @@ class Functions { // TODO: Update all the “3 RELA ” values in class_person return '<span class="error">' . $path . '</span>'; } - // The path does not include the starting person. In some languages, the + // The path does not include the starting person. In some languages, the // translation for a man’s (relative) is different from a woman’s (relative), // due to inflection. $sex1 = $person1 ? $person1->getSex() : 'U'; // The sex of the last person in the relationship determines the name in - // many cases. e.g. great-aunt / great-uncle + // many cases. e.g. great-aunt / great-uncle if (preg_match('/(fat|hus|son|bro)$/', $path)) { $sex2 = 'M'; } elseif (preg_match('/(mot|wif|dau|sis)$/', $path)) { @@ -2087,7 +2087,7 @@ class Functions { $cousin = min($up, $down); // Moved out of switch (en/default case) so that $removed = abs($down - $up); // Spanish (and other languages) can use it, too. - // Different languages have different rules for naming cousins. For example, + // Different languages have different rules for naming cousins. For example, // an English “second cousin once removed” is a Polish “cousin of 7th degree”. // // Need to find out which languages use which rules. @@ -2095,11 +2095,11 @@ class Functions { case 'pl': // Source: Lukasz Wilenski return self::cousinName($up + $down + 2, $sex2); case 'it': - // Source: Michele Locati. See italian_cousins_names.zip + // Source: Michele Locati. See italian_cousins_names.zip // http://webtrees.net/forums/8-translation/1200-great-xn-grandparent?limit=6&start=6 return self::cousinName($up + $down - 3, $sex2); case 'es': - // Source: Wes Groleau. See http://UniGen.us/Parentesco.html & http://UniGen.us/Parentesco-D.html + // Source: Wes Groleau. See http://UniGen.us/Parentesco.html & http://UniGen.us/Parentesco-D.html if ($down == $up) { return self::cousinName($cousin, $sex2); } elseif ($down < $up) { diff --git a/app/Functions/FunctionsDate.php b/app/Functions/FunctionsDate.php index ca5d258ddd..c207efb244 100644 --- a/app/Functions/FunctionsDate.php +++ b/app/Functions/FunctionsDate.php @@ -75,7 +75,7 @@ class FunctionsDate { */ public static function formatTimestamp($time) { $time_fmt = I18N::timeFormat(); - // PHP::date() doesn't do I18N. Do it ourselves.... + // PHP::date() doesn't do I18N. Do it ourselves.... preg_match_all('/%[^%]/', $time_fmt, $matches); foreach ($matches[0] as $match) { switch ($match) { diff --git a/app/Functions/FunctionsDb.php b/app/Functions/FunctionsDb.php index e1b6edb789..d9ae0dada1 100644 --- a/app/Functions/FunctionsDb.php +++ b/app/Functions/FunctionsDb.php @@ -263,7 +263,7 @@ class FunctionsDb { throw new \DomainException('soundex: ' . $soundex); } - // Nothing to search for? Return nothing. + // Nothing to search for? Return nothing. if (!$givn_sdx && !$surn_sdx && !$plac_sdx) { return array(); } diff --git a/app/Functions/FunctionsEdit.php b/app/Functions/FunctionsEdit.php index 7e1a1951c7..52525ff3b0 100644 --- a/app/Functions/FunctionsEdit.php +++ b/app/Functions/FunctionsEdit.php @@ -739,7 +739,7 @@ class FunctionsEdit { echo ' onblur="valid_lati_long(this, \'E\', \'W\');" onmouseout="valid_lati_long(this, \'E\', \'W\');"'; break; case 'NOTE': - // Shared notes. Inline notes are handled elsewhere. + // Shared notes. Inline notes are handled elsewhere. echo ' data-autocomplete-type="NOTE"'; break; case 'OBJE': @@ -1448,10 +1448,10 @@ class FunctionsEdit { * fact that is being edited. * If the $text[] array is empty for the given line, then it means that the * user removed that line during editing or that the line is supposed to be - * empty (1 DEAT, 1 BIRT) for example. To know if the line should be removed + * empty (1 DEAT, 1 BIRT) for example. To know if the line should be removed * there is a section of code that looks ahead to the next lines to see if there - * are sub lines. For example we don't want to remove the 1 DEAT line if it has - * a 2 PLAC or 2 DATE line following it. If there are no sub lines, then the line + * are sub lines. For example we don't want to remove the 1 DEAT line if it has + * a 2 PLAC or 2 DATE line following it. If there are no sub lines, then the line * can be safely removed. * * @param string $newged the new gedcom record to add the lines to @@ -1606,7 +1606,7 @@ class FunctionsEdit { $add_date = true; // List of tags we would expect at the next level // NB add_missing_subtags() already takes care of the simple cases - // where a level 1 tag is missing a level 2 tag. Here we only need to + // where a level 1 tag is missing a level 2 tag. Here we only need to // handle the more complicated cases. $expected_subtags = array( 'SOUR' => array('PAGE', 'DATA'), diff --git a/app/Functions/FunctionsExport.php b/app/Functions/FunctionsExport.php index 3514c0eb00..15b9e76985 100644 --- a/app/Functions/FunctionsExport.php +++ b/app/Functions/FunctionsExport.php @@ -153,7 +153,7 @@ class FunctionsExport { $old_file_name = $match[1]; // Don’t modify external links if (!preg_match('~^(https?|ftp):~', $old_file_name)) { - // Adding a windows path? Convert the slashes. + // Adding a windows path? Convert the slashes. if (strpos($path, '\\') !== false) { $new_file_name = preg_replace('~/+~', '\\', $old_file_name); } else { @@ -176,10 +176,10 @@ class FunctionsExport { * @param Tree $tree Which tree to export * @param resource $gedout Handle to a writable stream * @param string[] $exportOptions Export options are as follows: - * 'privatize': which Privacy rules apply? (none, visitor, user, manager) - * 'toANSI': should the output be produced in ISO-8859-1 instead of UTF-8? (yes, no) - * 'path': what constant should prefix all media file paths? (eg: media/ or c:\my pictures\my family - * 'slashes': what folder separators apply to media file paths? (forward, backward) + * 'privatize': which Privacy rules apply? (none, visitor, user, manager) + * 'toANSI': should the output be produced in ISO-8859-1 instead of UTF-8? (yes, no) + * 'path': what constant should prefix all media file paths? (eg: media/ or c:\my pictures\my family + * 'slashes': what folder separators apply to media file paths? (forward, backward) */ public static function exportGedcom(Tree $tree, $gedout, $exportOptions) { switch ($exportOptions['privatize']) { @@ -205,7 +205,7 @@ class FunctionsExport { $head = self::reformatRecord($head); fwrite($gedout, $head); - // Buffer the output. Lots of small fwrite() calls can be very slow when writing large gedcoms. + // Buffer the output. Lots of small fwrite() calls can be very slow when writing large gedcoms. $buffer = ''; // Generate the OBJE/SOUR/REPO/NOTE records first, as their privacy calcualations involve diff --git a/app/Functions/FunctionsPrintFacts.php b/app/Functions/FunctionsPrintFacts.php index 2398905e95..b6109ec243 100644 --- a/app/Functions/FunctionsPrintFacts.php +++ b/app/Functions/FunctionsPrintFacts.php @@ -45,9 +45,9 @@ class FunctionsPrintFacts { * Print a fact record, for the individual/family/source/repository/etc. pages. * * Although a Fact has a parent object, we also need to know - * the GedcomRecord for which we are printing it. For example, + * the GedcomRecord for which we are printing it. For example, * we can show the death of X on the page of Y, or the marriage - * of X+Y on the page of Z. We need to know both records to + * of X+Y on the page of Z. We need to know both records to * calculate ages, relationships, etc. * * @param Fact $fact @@ -90,7 +90,7 @@ class FunctionsPrintFacts { break; } - // Who is this fact about? Need it to translate fact label correctly + // Who is this fact about? Need it to translate fact label correctly if ($parent instanceof Family && $record instanceof Individual) { // Family event $label_person = $fact->getParent()->getSpouse($record); @@ -134,7 +134,7 @@ class FunctionsPrintFacts { case 'EVEN': case 'FACT': if (GedcomTag::isTag($type)) { - // Some users (just Meliza?) use "1 EVEN/2 TYPE BIRT". Translate the TYPE. + // Some users (just Meliza?) use "1 EVEN/2 TYPE BIRT". Translate the TYPE. $label = GedcomTag::getLabel($type, $label_person); $type = ''; // Do not print this again } elseif ($type) { @@ -147,7 +147,7 @@ class FunctionsPrintFacts { } break; case 'MARR': - // This is a hack for a proprietory extension. Is it still used/needed? + // This is a hack for a proprietory extension. Is it still used/needed? $utype = strtoupper($type); if ($utype == 'CIVIL' || $utype == 'PARTNERS' || $utype == 'RELIGIOUS') { $label = GedcomTag::getLabel('MARR_' . $utype, $label_person); @@ -639,7 +639,7 @@ class FunctionsPrintFacts { $data .= '</div>'; } else { // Here we could show that we do actually have sources for this data, - // but not the details. For example “Sources: ”. + // but not the details. For example “Sources: ”. // But not by default, based on user feedback. // http://webtrees.net/index.php/en/forum/3-help-for-beta-and-svn-versions/27002-source-media-privacy-issue } @@ -790,7 +790,7 @@ class FunctionsPrintFacts { echo GedcomTag::getLabel($factname, $parent), '</a>'; echo '<div class="editfacts">'; if (preg_match('/^@.+@$/', $match[$j][2])) { - // Inline sources can't be edited. Attempting to save one will convert it + // Inline sources can't be edited. Attempting to save one will convert it // into a link, and delete it. // e.g. "1 SOUR my source" becomes "1 SOUR @my source@" which does not exist. echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return edit_record('$pid', '$fact_id');\" href=\"#\" title=\"" . I18N::translate('Edit') . "\"><span class=\"link_text\">" . I18N::translate('Edit') . "</span></a></div>"; @@ -810,7 +810,7 @@ class FunctionsPrintFacts { if ($publ) { echo GedcomTag::getLabelValue('PUBL', $publ->getValue()); } - // 2 RESN tags. Note, there can be more than one, such as "privacy" and "locked" + // 2 RESN tags. Note, there can be more than one, such as "privacy" and "locked" if (preg_match_all("/\n2 RESN (.+)/", $factrec, $rmatches)) { foreach ($rmatches[1] as $rmatch) { echo '<br><span class="label">', GedcomTag::getLabel('RESN'), ':</span> <span class="field">'; @@ -1076,7 +1076,7 @@ class FunctionsPrintFacts { echo self::printFactSources($noterec, 1); } - // 2 RESN tags. Note, there can be more than one, such as "privacy" and "locked" + // 2 RESN tags. Note, there can be more than one, such as "privacy" and "locked" if (preg_match_all("/\n2 RESN (.+)/", $factrec, $matches)) { foreach ($matches[1] as $match) { echo '<br><span class="label">', GedcomTag::getLabel('RESN'), ':</span> <span class="field">'; diff --git a/app/Functions/FunctionsPrintLists.php b/app/Functions/FunctionsPrintLists.php index d7adc8bd4e..804ea795b3 100644 --- a/app/Functions/FunctionsPrintLists.php +++ b/app/Functions/FunctionsPrintLists.php @@ -244,7 +244,7 @@ class FunctionsPrintLists { class="ui-state-default" data-filter-column="23" data-filter-value="R" - title="' . I18N::translate('Show “roots” couples or individuals. These individuals may also be called “patriarchs”. They are individuals who have no parents recorded in the database.') . '" + title="' . I18N::translate('Show “roots” couples or individuals. These individuals may also be called “patriarchs”. They are individuals who have no parents recorded in the database.') . '" type="button" > ' . I18N::translate('Roots') . ' @@ -253,7 +253,7 @@ class FunctionsPrintLists { class="ui-state-default" data-filter-column="23" data-filter-value="L" - title="' . I18N::translate('Show “leaves” couples or individuals. These are individuals who are alive but have no children recorded in the database.') . '" + title="' . I18N::translate('Show “leaves” couples or individuals. These are individuals who are alive but have no children recorded in the database.') . '" type="button" > ' . I18N::translate('Leaves') . ' @@ -267,7 +267,7 @@ class FunctionsPrintLists { <th>' . GedcomTag::getLabel('SURN') . '</th> <th>GIVN</th> <th>SURN</th> - <th>' . /* I18N: Abbreviation for “Sosa-Stradonitz number”. This is an individual’s surname, so may need transliterating into non-latin alphabets. */ + <th>' . /* I18N: Abbreviation for “Sosa-Stradonitz number”. This is an individual’s surname, so may need transliterating into non-latin alphabets. */ I18N::translate('Sosa') . '</th> <th>SOSA</th> <th>' . GedcomTag::getLabel('BIRT') . '</th> @@ -460,7 +460,7 @@ class FunctionsPrintLists { $html .= '</td>'; //-- Filtering by death date $html .= '<td>'; - // Died in last 100 years? Died? Not dead? + // Died in last 100 years? Died? Not dead? if (Date::compare($death_dates[0], $d100y) > 0) { $html .= 'Y100'; } elseif ($death_dates[0]->minimumJulianDay() || $person->isDead()) { @@ -661,7 +661,7 @@ class FunctionsPrintLists { data-filter-column="22" data-filter-value="R" class="ui-state-default" - title="' . I18N::translate('Show “roots” couples or individuals. These individuals may also be called “patriarchs”. They are individuals who have no parents recorded in the database.') . '" + title="' . I18N::translate('Show “roots” couples or individuals. These individuals may also be called “patriarchs”. They are individuals who have no parents recorded in the database.') . '" > ' . I18N::translate('Roots') . ' </button> @@ -670,7 +670,7 @@ class FunctionsPrintLists { data-filter-column="22" data-filter-value="L" class="ui-state-default" - title="' . I18N::translate('Show “leaves” couples or individuals. These are individuals who are alive but have no children recorded in the database.') . '" + title="' . I18N::translate('Show “leaves” couples or individuals. These are individuals who are alive but have no children recorded in the database.') . '" > ' . I18N::translate('Leaves') . ' </button> @@ -1019,7 +1019,7 @@ class FunctionsPrintLists { public static function sourceTable($datalist) { global $WT_TREE, $controller; - // Count the number of linked records. These numbers include private records. + // Count the number of linked records. These numbers include private records. // It is not good to bypass privacy, but many servers do not have the resources // to process privacy for every record in the tree $count_individuals = Database::prepare( @@ -1292,7 +1292,7 @@ class FunctionsPrintLists { public static function repositoryTable($repositories) { global $WT_TREE, $controller; - // Count the number of linked records. These numbers include private records. + // Count the number of linked records. These numbers include private records. // It is not good to bypass privacy, but many servers do not have the resources // to process privacy for every record in the tree $count_sources = Database::prepare( @@ -1574,7 +1574,7 @@ class FunctionsPrintLists { if ($spfxsurn) { $html .= '<a href="' . $url . '" dir="auto">' . Filter::escapeHtml($spfxsurn) . '</a><br>'; } else { - // No surname, but a value from "2 SURN"? A common workaround for toponyms, etc. + // No surname, but a value from "2 SURN"? A common workaround for toponyms, etc. $html .= '<a href="' . $url . '" dir="auto">' . Filter::escapeHtml($surn) . '</a><br>'; } } @@ -1937,7 +1937,7 @@ class FunctionsPrintLists { }); '); - // Did we have any output? Did we skip anything? + // Did we have any output? Did we skip anything? $output = 0; $filter = 0; $filtered_events = array(); @@ -2060,7 +2060,7 @@ class FunctionsPrintLists { public static function eventsList($startjd, $endjd, $events = 'BIRT MARR DEAT', $only_living = false, $sort_by = 'anniv') { global $WT_TREE; - // Did we have any output? Did we skip anything? + // Did we have any output? Did we skip anything? $output = 0; $filter = 0; $filtered_events = array(); diff --git a/app/Functions/FunctionsRtl.php b/app/Functions/FunctionsRtl.php index 7b3497cc66..7d9d943496 100644 --- a/app/Functions/FunctionsRtl.php +++ b/app/Functions/FunctionsRtl.php @@ -64,9 +64,9 @@ class FunctionsRtl { private static $posSpanStart; /** - * This function strips ‎ and ‏ from the input string. It should be used for all + * This function strips ‎ and ‏ from the input string. It should be used for all * text that has been passed through the PrintReady() function before that text is stored - * in the database. The database should NEVER contain these characters. + * in the database. The database should NEVER contain these characters. * * @param string $inputText The string from which the ‎ and ‏ characters should be stripped * @@ -188,7 +188,7 @@ class FunctionsRtl { $offset = 0; // Be sure to look at the current character first $charArray = self::getChar($workingText . "\n", $offset); if (strpos(self::NUMBERS, $charArray['letter']) === false) { - // This is not a digit. Is it numeric punctuation? + // This is not a digit. Is it numeric punctuation? if (substr($workingText . "\n", $offset, 6) == ' ') { $offset += 6; // This could be numeric punctuation } elseif (strpos(self::NUMBER_PUNCTUATION, $charArray['letter']) !== false) { @@ -197,7 +197,7 @@ class FunctionsRtl { // If the next character is a digit, the current character is numeric punctuation $charArray = self::getChar($workingText . "\n", $offset); if (strpos(self::NUMBERS, $charArray['letter']) === false) { - // This is not a digit. End the run of digits and punctuation. + // This is not a digit. End the run of digits and punctuation. $numberState = false; if (self::$currentState == 'RTL') { if (strpos(self::NUMBER_PREFIX, $currentLetter) === false) { @@ -348,7 +348,7 @@ class FunctionsRtl { } } - // We're done. Finish last <span> if necessary + // We're done. Finish last <span> if necessary if ($numberState) { if (self::$waitingText === '') { if (self::$currentState === 'RTL') { @@ -612,7 +612,7 @@ class FunctionsRtl { // Get rid of empty spans, so that our check for presence of RTL will work $result = str_replace(array(self::$startLTR . self::$endLTR, self::$startRTL . self::$endRTL), '', $result); - // Look for numeric strings that are times (hh:mm:ss). These have to be separated from surrounding numbers. + // Look for numeric strings that are times (hh:mm:ss). These have to be separated from surrounding numbers. $tempResult = ''; while ($textSpan != '') { $posColon = strpos($textSpan, ':'); @@ -691,7 +691,7 @@ class FunctionsRtl { /* ****************************** LTR text handling ******************************** */ if (self::$currentState === 'LTR') { - // Move trailing numeric strings to the following RTL text. Include any blanks preceding or following the numeric text too. + // Move trailing numeric strings to the following RTL text. Include any blanks preceding or following the numeric text too. if (I18N::direction() === 'rtl' && self::$previousState === 'RTL' && !$theEnd) { $trailingString = ''; $savedSpan = $textSpan; @@ -958,7 +958,7 @@ class FunctionsRtl { $textSpan = $savedSpan; } - // Move trailing numeric strings to the following LTR text. Include any blanks preceding or following the numeric text too. + // Move trailing numeric strings to the following LTR text. Include any blanks preceding or following the numeric text too. if (!$theEnd && I18N::direction() !== 'rtl') { $trailingString = ''; $savedSpan = $textSpan; diff --git a/app/GedcomCode/GedcomCodeAdop.php b/app/GedcomCode/GedcomCodeAdop.php index 46c232ab19..875ad2c568 100644 --- a/app/GedcomCode/GedcomCodeAdop.php +++ b/app/GedcomCode/GedcomCodeAdop.php @@ -87,7 +87,7 @@ class GedcomCodeAdop { $values[$type] = self::getValue($type, $record); } - // Don't sort these. We want the order: both parents, father, mother + // Don't sort these. We want the order: both parents, father, mother return $values; } } diff --git a/app/GedcomCode/GedcomCodeName.php b/app/GedcomCode/GedcomCodeName.php index 62dcc1859b..807fee63e3 100644 --- a/app/GedcomCode/GedcomCodeName.php +++ b/app/GedcomCode/GedcomCodeName.php @@ -57,13 +57,13 @@ class GedcomCodeName { case 'aka': switch ($sex) { case 'M': - /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */ + /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */ return I18N::translateContext('MALE', 'also known as'); case 'F': - /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */ + /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */ return I18N::translateContext('FEMALE', 'also known as'); default: - /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */ + /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */ return I18N::translate('also known as'); } case 'birth': diff --git a/app/GedcomCode/GedcomCodePedi.php b/app/GedcomCode/GedcomCodePedi.php index 3f20c708f0..19abcba4a5 100644 --- a/app/GedcomCode/GedcomCodePedi.php +++ b/app/GedcomCode/GedcomCodePedi.php @@ -89,7 +89,7 @@ class GedcomCodePedi { // This is an arabic word which does not exist in other languages. // So, it will not have any inflected forms. return - /* I18N: This is an Arabic word, pronounced “ra DAH”. It is child-to-parent pedigree, established by wet-nursing. */ + /* I18N: This is an Arabic word, pronounced “ra DAH”. It is child-to-parent pedigree, established by wet-nursing. */ I18N::translate('Rada'); default: return $type; @@ -135,7 +135,7 @@ class GedcomCodePedi { I18N::translate('Family with sealing parents'); case 'rada': return - /* I18N: “rada” is an Arabic word, pronounced “ra DAH”. It is child-to-parent pedigree, established by wet-nursing. */ + /* I18N: “rada” is an Arabic word, pronounced “ra DAH”. It is child-to-parent pedigree, established by wet-nursing. */ I18N::translate('Family with rada parents'); default: return I18N::translate('Family with parents') . ' - ' . $pedi; diff --git a/app/GedcomCode/GedcomCodeTemp.php b/app/GedcomCode/GedcomCodeTemp.php index 753392f10f..f1d7f82648 100644 --- a/app/GedcomCode/GedcomCodeTemp.php +++ b/app/GedcomCode/GedcomCodeTemp.php @@ -35,7 +35,7 @@ class GedcomCodeTemp { /** * A list of all temple codes, from the GEDCOM 5.5.1 specification * - * Note that this list is out-of-date. We could add recently built + * Note that this list is out-of-date. We could add recently built * temples, but what codes would we use? * * @link http://en.wikipedia.org/wiki/List_of_temples_of_The_Church_of_Jesus_Christ_of_Latter-day_Saints diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php index fb5727967f..46f70bf531 100644 --- a/app/GedcomRecord.php +++ b/app/GedcomRecord.php @@ -121,8 +121,8 @@ class GedcomRecord { } /** - * Get an instance of a GedcomRecord object. For single records, - * we just receive the XREF. For bulk records (such as lists + * Get an instance of a GedcomRecord object. For single records, + * we just receive the XREF. For bulk records (such as lists * and search results) we can receive the GEDCOM data as well. * * @param string $xref @@ -236,7 +236,7 @@ class GedcomRecord { * @return null|string */ protected static function fetchGedcomRecord($xref, $tree_id) { - // We don't know what type of object this is. Try each one in turn. + // We don't know what type of object this is. Try each one in turn. $data = Individual::fetchGedcomRecord($xref, $tree_id); if ($data) { return $data; @@ -457,7 +457,7 @@ class GedcomRecord { return $this->disp_none; case Auth::PRIV_HIDE: // hidden from admins - // We use this value to bypass privacy checks. For example, + // We use this value to bypass privacy checks. For example, // when downloading data or when calculating privacy itself. return true; default: @@ -492,7 +492,7 @@ class GedcomRecord { /** * Remove private data from the raw gedcom record. - * Return both the visible and invisible data. We need the invisible data when editing. + * Return both the visible and invisible data. We need the invisible data when editing. * * @param int $access_level * @@ -533,8 +533,8 @@ class GedcomRecord { } /** - * Convert a name record into sortable and full/display versions. This default - * should be OK for simple record types. INDI/FAM records will need to redefine it. + * Convert a name record into sortable and full/display versions. This default + * should be OK for simple record types. INDI/FAM records will need to redefine it. * * @param string $type * @param string $value @@ -602,7 +602,7 @@ class GedcomRecord { if ($this->canShowName()) { // Ask the record to extract its names $this->extractNames(); - // No name found? Use a fallback. + // No name found? Use a fallback. if (!$this->_getAllNames) { $this->addName(static::RECORD_TYPE, $this->getFallBackName(), null); } @@ -737,7 +737,7 @@ class GedcomRecord { } /** - * Get a sortable version of the name. Do not display this! + * Get a sortable version of the name. Do not display this! * * @return string */ diff --git a/app/GedcomTag.php b/app/GedcomTag.php index b8ef8130d5..6495d9d4ed 100644 --- a/app/GedcomTag.php +++ b/app/GedcomTag.php @@ -1635,31 +1635,31 @@ class GedcomTag { } case '_MBON': return - /* I18N: gedcom tag _MBON */ + /* I18N: gedcom tag _MBON */ I18N::translate('Marriage bond'); case '_MDCL': return - /* I18N: gedcom tag _MDCL */ + /* I18N: gedcom tag _MDCL */ I18N::translate('Medical'); case '_MEDC': return - /* I18N: gedcom tag _MEDC */ + /* I18N: gedcom tag _MEDC */ I18N::translate('Medical condition'); case '_MEND': return - /* I18N: gedcom tag _MEND */ + /* I18N: gedcom tag _MEND */ I18N::translate('Marriage ending status'); case '_MILI': return - /* I18N: gedcom tag _MILI */ + /* I18N: gedcom tag _MILI */ I18N::translate('Military'); case '_MILT': return - /* I18N: gedcom tag _MILT */ + /* I18N: gedcom tag _MILT */ I18N::translate('Military service'); case '_MREL': return - /* I18N: gedcom tag _MREL */ + /* I18N: gedcom tag _MREL */ I18N::translate('Relationship to mother'); case '_MSTAT': return @@ -1667,15 +1667,15 @@ class GedcomTag { I18N::translate('Marriage beginning status'); case '_NAME': return - /* I18N: gedcom tag _NAME */ + /* I18N: gedcom tag _NAME */ I18N::translate('Mailing name'); case '_NAMS': return - /* I18N: gedcom tag _NAMS */ + /* I18N: gedcom tag _NAMS */ I18N::translate('Namesake'); case '_NLIV': return - /* I18N: gedcom tag _NLIV */ + /* I18N: gedcom tag _NLIV */ I18N::translate('Not living'); case '_NMAR': switch ($sex) { @@ -1711,15 +1711,15 @@ class GedcomTag { return I18N::translate('by'); case '_PRMN': return - /* I18N: gedcom tag _PRMN */ + /* I18N: gedcom tag _PRMN */ I18N::translate('Permanent number'); case '_SCBK': return - /* I18N: gedcom tag _SCBK */ + /* I18N: gedcom tag _SCBK */ I18N::translate('Scrapbook'); case '_SEPR': return - /* I18N: gedcom tag _SEPR */ + /* I18N: gedcom tag _SEPR */ I18N::translate('Separated'); case '_SSHOW': return @@ -1727,43 +1727,43 @@ class GedcomTag { I18N::translate('Slide show'); case '_STAT': return - /* I18N: gedcom tag _STAT */ + /* I18N: gedcom tag _STAT */ I18N::translate('Marriage status'); case '_SUBQ': return - /* I18N: gedcom tag _SUBQ */ + /* I18N: gedcom tag _SUBQ */ I18N::translate('Short version'); case '_TODO': return - /* I18N: gedcom tag _TODO */ + /* I18N: gedcom tag _TODO */ I18N::translate('Research task'); case '_TYPE': return - /* I18N: gedcom tag _TYPE */ + /* I18N: gedcom tag _TYPE */ I18N::translate('Media type'); case '_UID': return - /* I18N: gedcom tag _UID */ + /* I18N: gedcom tag _UID */ I18N::translate('Globally unique identifier'); case '_URL': return - /* I18N: gedcom tag _URL */ + /* I18N: gedcom tag _URL */ I18N::translate('URL'); case '_WEIG': return - /* I18N: gedcom tag _WEIG */ + /* I18N: gedcom tag _WEIG */ I18N::translate('Weight'); case '_WITN': return - /* I18N: gedcom tag _WITN */ + /* I18N: gedcom tag _WITN */ I18N::translate('Witness'); case '_WT_OBJE_SORT': return - /* I18N: gedcom tag _WT_OBJE_SORT */ + /* I18N: gedcom tag _WT_OBJE_SORT */ I18N::translate('Re-order media'); case '_YART': return - /* I18N: gedcom tag _YART */ + /* I18N: gedcom tag _YART */ I18N::translate('Yahrzeit'); // Brit milah applies only to males, no need for male/female translations case '__BRTM_CHIL': @@ -1809,7 +1809,7 @@ class GedcomTag { public static function getLabelValue($tag, $value, GedcomRecord $record = null, $element = 'div') { return '<' . $element . ' class="fact_' . $tag . '">' . - /* I18N: a label/value pair, such as “Occupation: Farmer”. Some languages may need to change the punctuation. */ + /* I18N: a label/value pair, such as “Occupation: Farmer”. Some languages may need to change the punctuation. */ I18N::translate('<span class="label">%1$s:</span> <span class="field" dir="auto">%2$s</span>', self::getLabel($tag, $record), $value) . '</' . $element . '>'; } diff --git a/app/I18N.php b/app/I18N.php index 0d12163b2c..35b1d68a5c 100644 --- a/app/I18N.php +++ b/app/I18N.php @@ -156,7 +156,7 @@ class I18N { * @return string */ public static function dateFormat() { - return /* I18N: This is the format string for full dates. See http://php.net/date for codes */ self::$translator->translate('%j %F %Y'); + return /* I18N: This is the format string for full dates. See http://php.net/date for codes */ self::$translator->translate('%j %F %Y'); } /** @@ -218,9 +218,9 @@ class I18N { return '"language": {' . ' "paginate": {' . - ' "first": "' . /* I18N: button label, first page */ self::translate('first') . '",' . - ' "last": "' . /* I18N: button label, last page */ self::translate('last') . '",' . - ' "next": "' . /* I18N: button label, next page */ self::translate('next') . '",' . + ' "first": "' . /* I18N: button label, first page */ self::translate('first') . '",' . + ' "last": "' . /* I18N: button label, last page */ self::translate('last') . '",' . + ' "next": "' . /* I18N: button label, next page */ self::translate('next') . '",' . ' "previous": "' . /* I18N: button label, previous page */ self::translate('previous') . '"' . ' },' . ' "emptyTable": "' . self::translate('No records to display') . '",' . @@ -283,13 +283,13 @@ class I18N { public static function gedcomAge($string) { switch ($string) { case 'STILLBORN': - // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (stillborn) + // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (stillborn) return self::translate('(stillborn)'); case 'INFANT': - // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in infancy) + // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in infancy) return self::translate('(in infancy)'); case 'CHILD': - // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in childhood) + // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in childhood) return self::translate('(in childhood)'); } $age = array(); @@ -318,13 +318,13 @@ class I18N { } if ($age) { if (!substr_compare($string, '<', 0, 1)) { - // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (aged less than 21 years) + // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (aged less than 21 years) return self::translate('(aged less than %s)', $age); } elseif (!substr_compare($string, '>', 0, 1)) { - // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (aged more than 21 years) + // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (aged more than 21 years) return self::translate('(aged more than %s)', $age); } else { - // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (aged 43 years) + // I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (aged 43 years) return self::translate('(aged %s)', $age); } } else { @@ -386,7 +386,7 @@ class I18N { // Load the translation file(s) // Note that glob() returns false instead of an empty array when open_basedir_restriction - // is in force and no files are found. See PHP bug #47358. + // is in force and no files are found. See PHP bug #47358. if (defined('GLOB_BRACE')) { $translation_files = array_merge( array(WT_ROOT . 'language/' . self::$locale->languageTag() . '.mo'), @@ -763,7 +763,7 @@ class I18N { return $range[0]; } } - // Not a recognised script. Maybe punctuation, spacing, etc. Keep looking. + // Not a recognised script. Maybe punctuation, spacing, etc. Keep looking. $pos += $chrlen; } @@ -771,7 +771,7 @@ class I18N { } /** - * Convert a number of seconds into a relative time. For example, 630 => "10 hours, 30 minutes ago" + * Convert a number of seconds into a relative time. For example, 630 => "10 hours, 30 minutes ago" * * @param int $seconds * @@ -815,7 +815,7 @@ class I18N { * @return string */ public static function timeFormat() { - return /* I18N: This is the format string for the time-of-day. See http://php.net/date for codes */ self::$translator->translate('%H:%i:%s'); + return /* I18N: This is the format string for the time-of-day. See http://php.net/date for codes */ self::$translator->translate('%H:%i:%s'); } /** @@ -837,7 +837,7 @@ class I18N { * Context sensitive version of translate. * * echo I18N::translateContext('NOMINATIVE', 'January'); - * echo I18N::translateContext('GENITIVE', 'January'); + * echo I18N::translateContext('GENITIVE', 'January'); * * @return string */ diff --git a/app/Individual.php b/app/Individual.php index 532ce5fcc7..56a35d87ee 100644 --- a/app/Individual.php +++ b/app/Individual.php @@ -160,7 +160,7 @@ class Individual extends GedcomRecord { } } } else { - // No individual linked to this account? Cannot use relationship privacy. + // No individual linked to this account? Cannot use relationship privacy. return true; } @@ -305,7 +305,7 @@ class Individual extends GedcomRecord { return true; } } - // The individual has one or more dated events. All are less than $MAX_ALIVE_AGE years ago. + // The individual has one or more dated events. All are less than $MAX_ALIVE_AGE years ago. // If one of these is a birth, the individual must be alive. if (preg_match('/\n1 BIRT(?:\n[2-9].+)*\n2 DATE /', $this->gedcom)) { return false; @@ -537,7 +537,7 @@ class Individual extends GedcomRecord { } /** - * Get the range of years in which a individual lived. e.g. “1870–”, “1870–1920”, “–1920”. + * Get the range of years in which a individual lived. e.g. “1870–”, “1870–1920”, “–1920”. * Provide the full date using a tooltip. * For consistent layout in charts, etc., show just a “–” when no dates are known. * Note that this is a (non-breaking) en-dash, and not a hyphen. @@ -729,7 +729,7 @@ class Individual extends GedcomRecord { /** * Get the sex - M F or U - * Use the un-privatised gedcom record. We call this function during + * Use the un-privatised gedcom record. We call this function during * the privatize-gedcom function, and we are allowed to know this. * * @return string @@ -997,7 +997,7 @@ class Individual extends GedcomRecord { // Father’s family with someone else if ($step_family->getSpouse($step_parent)) { return - /* I18N: A step-family. %s is an individual’s name */ + /* I18N: A step-family. %s is an individual’s name */ I18N::translate('Father’s family with %s', $step_family->getSpouse($step_parent)->getFullName()); } else { return @@ -1008,7 +1008,7 @@ class Individual extends GedcomRecord { // Mother’s family with someone else if ($step_family->getSpouse($step_parent)) { return - /* I18N: A step-family. %s is an individual’s name */ + /* I18N: A step-family. %s is an individual’s name */ I18N::translate('Mother’s family with %s', $step_family->getSpouse($step_parent)->getFullName()); } else { return @@ -1083,7 +1083,7 @@ class Individual extends GedcomRecord { * Convert a name record into ‘full’ and ‘sort’ versions. * Use the NAME field to generate the ‘full’ version, as the * gedcom spec says that this is the individual’s name, as they would write it. - * Use the SURN field to generate the sortable names. Note that this field + * Use the SURN field to generate the sortable names. Note that this field * may also be used for the ‘true’ surname, perhaps spelt differently to that * recorded in the NAME field. e.g. * @@ -1133,7 +1133,7 @@ class Individual extends GedcomRecord { // Extract the components from NAME - use for the "full" names //////////////////////////////////////////////////////////////////////////// - // Fix bad slashes. e.g. 'John/Smith' => 'John/Smith/' + // Fix bad slashes. e.g. 'John/Smith' => 'John/Smith/' if (substr_count($full, '/') % 2 == 1) { $full = $full . '/'; } diff --git a/app/Module.php b/app/Module.php index b5874f6678..569e08b28a 100644 --- a/app/Module.php +++ b/app/Module.php @@ -52,7 +52,7 @@ class Module { throw new \Exception; } } catch (\Exception $ex) { - // The module has been deleted or is broken? Disable it. + // The module has been deleted or is broken? Disable it. Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it"); Database::prepare( "UPDATE `##module` SET status = 'disabled' WHERE module_name = :module_name" @@ -99,7 +99,7 @@ class Module { } } - // The order of menus/sidebars/tabs is defined in the database. Others are sorted by name. + // The order of menus/sidebars/tabs is defined in the database. Others are sorted by name. if ($component !== 'menu' && $component !== 'sidebar' && $component !== 'tab') { uasort($array, function (AbstractModule $x, AbstractModule $y) { return I18N::strcasecmp($x->getTitle(), $y->getTitle()); @@ -137,7 +137,7 @@ class Module { } } - // The order of menus/sidebars/tabs is defined in the database. Others are sorted by name. + // The order of menus/sidebars/tabs is defined in the database. Others are sorted by name. if ($component !== 'menu' && $component !== 'sidebar' && $component !== 'tab') { uasort($array, function (AbstractModule $x, AbstractModule $y) { return I18N::strcasecmp($x->getTitle(), $y->getTitle()); @@ -265,7 +265,7 @@ class Module { $module instanceof ModuleSidebarInterface ? $module->defaultSidebarOrder() : null, $module instanceof ModuleTabInterface ? $module->defaultTabOrder() : null, )); - // Set the default privcy for this module. Note that this also sets it for the + // Set the default privcy for this module. Note that this also sets it for the // default family tree, with a gedcom_id of -1 if ($module instanceof ModuleMenuInterface) { Database::prepare( diff --git a/app/Module/AbstractModule.php b/app/Module/AbstractModule.php index 9edea5d7d0..8ca516b49e 100644 --- a/app/Module/AbstractModule.php +++ b/app/Module/AbstractModule.php @@ -142,7 +142,7 @@ abstract class AbstractModule { } /** - * Get a module setting. Return a default if the setting is not set. + * Get a module setting. Return a default if the setting is not set. * * @param string $setting_name * @param string $default diff --git a/app/Module/AlbumModule.php b/app/Module/AlbumModule.php index d08bfa981e..32bf595dd3 100644 --- a/app/Module/AlbumModule.php +++ b/app/Module/AlbumModule.php @@ -60,7 +60,7 @@ class AlbumModule extends AbstractModule implements ModuleTabInterface { } /** - * Is this tab empty? If so, we don't always need to display it. + * Is this tab empty? If so, we don't always need to display it. * * @return bool */ diff --git a/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php b/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php index 4f3dcaaa82..a23647d98e 100644 --- a/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php +++ b/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php @@ -123,7 +123,7 @@ class BatchUpdateSearchReplacePlugin extends BatchUpdateBasePlugin { try { preg_match('/' . $this->search . '/', null); } catch (\ErrorException $ex) { - $this->error = '<div class="alert alert-danger">' . I18N::translate('The regex appears to contain an error. It can’t be used.') . '</div>'; + $this->error = '<div class="alert alert-danger">' . I18N::translate('The regex appears to contain an error. It can’t be used.') . '</div>'; } break; } diff --git a/app/Module/BatchUpdateModule.php b/app/Module/BatchUpdateModule.php index 72a9db10cd..e61b51405b 100644 --- a/app/Module/BatchUpdateModule.php +++ b/app/Module/BatchUpdateModule.php @@ -225,7 +225,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface <?php if (!Auth::user()->getPreference('auto_accept')): ?> <div class="alert alert-danger"> - <?php echo I18N::translate('Your user account does not have “automatically approve changes” enabled. You will only be able to change one record at a time.'); ?> + <?php echo I18N::translate('Your user account does not have “automatically approve changes” enabled. You will only be able to change one record at a time.'); ?> </div> <?php endif; ?> diff --git a/app/Module/CkeditorModule.php b/app/Module/CkeditorModule.php index d3a216be2e..65de600487 100644 --- a/app/Module/CkeditorModule.php +++ b/app/Module/CkeditorModule.php @@ -24,12 +24,12 @@ use Fisharebest\Webtrees\I18N; class CkeditorModule extends AbstractModule { /** {@inheritdoc} */ public function getTitle() { - return /* I18N: Name of a module. CKEditor is a trademark. Do not translate it? http://ckeditor.com */ I18N::translate('CKEditor™'); + return /* I18N: Name of a module. CKEditor is a trademark. Do not translate it? http://ckeditor.com */ I18N::translate('CKEditor™'); } /** {@inheritdoc} */ public function getDescription() { - return /* I18N: Description of the “CKEditor” module. WYSIWYG = “what you see is what you get” */ I18N::translate('Allow other modules to edit text using a “WYSIWYG” editor, instead of using HTML codes.'); + return /* I18N: Description of the “CKEditor” module. WYSIWYG = “what you see is what you get” */ I18N::translate('Allow other modules to edit text using a “WYSIWYG” editor, instead of using HTML codes.'); } /** diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php index f293900870..cef4c96df1 100644 --- a/app/Module/ClippingsCartModule.php +++ b/app/Module/ClippingsCartModule.php @@ -296,7 +296,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface, if (!$cart[$WT_TREE->getTreeId()]) { if ($clip_ctrl->action != 'add') { - echo I18N::translate('The clippings cart allows you to take extracts (“clippings”) from this family tree and bundle them up into a single file for downloading and subsequent importing into your own genealogy program. The downloadable file is recorded in GEDCOM format.<br><ul><li>How to take clippings?<br>This is really simple. Whenever you see a clickable name (individual, family, or source) you can go to the Details page of that name. There you will see the <b>Add to clippings cart</b> option. When you click that link you will be offered several options to download.</li><li>How to download?<br>Once you have items in your cart, you can download them just by clicking the “Download” link. Follow the instructions and links.</li></ul>'); + echo I18N::translate('The clippings cart allows you to take extracts (“clippings”) from this family tree and bundle them up into a single file for downloading and subsequent importing into your own genealogy program. The downloadable file is recorded in GEDCOM format.<br><ul><li>How to take clippings?<br>This is really simple. Whenever you see a clickable name (individual, family, or source) you can go to the Details page of that name. There you will see the <b>Add to clippings cart</b> option. When you click that link you will be offered several options to download.</li><li>How to download?<br>Once you have items in your cart, you can download them just by clicking the “Download” link. Follow the instructions and links.</li></ul>'); ?> <form method="get" name="addin" action="module.php"> <input type="hidden" name="mod" value="clippings"> @@ -346,7 +346,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface, <tr><td colspan="2" class="topbottombar"><h2><?php echo I18N::translate('Download'); ?></h2></td></tr> <tr> <td class="descriptionbox width50 wrap"> - <?php echo I18N::translate('To reduce the size of the download, you can compress the data into a .ZIP file. You will need to uncompress the .ZIP file before you can use it.'); ?> + <?php echo I18N::translate('To reduce the size of the download, you can compress the data into a .ZIP file. You will need to uncompress the .ZIP file before you can use it.'); ?> </td> <td class="optionbox wrap"> <input type="checkbox" name="Zip" value="yes"> @@ -472,7 +472,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface, } /** - * The user can re-order menus. Until they do, they are shown in this order. + * The user can re-order menus. Until they do, they are shown in this order. * * @return int */ diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php index 347aa3aca4..dca6fbd9e1 100644 --- a/app/Module/FamilyTreeStatisticsModule.php +++ b/app/Module/FamilyTreeStatisticsModule.php @@ -177,14 +177,14 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn } if ($stat_most_chil && !$block) { - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Family with the most children') . '</div><div class="facts_value stats_value stat-cell">' . $stats->largestFamilySize() . '</div>'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Family with the most children') . '</div><div class="facts_value stats_value stat-cell">' . $stats->largestFamilySize() . '</div>'; if (!$block) { $content .= '<div class="facts_value stat-cell left">' . $stats->largestFamily() . '</div>'; } $content .= '</div>'; } if ($stat_avg_chil) { - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Average number of children per family') . '</div><div class="facts_value stats_value stat-cell">' . $stats->averageChildren() . '</div>'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Average number of children per family') . '</div><div class="facts_value stats_value stat-cell">' . $stats->averageChildren() . '</div>'; if (!$block) { $content .= '<div class="facts_value stat-cell left"></div>'; } diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php index 1b36b581cf..8b4adf4fc9 100644 --- a/app/Module/FrequentlyAskedQuestionsModule.php +++ b/app/Module/FrequentlyAskedQuestionsModule.php @@ -31,7 +31,7 @@ use Fisharebest\Webtrees\Tree; class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMenuInterface, ModuleConfigInterface { /** {@inheritdoc} */ public function getTitle() { - return /* I18N: Name of a module. Abbreviation for “Frequently Asked Questions” */ I18N::translate('FAQ'); + return /* I18N: Name of a module. Abbreviation for “Frequently Asked Questions” */ I18N::translate('FAQ'); } /** {@inheritdoc} */ @@ -444,7 +444,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen </ol> <h2><?php echo $controller->getPageTitle(); ?></h2> <p> - <?php echo I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors. Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.'); ?> + <?php echo I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors. Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.'); ?> <?php echo I18N::translate('You may use HTML to format the answer and to add links to other websites.'); ?> </p> <form class="form form-inline"> @@ -509,7 +509,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen } /** - * The user can re-order menus. Until they do, they are shown in this order. + * The user can re-order menus. Until they do, they are shown in this order. * * @return int */ diff --git a/app/Module/GoogleMapsModule.php b/app/Module/GoogleMapsModule.php index 1403b62dcb..a215cc177d 100644 --- a/app/Module/GoogleMapsModule.php +++ b/app/Module/GoogleMapsModule.php @@ -70,7 +70,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, /** {@inheritdoc} */ public function getTitle() { - return /* I18N: The name of a module. Google Maps™ is a trademark. Do not translate it? http://en.wikipedia.org/wiki/Google_maps */ I18N::translate('Google Maps™'); + return /* I18N: The name of a module. Google Maps™ is a trademark. Do not translate it? http://en.wikipedia.org/wiki/Google_maps */ I18N::translate('Google Maps™'); } /** {@inheritdoc} */ @@ -367,7 +367,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, </div> </div> </div> - <p class="small text-muted"><?php echo I18N::translate('Minimum and maximum zoom level for the Google map. 1 is the full map, 15 is single house. Note that 15 is only available in certain areas.') ?></p> + <p class="small text-muted"><?php echo I18N::translate('Minimum and maximum zoom level for the Google map. 1 is the full map, 15 is single house. Note that 15 is only available in certain areas.') ?></p> </div> </fieldset> @@ -389,7 +389,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, </div> <?php endforeach ?> </div> - <p class="small text-muted"><?php echo I18N::translate('This specifies the precision of the different levels when entering new geographic locations. For example a country will be specified with precision 0 (=0 digits after the decimal point), while a town needs 3 or 4 digits.') ?></p> + <p class="small text-muted"><?php echo I18N::translate('This specifies the precision of the different levels when entering new geographic locations. For example a country will be specified with precision 0 (=0 digits after the decimal point), while a town needs 3 or 4 digits.') ?></p> </div> </fieldset> @@ -433,7 +433,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, <?php endfor ?> </div> </div> - <p class="small text-muted"><?php echo I18N::translate('Some place names may be written with optional prefixes and suffixes. For example “Orange” versus “Orange County”. If the family tree contains the full place names, but the geographic database contains the short place names, then you should specify a list of the prefixes and suffixes to be disregarded. Multiple options should be separated with semicolons. For example “County;County of” or “Township;Twp;Twp.”.') ?></p> + <p class="small text-muted"><?php echo I18N::translate('Some place names may be written with optional prefixes and suffixes. For example “Orange” versus “Orange County”. If the family tree contains the full place names, but the geographic database contains the short place names, then you should specify a list of the prefixes and suffixes to be disregarded. Multiple options should be separated with semicolons. For example “County;County of” or “Township;Twp;Twp.”.') ?></p> </div> </fieldset> @@ -648,7 +648,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, <h4><?php echo I18N::translate('Change flag') ?></h4> <p class="small text-muted"> - <?php echo I18N::translate('Using the pull down menu it is possible to select a country, of which a flag can be selected. If no flags are shown, then there are no flags defined for this country.') ?> + <?php echo I18N::translate('Using the pull down menu it is possible to select a country, of which a flag can be selected. If no flags are shown, then there are no flags defined for this country.') ?> </p> <form method="post" id="flags" name="flags" action="module.php?mod=googlemap&mod_action=flags&countrySelected=<?php echo $countrySelected ?>&stateSelected=<?php echo $stateSelected ?>"> @@ -3977,7 +3977,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, <input type="radio" id="new_prec_5" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision >= $this->getSetting('GM_PRECISION_5')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_5') ?>"> <label for="new_prec_5"><?php echo I18N::translate('Max') ?></label> <p class="small text-muted"> - <?php echo I18N::translate('Here you can enter the precision. Based on this setting the number of digits that will be used in the latitude and longitude is determined.') ?> + <?php echo I18N::translate('Here you can enter the precision. Based on this setting the number of digits that will be used in the latitude and longitude is determined.') ?> </p> </td> </tr> @@ -4008,7 +4008,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, <td class="optionbox" colspan="2"> <input type="text" id="NEW_ZOOM_FACTOR" name="NEW_ZOOM_FACTOR" value="<?php echo $zoomfactor ?>" size="20" onchange="updateMap();"> <p class="small text-muted"> - <?php echo I18N::translate('Here the zoom level can be entered. This value will be used as the minimal value when displaying this geographic location on a map.') ?> + <?php echo I18N::translate('Here the zoom level can be entered. This value will be used as the minimal value when displaying this geographic location on a map.') ?> </p> </td> </tr> @@ -4027,7 +4027,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, <?php } ?> </div> <p class="small text-muted"> - <?php echo I18N::translate('Here an icon can be set or removed. Using this link a flag can be selected. When this geographic location is shown, this flag will be displayed.') ?> + <?php echo I18N::translate('Here an icon can be set or removed. Using this link a flag can be selected. When this geographic location is shown, this flag will be displayed.') ?> </p> </td> </tr> @@ -4574,7 +4574,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, </label> </div> <p class="small text-muted"> - <?php echo I18N::translate('By default, the list shows only those places which can be found in your family trees. You may have details for other places, such as those imported in bulk from an external file. Selecting this option will show all places, including ones that are not currently used.') ?> + <?php echo I18N::translate('By default, the list shows only those places which can be found in your family trees. You may have details for other places, such as those imported in bulk from an external file. Selecting this option will show all places, including ones that are not currently used.') ?> <?php echo I18N::translate('If you have a large number of inactive places, it can be slow to generate the list.') ?> </p> </form> diff --git a/app/Module/HtmlBlockModule.php b/app/Module/HtmlBlockModule.php index d46dc2dfee..65f4d5e08a 100644 --- a/app/Module/HtmlBlockModule.php +++ b/app/Module/HtmlBlockModule.php @@ -157,7 +157,7 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface { '#getAllTagsTable#', I18N::translate('Narrative description') => - /* I18N: do not translate the #keywords# */ I18N::translate('This family tree was last updated on #gedcomUpdated#. There are #totalSurnames# surnames in this family tree. The earliest recorded event is the #firstEventType# of #firstEventName# in #firstEventYear#. The most recent event is the #lastEventType# of #lastEventName# in #lastEventYear#.<br><br>If you have any comments or feedback please contact #contactWebmaster#.'), + /* I18N: do not translate the #keywords# */ I18N::translate('This family tree was last updated on #gedcomUpdated#. There are #totalSurnames# surnames in this family tree. The earliest recorded event is the #firstEventType# of #firstEventName# in #firstEventYear#. The most recent event is the #lastEventType# of #lastEventName# in #lastEventYear#.<br><br>If you have any comments or feedback please contact #contactWebmaster#.'), I18N::translate('Statistics') => '<div class="gedcom_stats"> @@ -288,7 +288,7 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface { } echo '</select>'; if (!$html) { - echo '<p>', I18N::translate('To assist you in getting started with this block, we have created several standard templates. When you select one of these templates, the text area will contain a copy that you can then alter to suit your site’s requirements.'), '</p>'; + echo '<p>', I18N::translate('To assist you in getting started with this block, we have created several standard templates. When you select one of these templates, the text area will contain a copy that you can then alter to suit your site’s requirements.'), '</p>'; } echo '</td></tr>'; @@ -313,7 +313,7 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface { echo '<tr><td colspan="2" class="descriptionbox">', I18N::translate('Content'); if (!$html) { - echo '<p>', I18N::translate('As well as using the toolbar to apply HTML formatting, you can insert database fields which are updated automatically. These special fields are marked with <b>#</b> characters. For example <b>#totalFamilies#</b> will be replaced with the actual number of families in the database. Advanced users may wish to apply CSS classes to their text, so that the formatting matches the currently selected theme.'), '</p>'; + echo '<p>', I18N::translate('As well as using the toolbar to apply HTML formatting, you can insert database fields which are updated automatically. These special fields are marked with <b>#</b> characters. For example <b>#totalFamilies#</b> will be replaced with the actual number of families in the database. Advanced users may wish to apply CSS classes to their text, so that the formatting matches the currently selected theme.'), '</p>'; } echo '</td></tr><tr>', diff --git a/app/Module/ModuleMenuInterface.php b/app/Module/ModuleMenuInterface.php index a47cfcaf41..e1f1006b98 100644 --- a/app/Module/ModuleMenuInterface.php +++ b/app/Module/ModuleMenuInterface.php @@ -22,7 +22,7 @@ use Fisharebest\Webtrees\Menu; */ interface ModuleMenuInterface { /** - * The user can re-order menus. Until they do, they are shown in this order. + * The user can re-order menus. Until they do, they are shown in this order. * * @return int */ diff --git a/app/Module/ModuleSidebarInterface.php b/app/Module/ModuleSidebarInterface.php index 8332b0b4b6..392bd32d88 100644 --- a/app/Module/ModuleSidebarInterface.php +++ b/app/Module/ModuleSidebarInterface.php @@ -20,7 +20,7 @@ namespace Fisharebest\Webtrees\Module; */ interface ModuleSidebarInterface { /** - * The user can change the order of sidebars. Until they do this, they are shown in this order. + * The user can change the order of sidebars. Until they do this, they are shown in this order. * * @return int */ diff --git a/app/Module/ModuleTabInterface.php b/app/Module/ModuleTabInterface.php index 81fe490a67..2af0a5a774 100644 --- a/app/Module/ModuleTabInterface.php +++ b/app/Module/ModuleTabInterface.php @@ -35,7 +35,7 @@ interface ModuleTabInterface { public function getTabContent(); /** - * Is this tab empty? If so, we don't always need to display it. + * Is this tab empty? If so, we don't always need to display it. * * @return bool */ diff --git a/app/Module/OnThisDayModule.php b/app/Module/OnThisDayModule.php index 2f2b6fb7be..851aa504ec 100644 --- a/app/Module/OnThisDayModule.php +++ b/app/Module/OnThisDayModule.php @@ -74,11 +74,11 @@ class OnThisDayModule extends AbstractModule implements ModuleBlockInterface { $content = ''; switch ($infoStyle) { case 'list': - // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. + // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. $content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); break; case 'table': - // Style 2: New format, tables, big text, etc. Not too good on right side of page + // Style 2: New format, tables, big text, etc. Not too good on right side of page ob_start(); $content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); $content .= ob_get_clean(); diff --git a/app/Module/PageMenuModule.php b/app/Module/PageMenuModule.php index f2acca46c5..f808de465e 100644 --- a/app/Module/PageMenuModule.php +++ b/app/Module/PageMenuModule.php @@ -34,7 +34,7 @@ class PageMenuModule extends AbstractModule implements ModuleMenuInterface { } /** - * The user can re-order menus. Until they do, they are shown in this order. + * The user can re-order menus. Until they do, they are shown in this order. * * @return int */ diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php index cbc2042255..129df611f0 100644 --- a/app/Module/ResearchTaskModule.php +++ b/app/Module/ResearchTaskModule.php @@ -30,7 +30,7 @@ use Rhumsaa\Uuid\Uuid; class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface { /** {@inheritdoc} */ public function getTitle() { - return /* I18N: Name of a module. Tasks that need further research. */ I18N::translate('Research tasks'); + return /* I18N: Name of a module. Tasks that need further research. */ I18N::translate('Research tasks'); } /** {@inheritdoc} */ @@ -184,9 +184,9 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface ?> <tr> <td colspan="2"> - <?php echo I18N::translate('Research tasks are special events, added to individuals in your family tree, which identify the need for further research. You can use them as a reminder to check facts against more reliable sources, to obtain documents or photographs, to resolve conflicting information, etc.'); ?> + <?php echo I18N::translate('Research tasks are special events, added to individuals in your family tree, which identify the need for further research. You can use them as a reminder to check facts against more reliable sources, to obtain documents or photographs, to resolve conflicting information, etc.'); ?> <?php echo I18N::translate('To create new research tasks, you must first add “research task” to the list of facts and events in the family tree’s preferences.'); ?> - <?php echo I18N::translate('Research tasks are stored using the custom GEDCOM tag “_TODO”. Other genealogy applications may not recognize this tag.'); ?> + <?php echo I18N::translate('Research tasks are stored using the custom GEDCOM tag “_TODO”. Other genealogy applications may not recognize this tag.'); ?> </td> </tr> <?php diff --git a/app/Module/ReviewChangesModule.php b/app/Module/ReviewChangesModule.php index 1d9cbdb5bc..7090dbe0d0 100644 --- a/app/Module/ReviewChangesModule.php +++ b/app/Module/ReviewChangesModule.php @@ -176,7 +176,7 @@ class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface ?> <tr> <td colspan="2"> - <?php echo I18N::translate('This block will show editors a list of records with pending changes that need to be approved by a moderator. It also generates daily emails to moderators whenever pending changes exist.'); ?> + <?php echo I18N::translate('This block will show editors a list of records with pending changes that need to be approved by a moderator. It also generates daily emails to moderators whenever pending changes exist.'); ?> </td> </tr> diff --git a/app/Module/SiteMapModule.php b/app/Module/SiteMapModule.php index d008516726..0408dcda7c 100644 --- a/app/Module/SiteMapModule.php +++ b/app/Module/SiteMapModule.php @@ -303,7 +303,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface { echo '<p>', /* I18N: The www.sitemaps.org site is translated into many languages (e.g. http://www.sitemaps.org/fr/) - choose an appropriate URL. */ - I18N::translate('Sitemaps are a way for webmasters to tell search engines about the pages on a website that are available for crawling. All major search engines support sitemaps. For more information, see <a href="http://www.sitemaps.org/">www.sitemaps.org</a>.') . + I18N::translate('Sitemaps are a way for webmasters to tell search engines about the pages on a website that are available for crawling. All major search engines support sitemaps. For more information, see <a href="http://www.sitemaps.org/">www.sitemaps.org</a>.') . '</p>', '<p>', I18N::translate('Which family trees should be included in the sitemaps?'), '</p>', '<form method="post" action="module.php?mod=' . $this->getName() . '&mod_action=admin">', diff --git a/app/Module/SlideShowModule.php b/app/Module/SlideShowModule.php index eae56f4441..217cd72bee 100644 --- a/app/Module/SlideShowModule.php +++ b/app/Module/SlideShowModule.php @@ -56,7 +56,7 @@ class SlideShowModule extends AbstractModule implements ModuleBlockInterface { $start = $this->getBlockSetting($block_id, 'start', '0') || Filter::getBool('start'); // We can apply the filters using SQL - // Do not use "ORDER BY RAND()" - it is very slow on large tables. Use PHP::array_rand() instead. + // Do not use "ORDER BY RAND()" - it is very slow on large tables. Use PHP::array_rand() instead. $all_media = Database::prepare( "SELECT m_id FROM `##media`" . " WHERE m_file = ?" . diff --git a/app/Module/StoriesModule.php b/app/Module/StoriesModule.php index 3d548e74ec..a849044150 100644 --- a/app/Module/StoriesModule.php +++ b/app/Module/StoriesModule.php @@ -478,7 +478,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module } /** - * The user can re-order menus. Until they do, they are shown in this order. + * The user can re-order menus. Until they do, they are shown in this order. * * @return int */ diff --git a/app/Module/TopGivenNamesModule.php b/app/Module/TopGivenNamesModule.php index fe21fc936c..197a65c2da 100644 --- a/app/Module/TopGivenNamesModule.php +++ b/app/Module/TopGivenNamesModule.php @@ -28,7 +28,7 @@ use Fisharebest\Webtrees\Theme; class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface { /** {@inheritdoc} */ public function getTitle() { - return /* I18N: Name of a module. Top=Most common */ I18N::translate('Top given names'); + return /* I18N: Name of a module. Top=Most common */ I18N::translate('Top given names'); } /** {@inheritdoc} */ @@ -71,14 +71,14 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface // I18N: i.e. most popular given name. $title .= I18N::translate('Top given name'); } else { - // I18N: Title for a list of the most common given names, %s is a number. Note that a separate translation exists when %s is 1 + // I18N: Title for a list of the most common given names, %s is a number. Note that a separate translation exists when %s is 1 $title .= I18N::plural('Top %s given name', 'Top %s given names', $num, I18N::number($num)); } $content = '<div class="normal_inner_block">'; //Select List or Table switch ($infoStyle) { - case "list": // Output style 1: Simple list style. Better suited to left side of page. + case "list": // Output style 1: Simple list style. Better suited to left side of page. if (I18N::direction() === 'ltr') { $padding = 'padding-left: 15px'; } else { @@ -96,7 +96,7 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface $content .= '<b>' . I18N::translate('Males') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>'; } break; - case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page + case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page $params = array(1, $num, 'rcount'); $content .= '<table style="margin:auto;"> <tr valign="top"> diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php index 05c2175da3..86b2d7571d 100644 --- a/app/Module/TopSurnamesModule.php +++ b/app/Module/TopSurnamesModule.php @@ -34,7 +34,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface { * @return string */ public function getTitle() { - return /* I18N: Name of a module. Top=Most common */ I18N::translate('Top surnames'); + return /* I18N: Name of a module. Top=Most common */ I18N::translate('Top surnames'); } /** @@ -105,7 +105,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface { // I18N: i.e. most popular surname. $title .= I18N::translate('Top surname'); } else { - // I18N: Title for a list of the most common surnames, %s is a number. Note that a separate translation exists when %s is 1 + // I18N: Title for a list of the most common surnames, %s is a number. Note that a separate translation exists when %s is 1 $title .= I18N::plural('Top %s surname', 'Top %s surnames', $num, I18N::number($num)); } diff --git a/app/Module/UpcomingAnniversariesModule.php b/app/Module/UpcomingAnniversariesModule.php index e76475ed70..1b15ca5e01 100644 --- a/app/Module/UpcomingAnniversariesModule.php +++ b/app/Module/UpcomingAnniversariesModule.php @@ -84,11 +84,11 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI $content = ''; switch ($infoStyle) { case 'list': - // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. + // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. $content .= FunctionsPrintLists::eventsList($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); break; case 'table': - // Style 2: New format, tables, big text, etc. Not too good on right side of page + // Style 2: New format, tables, big text, etc. Not too good on right side of page ob_start(); $content .= FunctionsPrintLists::eventsTable($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); $content .= ob_get_clean(); diff --git a/app/Module/UserMessagesModule.php b/app/Module/UserMessagesModule.php index ce5ac9af6f..9361b386d1 100644 --- a/app/Module/UserMessagesModule.php +++ b/app/Module/UserMessagesModule.php @@ -93,7 +93,7 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface return $user->getUserId() !== Auth::id() && $user->getPreference('verified_by_admin') && $user->getPreference('contactmethod') !== 'none'; }); - $content = '<form id="messageform" name="messageform" method="post" action="module.php?mod=user_messages&mod_action=delete" onsubmit="return confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\');">'; + $content = '<form id="messageform" name="messageform" method="post" action="module.php?mod=user_messages&mod_action=delete" onsubmit="return confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\');">'; $content .= '<input type="hidden" name="ged" value="' . $ctype . '">'; $content .= '<input type="hidden" name="ctype" value="' . $WT_TREE->getNameHtml() . '">'; if ($users) { @@ -136,7 +136,7 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface if ($user) { $content .= '<button type="button" onclick="reply(\'' . Filter::escapeJs($message->sender) . '\', \'' . Filter::escapeJs($message->subject) . '\'); return false;">' . I18N::translate('Reply') . '</button> '; } - $content .= '<button type="button" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\')) {jQuery(\'#messageform :checkbox\').prop(\'checked\', false); jQuery(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>'; + $content .= '<button type="button" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\')) {jQuery(\'#messageform :checkbox\').prop(\'checked\', false); jQuery(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>'; } $content .= '</table>'; $content .= '<p><button type="submit">' . I18N::translate('Delete selected messages') . '</button></p>'; diff --git a/app/Module/YahrzeitModule.php b/app/Module/YahrzeitModule.php index 80a4f2642a..3d99dc4d8f 100644 --- a/app/Module/YahrzeitModule.php +++ b/app/Module/YahrzeitModule.php @@ -34,12 +34,12 @@ use Rhumsaa\Uuid\Uuid; class YahrzeitModule extends AbstractModule implements ModuleBlockInterface { /** {@inheritdoc} */ public function getTitle() { - return /* I18N: Name of a module. Yahrzeiten (the plural of Yahrzeit) are special anniversaries of deaths in the Hebrew faith/calendar. */ I18N::translate('Yahrzeiten'); + return /* I18N: Name of a module. Yahrzeiten (the plural of Yahrzeit) are special anniversaries of deaths in the Hebrew faith/calendar. */ I18N::translate('Yahrzeiten'); } /** {@inheritdoc} */ public function getDescription() { - return /* I18N: Description of the “Yahrzeiten” module. A “Hebrew death” is a death where the date is recorded in the Hebrew calendar. */ I18N::translate('A list of the Hebrew death anniversaries that will occur in the near future.'); + return /* I18N: Description of the “Yahrzeiten” module. A “Hebrew death” is a death where the date is recorded in the Hebrew calendar. */ I18N::translate('A list of the Hebrew death anniversaries that will occur in the near future.'); } /** @@ -103,7 +103,7 @@ class YahrzeitModule extends AbstractModule implements ModuleBlockInterface { $hd1 = new JewishDate($hd); $hd1->y += 1; $hd1->setJdFromYmd(); - // Special rules. See http://www.hebcal.com/help/anniv.html + // Special rules. See http://www.hebcal.com/help/anniv.html // Everything else is taken care of by our standard anniversary rules. if ($hd->d == 30 && $hd->m == 2 && $hd->y != 0 && $hd1->daysInMonth() < 30) { // 30 CSH - Last day in CSH diff --git a/app/Query/QueryName.php b/app/Query/QueryName.php index a0b8df7fab..0dbe4cacdd 100644 --- a/app/Query/QueryName.php +++ b/app/Query/QueryName.php @@ -250,7 +250,7 @@ class QueryName { ($marnm ? "" : " AND n_type!='_MARNM'"); // Fetch all the letters in our alphabet, whether or not there - // are any names beginning with that letter. It looks better to + // are any names beginning with that letter. It looks better to // show the full alphabet, rather than omitting rare letters such as X foreach (self::getAlphabetForLocale(WT_LOCALE) as $letter) { $count = 1; @@ -339,7 +339,7 @@ class QueryName { } // Fetch all the letters in our alphabet, whether or not there - // are any names beginning with that letter. It looks better to + // are any names beginning with that letter. It looks better to // show the full alphabet, rather than omitting rare letters such as X foreach (self::getAlphabetForLocale(WT_LOCALE) as $letter) { $count = Database::prepare($sql . " AND " . self::getInitialSql('n_givn', $letter))->fetchOne(); diff --git a/app/Report/ReportBaseCell.php b/app/Report/ReportBaseCell.php index 12a024658a..e828bc2017 100644 --- a/app/Report/ReportBaseCell.php +++ b/app/Report/ReportBaseCell.php @@ -65,7 +65,7 @@ class ReportBaseCell extends ReportBaseElement { */ public $left; /** - * Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right [DEFAULT]</li><li>1: to the beginning of the next line</li><li>2: below</li></ul> + * Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right [DEFAULT]</li><li>1: to the beginning of the next line</li><li>2: below</li></ul> * * @var int */ diff --git a/app/Schema/Migration11.php b/app/Schema/Migration11.php index fc1c5dd076..3b7c09b1ef 100644 --- a/app/Schema/Migration11.php +++ b/app/Schema/Migration11.php @@ -28,7 +28,7 @@ class Migration11 implements MigrationInterface { public function upgrade() { // - delete the wt_name.n_list column; it has never been used // - a bug in webtrees 1.1.2 caused the wt_name.n_full column - // to include slashes around the surname. These are unnecessary, + // to include slashes around the surname. These are unnecessary, // and cause problems when we try to match the name from the // gedcom with the name from the table. // Remove slashes from INDI names diff --git a/app/Schema/Migration15.php b/app/Schema/Migration15.php index c5f5a1cc7e..660125fa21 100644 --- a/app/Schema/Migration15.php +++ b/app/Schema/Migration15.php @@ -32,7 +32,7 @@ class Migration15 implements MigrationInterface { // There is no way to add a RESN tag to NOTE objects Database::exec("UPDATE `##gedcom_setting` SET setting_value='SOUR,RESN' WHERE setting_name='NOTE_FACTS_ADD' AND setting_value='SOUR'"); - // This needs to be an absolute URL. If not set, it defaults to the full path to login.php + // This needs to be an absolute URL. If not set, it defaults to the full path to login.php Database::exec("DELETE FROM `##site_setting` WHERE setting_name='LOGIN_URL' AND setting_value='login.php'"); // No need for an empty value Database::exec("DELETE FROM `##site_setting` WHERE setting_name='SERVER_URL' AND setting_value=''"); diff --git a/app/Schema/Migration21.php b/app/Schema/Migration21.php index 9e27f97be6..94e5edd441 100644 --- a/app/Schema/Migration21.php +++ b/app/Schema/Migration21.php @@ -50,7 +50,7 @@ class Migration21 implements MigrationInterface { ); // Previous versions of webtrees included the MEDIA_DIRECTORY setting in the - // FILE tag of the OBJE records. Remove it… + // FILE tag of the OBJE records. Remove it… Database::exec( "UPDATE `##media` m" . " JOIN `##gedcom_setting` gs ON (m.m_file = gs.gedcom_id AND gs.setting_name = 'MEDIA_DIRECTORY')" . diff --git a/app/Schema/Migration30.php b/app/Schema/Migration30.php index 2f6a172ad3..e1e5dda635 100644 --- a/app/Schema/Migration30.php +++ b/app/Schema/Migration30.php @@ -29,7 +29,7 @@ class Migration30 implements MigrationInterface { public function upgrade() { $WEBTREES_EMAIL = 'webtrees-noreply@' . preg_replace('/^www\./i', '', Filter::server('SERVER_NAME')); - // Default settings for new trees. No defaults for: + // Default settings for new trees. No defaults for: // imported, title, CONTACT_USER_ID, WEBMASTER_USER_ID // The following settings have defaults, but may need overwriting: // LANGUAGE, SURNAME_TRADITION diff --git a/app/Schema/Migration31.php b/app/Schema/Migration31.php index a0affb53a7..fb3f3bacca 100644 --- a/app/Schema/Migration31.php +++ b/app/Schema/Migration31.php @@ -49,7 +49,7 @@ class Migration31 implements MigrationInterface { 'new' => $new, )); } catch (PDOException $ex) { - // Duplicate key? Already done? + // Duplicate key? Already done? } Database::prepare( diff --git a/app/Session.php b/app/Session.php index 2d986a5318..37dd8b4a4b 100644 --- a/app/Session.php +++ b/app/Session.php @@ -108,7 +108,7 @@ class Session { } /** - * Set an explicit session ID. Typically used for search robots. + * Set an explicit session ID. Typically used for search robots. * * @param string $id */ diff --git a/app/Soundex.php b/app/Soundex.php index fdd9cbd926..e7cd46b149 100644 --- a/app/Soundex.php +++ b/app/Soundex.php @@ -151,8 +151,8 @@ class Soundex { /** * The DM sound coding table is organized this way: * key: a variable-length string that corresponds to the UTF-8 character sequence - * represented by the table entry. Currently, that string can be up to 7 - * bytes long. This maximum length is defined by the value of global variable + * represented by the table entry. Currently, that string can be up to 7 + * bytes long. This maximum length is defined by the value of global variable * $maxchar. * * value: an array as follows: diff --git a/app/Statement.php b/app/Statement.php index 9e99422468..d384eed9ed 100644 --- a/app/Statement.php +++ b/app/Statement.php @@ -52,7 +52,7 @@ class Statement { } // Parameters may be either named (e.g. :foo) or positional (e.g. ?). - // Named parameters may take any type. Positional parameters are always strings. + // Named parameters may take any type. Positional parameters are always strings. // Queries should use one format or the other. foreach ($bind_variables as $key => $bind_variable) { if (is_numeric($key)) { @@ -101,7 +101,7 @@ class Statement { /** * Fetch the next row from the cursor. * - * Execute the query, if necessary. Typically when there are no parameters. + * Execute the query, if necessary. Typically when there are no parameters. * * @param int $fetch_style * @@ -118,7 +118,7 @@ class Statement { /** * Fetch all rows from the cursor, and close it. * - * Execute the query, if necessary. Typically when there are no parameters. + * Execute the query, if necessary. Typically when there are no parameters. * * @param int $fetch_style * @@ -136,9 +136,9 @@ class Statement { } /** - * Fetch one row, and close the cursor. e.g. SELECT * FROM foo WHERE pk=bar + * Fetch one row, and close the cursor. e.g. SELECT * FROM foo WHERE pk=bar * - * Execute the query, if necessary. Typically when there are no parameters. + * Execute the query, if necessary. Typically when there are no parameters. * * @param int $fetch_style * @@ -156,9 +156,9 @@ class Statement { } /** - * Fetch one value and close the cursor. e.g. SELECT MAX(foo) FROM bar + * Fetch one value and close the cursor. e.g. SELECT MAX(foo) FROM bar * - * Execute the query, if necessary. Typically when there are no parameters. + * Execute the query, if necessary. Typically when there are no parameters. * * @return string|null */ @@ -176,7 +176,7 @@ class Statement { /** * Fetch two columns, and return an associative array of col1=>col2 * - * Execute the query, if necessary. Typically when there are no parameters. + * Execute the query, if necessary. Typically when there are no parameters. * * @return string[] */ @@ -197,7 +197,7 @@ class Statement { /** * Fetch all the first column, as an array. * - * Execute the query, if necessary. Typically when there are no parameters. + * Execute the query, if necessary. Typically when there are no parameters. * * @return string[] */ diff --git a/app/Stats.php b/app/Stats.php index 1074b52fed..2d9b4d0e00 100644 --- a/app/Stats.php +++ b/app/Stats.php @@ -969,7 +969,7 @@ class Stats { * Count the number of living individuals. * * The totalLiving/totalDeceased queries assume that every dead person will - * have a DEAT record. It will not include individuals who were born more + * have a DEAT record. It will not include individuals who were born more * than MAX_ALIVE_AGE years ago, and who have no DEAT record. * A good reason to run the “Add missing DEAT records” batch-update! * @@ -6657,8 +6657,8 @@ class Stats { /** * ISO3166 3 letter codes, with their 2 letter equivalent. - * NOTE: this is not 1:1. ENG/SCO/WAL/NIR => GB - * NOTE: this also includes champman codes and others. Should it? + * NOTE: this is not 1:1. ENG/SCO/WAL/NIR => GB + * NOTE: this also includes champman codes and others. Should it? * * @return string[] */ @@ -6995,7 +6995,7 @@ class Stats { */ private function centuryName($century) { if ($century < 0) { - return str_replace(-$century, self::centuryName(-$century), /* I18N: BCE=Before the Common Era, for Julian years < 0. See http://en.wikipedia.org/wiki/Common_Era */ + return str_replace(-$century, self::centuryName(-$century), /* I18N: BCE=Before the Common Era, for Julian years < 0. See http://en.wikipedia.org/wiki/Common_Era */ I18N::translate('%s BCE', I18N::number(-$century))); } // The current chart engine (Google charts) can't handle <sup></sup> markup diff --git a/app/Theme.php b/app/Theme.php index 202455185d..d5a923bd71 100644 --- a/app/Theme.php +++ b/app/Theme.php @@ -51,7 +51,7 @@ class Theme { self::$installed_themes[] = $theme; } } catch (\Exception $ex) { - // Broken theme? Ignore it. + // Broken theme? Ignore it. } } } diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php index a71fc73e72..7a168db087 100644 --- a/app/Theme/AbstractTheme.php +++ b/app/Theme/AbstractTheme.php @@ -341,7 +341,7 @@ abstract class AbstractTheme { /** * Create a container for messages that are "flashed" to the session - * on one request, and displayed on another. If there are many messages, + * on one request, and displayed on another. If there are many messages, * the container may need a max-height and scroll-bar. * * @param \stdClass[] $messages @@ -528,7 +528,7 @@ abstract class AbstractTheme { * @return string */ public function head(PageController $controller) { - // Record this now. By the time we render the footer, $controller no longer exists. + // Record this now. By the time we render the footer, $controller no longer exists. $this->page_views = $this->pageViews($controller); return @@ -982,7 +982,7 @@ abstract class AbstractTheme { } /** - * Initialise the theme. We cannot pass these in a constructor, as the construction + * Initialise the theme. We cannot pass these in a constructor, as the construction * happens in a theme file, and we need to be able to change it. * * @param Tree|null $tree The current tree (if there is one). @@ -1360,10 +1360,10 @@ abstract class AbstractTheme { // Do not show empty lists $row = Database::prepare( "SELECT SQL_CACHE" . - " EXISTS(SELECT 1 FROM `##sources` WHERE s_file = ? ) AS sour," . - " EXISTS(SELECT 1 FROM `##other` WHERE o_file = ? AND o_type='REPO') AS repo," . - " EXISTS(SELECT 1 FROM `##other` WHERE o_file = ? AND o_type='NOTE') AS note," . - " EXISTS(SELECT 1 FROM `##media` WHERE m_file = ? ) AS obje" + " EXISTS(SELECT 1 FROM `##sources` WHERE s_file = ?) AS sour," . + " EXISTS(SELECT 1 FROM `##other` WHERE o_file = ? AND o_type='REPO') AS repo," . + " EXISTS(SELECT 1 FROM `##other` WHERE o_file = ? AND o_type='NOTE') AS note," . + " EXISTS(SELECT 1 FROM `##media` WHERE m_file = ?) AS obje" )->execute(array( $this->tree->getTreeId(), $this->tree->getTreeId(), @@ -1836,7 +1836,7 @@ abstract class AbstractTheme { } /** - * Create a pending changes link. Some themes prefer an alert/banner to a menu. + * Create a pending changes link. Some themes prefer an alert/banner to a menu. * * @return string */ @@ -1876,7 +1876,7 @@ abstract class AbstractTheme { $this->menuSearch(), ), $this->menuModules())); } else { - // No public trees? No genealogy menu! + // No public trees? No genealogy menu! return array(); } } diff --git a/app/Theme/ColorsTheme.php b/app/Theme/ColorsTheme.php index 87b32dbfa6..ea22038cfc 100644 --- a/app/Theme/ColorsTheme.php +++ b/app/Theme/ColorsTheme.php @@ -110,7 +110,7 @@ class ColorsTheme extends CloudsTheme implements ThemeInterface { if (!$this->palette) { $this->palette = Session::get('subColor'); } - // We haven't selected one this session? Use the site default + // We haven't selected one this session? Use the site default if (!$this->palette) { $this->palette = Site::getPreference('DEFAULT_COLOR_PALETTE'); } diff --git a/app/Theme/ThemeInterface.php b/app/Theme/ThemeInterface.php index da10348231..05cb2c3224 100644 --- a/app/Theme/ThemeInterface.php +++ b/app/Theme/ThemeInterface.php @@ -189,7 +189,7 @@ interface ThemeInterface { public function individualBoxSmallEmpty(); /** - * Initialise the theme. We cannot pass these in a constructor, as the construction + * Initialise the theme. We cannot pass these in a constructor, as the construction * happens in a theme file, and we need to be able to change it. * * @param Tree|null $tree The current tree (if there is one). diff --git a/app/Tree.php b/app/Tree.php index 3273ce29f3..16319548b4 100644 --- a/app/Tree.php +++ b/app/Tree.php @@ -51,7 +51,7 @@ class Tree { private $user_preferences = array(); /** - * Create a tree object. This is a private constructor - it can only + * Create a tree object. This is a private constructor - it can only * be called from Tree::getAll() to ensure proper initialisation. * * @param int $tree_id @@ -489,7 +489,7 @@ class Tree { // Genealogy data // It is simpler to create a temporary/unimported GEDCOM than to populate all the tables... - $john_doe = /* I18N: This should be a common/default/placeholder name of an individual. Put slashes around the surname. */ + $john_doe = /* I18N: This should be a common/default/placeholder name of an individual. Put slashes around the surname. */ I18N::translate('John /DOE/'); $note = I18N::translate('Edit this individual and replace their details with your own.'); Database::prepare("INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)")->execute(array( @@ -518,7 +518,7 @@ class Tree { /** * Delete all the genealogy data from a tree - in preparation for importing - * new data. Optionally retain the media data, for when the user has been + * new data. Optionally retain the media data, for when the user has been * editing their data offline using an application which deletes (or does not * support) media data. * @@ -617,15 +617,15 @@ class Tree { * @throws \Exception */ public function importGedcomFile($path, $filename) { - // Read the file in blocks of roughly 64K. Ensure that each block - // contains complete gedcom records. This will ensure we don’t split + // Read the file in blocks of roughly 64K. Ensure that each block + // contains complete gedcom records. This will ensure we don’t split // multi-byte characters, as well as simplifying the code to import // each block. $file_data = ''; $fp = fopen($path, 'rb'); - // Don’t allow the user to cancel the request. We do not want to be left with an incomplete transaction. + // Don’t allow the user to cancel the request. We do not want to be left with an incomplete transaction. ignore_user_abort(true); Database::beginTransaction(); @@ -683,7 +683,7 @@ class Tree { } do { - // Use LAST_INSERT_ID(expr) to provide a transaction-safe sequence. See + // Use LAST_INSERT_ID(expr) to provide a transaction-safe sequence. See // http://dev.mysql.com/doc/refman/5.6/en/information-functions.html#function_last-insert-id $statement = Database::prepare( "UPDATE `##next_id` SET next_id = LAST_INSERT_ID(next_id + 1) WHERE record_type = :record_type AND gedcom_id = :tree_id" @@ -753,7 +753,7 @@ class Tree { throw new \Exception('Evil line endings found in GedcomRecord::createRecord(' . $gedcom . ')'); } - // webtrees creates XREFs containing digits. Anything else (e.g. “new”) is just a placeholder. + // webtrees creates XREFs containing digits. Anything else (e.g. “new”) is just a placeholder. if (!preg_match('/\d/', $xref)) { $xref = $this->getNewXref($type); $gedcom = preg_replace('/^0 @(' . WT_REGEX_XREF . ')@/', '0 @' . $xref . '@', $gedcom); @@ -780,7 +780,7 @@ class Tree { if (Auth::user()->getPreference('auto_accept')) { FunctionsImport::acceptAllChanges($xref, $this->tree_id); } - // Return the newly created record. Note that since GedcomRecord + // Return the newly created record. Note that since GedcomRecord // has a cache of pending changes, we cannot use it to create a // record with a newly created pending change. return GedcomRecord::getInstance($xref, $this, $gedcom); diff --git a/app/User.php b/app/User.php index 21821f2a99..94425c74e7 100644 --- a/app/User.php +++ b/app/User.php @@ -427,7 +427,7 @@ class User { "SELECT SQL_CACHE setting_name, setting_value FROM `##user_setting` WHERE user_id = ?" )->execute(array($this->user_id))->fetchAssoc(); } else { - // Not logged in? We have no preferences. + // Not logged in? We have no preferences. $this->preferences = array(); } } |