diff options
Diffstat (limited to 'app/Functions')
| -rw-r--r-- | app/Functions/Functions.php | 58 | ||||
| -rw-r--r-- | app/Functions/FunctionsDate.php | 2 | ||||
| -rw-r--r-- | app/Functions/FunctionsDb.php | 2 | ||||
| -rw-r--r-- | app/Functions/FunctionsEdit.php | 10 | ||||
| -rw-r--r-- | app/Functions/FunctionsExport.php | 12 | ||||
| -rw-r--r-- | app/Functions/FunctionsPrintFacts.php | 18 | ||||
| -rw-r--r-- | app/Functions/FunctionsPrintLists.php | 22 | ||||
| -rw-r--r-- | app/Functions/FunctionsRtl.php | 16 |
8 files changed, 70 insertions, 70 deletions
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; |