fisharebest / webtrees

app/Report/ReportHtmlTextbox.php

Indentation +237 added lines, -237 removed lines

@@ -19,253 +19,253 @@
  * Class ReportHtmlTextbox
  */
 class ReportHtmlTextbox extends ReportBaseTextbox {
-	/**
-	 * Render the elements.
-	 *
-	 * @param ReportHtml $renderer
-	 */
-	public function render($renderer) {
-		// checkFootnote
-		$newelements      = array();
-		$lastelement      = array();
-		$footnote_element = array();
-		// Element counter
-		$cE = count($this->elements);
-		//-- collapse duplicate elements
-		for ($i = 0; $i < $cE; $i++) {
-			$element = $this->elements[$i];
-			if (is_object($element)) {
-				if ($element instanceof ReportBaseText) {
-					if (!empty($footnote_element)) {
-						ksort($footnote_element);
-						foreach ($footnote_element as $links) {
-							$newelements[] = $links;
-						}
-						$footnote_element = array();
-					}
-					if (empty($lastelement)) {
-						$lastelement = $element;
-					} else {
-						// Checking if the Text has the same style
-						if ($element->getStyleName() == $lastelement->getStyleName()) {
-							$lastelement->addText(str_replace("\n", "<br>", $element->getValue()));
-						} elseif (!empty($lastelement)) {
-							$newelements[] = $lastelement;
-							$lastelement   = $element;
-						}
-					}
-				} // Collect the Footnote links
-				elseif ($element instanceof ReportBaseFootnote) {
-					// Check if the Footnote has been set with it’s link number
-					$renderer->checkFootnote($element);
-					// Save first the last element if any
-					if (!empty($lastelement)) {
-						$newelements[] = $lastelement;
-						$lastelement   = array();
-					}
-					// Save the Footnote with it’s link number as key for sorting later
-					$footnote_element[$element->num] = $element;
-				} //-- do not keep empty footnotes
-				elseif (!($element instanceof ReportBaseFootnote) || trim($element->getValue()) != "") {
-					if (!empty($footnote_element)) {
-						ksort($footnote_element);
-						foreach ($footnote_element as $links) {
-							$newelements[] = $links;
-						}
-						$footnote_element = array();
-					}
-					if (!empty($lastelement)) {
-						$newelements[] = $lastelement;
-						$lastelement   = array();
-					}
-					$newelements[] = $element;
-				}
-			} else {
-				if (!empty($lastelement)) {
-					$newelements[] = $lastelement;
-					$lastelement   = array();
-				}
-				if (!empty($footnote_element)) {
-					ksort($footnote_element);
-					foreach ($footnote_element as $links) {
-						$newelements[] = $links;
-					}
-					$footnote_element = array();
-				}
-				$newelements[] = $element;
-			}
-		}
-		if (!empty($lastelement)) {
-			$newelements[] = $lastelement;
-		}
-		if (!empty($footnote_element)) {
-			ksort($footnote_element);
-			foreach ($footnote_element as $links) {
-				$newelements[] = $links;
-			}
-		}
-		$this->elements = $newelements;
-		unset($footnote_element, $lastelement, $links, $newelements);
+    /**
+     * Render the elements.
+     *
+     * @param ReportHtml $renderer
+     */
+    public function render($renderer) {
+        // checkFootnote
+        $newelements      = array();
+        $lastelement      = array();
+        $footnote_element = array();
+        // Element counter
+        $cE = count($this->elements);
+        //-- collapse duplicate elements
+        for ($i = 0; $i < $cE; $i++) {
+            $element = $this->elements[$i];
+            if (is_object($element)) {
+                if ($element instanceof ReportBaseText) {
+                    if (!empty($footnote_element)) {
+                        ksort($footnote_element);
+                        foreach ($footnote_element as $links) {
+                            $newelements[] = $links;
+                        }
+                        $footnote_element = array();
+                    }
+                    if (empty($lastelement)) {
+                        $lastelement = $element;
+                    } else {
+                        // Checking if the Text has the same style
+                        if ($element->getStyleName() == $lastelement->getStyleName()) {
+                            $lastelement->addText(str_replace("\n", "<br>", $element->getValue()));
+                        } elseif (!empty($lastelement)) {
+                            $newelements[] = $lastelement;
+                            $lastelement   = $element;
+                        }
+                    }
+                } // Collect the Footnote links
+                elseif ($element instanceof ReportBaseFootnote) {
+                    // Check if the Footnote has been set with it’s link number
+                    $renderer->checkFootnote($element);
+                    // Save first the last element if any
+                    if (!empty($lastelement)) {
+                        $newelements[] = $lastelement;
+                        $lastelement   = array();
+                    }
+                    // Save the Footnote with it’s link number as key for sorting later
+                    $footnote_element[$element->num] = $element;
+                } //-- do not keep empty footnotes
+                elseif (!($element instanceof ReportBaseFootnote) || trim($element->getValue()) != "") {
+                    if (!empty($footnote_element)) {
+                        ksort($footnote_element);
+                        foreach ($footnote_element as $links) {
+                            $newelements[] = $links;
+                        }
+                        $footnote_element = array();
+                    }
+                    if (!empty($lastelement)) {
+                        $newelements[] = $lastelement;
+                        $lastelement   = array();
+                    }
+                    $newelements[] = $element;
+                }
+            } else {
+                if (!empty($lastelement)) {
+                    $newelements[] = $lastelement;
+                    $lastelement   = array();
+                }
+                if (!empty($footnote_element)) {
+                    ksort($footnote_element);
+                    foreach ($footnote_element as $links) {
+                        $newelements[] = $links;
+                    }
+                    $footnote_element = array();
+                }
+                $newelements[] = $element;
+            }
+        }
+        if (!empty($lastelement)) {
+            $newelements[] = $lastelement;
+        }
+        if (!empty($footnote_element)) {
+            ksort($footnote_element);
+            foreach ($footnote_element as $links) {
+                $newelements[] = $links;
+            }
+        }
+        $this->elements = $newelements;
+        unset($footnote_element, $lastelement, $links, $newelements);
 
-		$cP = 0; // Class Padding
+        $cP = 0; // Class Padding
 
-		// Used with line breaks and cell height calculation within this box only
-		$renderer->largestFontHeight = 0;
+        // Used with line breaks and cell height calculation within this box only
+        $renderer->largestFontHeight = 0;
 
-		// Current position
-		if ($this->left == ".") {
-			$cX = $renderer->getX();
-		} else {
-			$cX = $this->left;
-			$renderer->setX($cX);
-		}
-		// Current position (top)
-		if ($this->top == ".") {
-			$this->top = $renderer->getY();
-		} else {
-			$renderer->setY($this->top);
-		}
+        // Current position
+        if ($this->left == ".") {
+            $cX = $renderer->getX();
+        } else {
+            $cX = $this->left;
+            $renderer->setX($cX);
+        }
+        // Current position (top)
+        if ($this->top == ".") {
+            $this->top = $renderer->getY();
+        } else {
+            $renderer->setY($this->top);
+        }
 
-		// Check the width if set to page wide OR set by xml to larger then page wide
-		if ($this->width == 0 || $this->width > $renderer->getRemainingWidth()) {
-			$this->width = $renderer->getRemainingWidth();
-		}
-		// Setup the CellPadding
-		if ($this->padding) {
-			$cP = $renderer->cPadding;
-		}
+        // Check the width if set to page wide OR set by xml to larger then page wide
+        if ($this->width == 0 || $this->width > $renderer->getRemainingWidth()) {
+            $this->width = $renderer->getRemainingWidth();
+        }
+        // Setup the CellPadding
+        if ($this->padding) {
+            $cP = $renderer->cPadding;
+        }
 
-		// For padding, we have to use less wrap width
-		$cW = $this->width - ($cP * 2);
+        // For padding, we have to use less wrap width
+        $cW = $this->width - ($cP * 2);
 
-		//-- calculate the text box height
-		// Number of lines, will be converted to height
-		$cHT = 0;
-		// Element height (exept text)
-		$eH = 0;
-		// Footnote height (in points)
-		$fH = 0;
-		$w  = 0;
-		//-- $lw is an array
-		// 0 => last line width
-		// 1 => 1 if text was wrapped, 0 if text did not wrap
-		// 2 => number of LF
-		$lw = array();
-		// Element counter
-		$cE = count($this->elements);
-		for ($i = 0; $i < $cE; $i++) {
-			if (is_object($this->elements[$i])) {
-				$ew = $this->elements[$i]->setWrapWidth($cW - $w - 2, $cW);
-				if ($ew == $cW) {
-					$w = 0;
-				}
-				$lw = $this->elements[$i]->getWidth($renderer);
-				// Text is already gets the # LF
-				$cHT += $lw[2];
-				if ($lw[1] == 1) {
-					$w = $lw[0];
-				} elseif ($lw[1] == 2) {
-					$w = 0;
-				} else {
-					$w += $lw[0];
-				}
-				if ($w > $cW) {
-					$w = $lw[0];
-				}
-				// For anything else but text (images), get the height
-				$eH += $this->elements[$i]->getHeight($renderer);
-			} else {
-				$fH += abs($renderer->getFootnotesHeight($cW));
-			}
-		}
-		// Add up what’s the final height
-		$cH = $this->height;
-		// If any element exist
-		if ($cE > 0) {
-			// Check if this is text or some other element, like images
-			if ($eH == 0) {
-				// Number of LF but at least one line
-				$cHT = ($cHT + 1) * $renderer->cellHeightRatio;
-				// Calculate the cell hight with the largest font size used
-				$cHT = $cHT * $renderer->largestFontHeight;
-				if ($cH < $cHT) {
-					$cH = $cHT;
-				}
-			} // This is any other element
-			else {
-				if ($cH < $eH) {
-					$cH = $eH;
-				}
-				// Add Footnote height to the rest of the height
-				$cH += $fH;
-			}
-		}
+        //-- calculate the text box height
+        // Number of lines, will be converted to height
+        $cHT = 0;
+        // Element height (exept text)
+        $eH = 0;
+        // Footnote height (in points)
+        $fH = 0;
+        $w  = 0;
+        //-- $lw is an array
+        // 0 => last line width
+        // 1 => 1 if text was wrapped, 0 if text did not wrap
+        // 2 => number of LF
+        $lw = array();
+        // Element counter
+        $cE = count($this->elements);
+        for ($i = 0; $i < $cE; $i++) {
+            if (is_object($this->elements[$i])) {
+                $ew = $this->elements[$i]->setWrapWidth($cW - $w - 2, $cW);
+                if ($ew == $cW) {
+                    $w = 0;
+                }
+                $lw = $this->elements[$i]->getWidth($renderer);
+                // Text is already gets the # LF
+                $cHT += $lw[2];
+                if ($lw[1] == 1) {
+                    $w = $lw[0];
+                } elseif ($lw[1] == 2) {
+                    $w = 0;
+                } else {
+                    $w += $lw[0];
+                }
+                if ($w > $cW) {
+                    $w = $lw[0];
+                }
+                // For anything else but text (images), get the height
+                $eH += $this->elements[$i]->getHeight($renderer);
+            } else {
+                $fH += abs($renderer->getFootnotesHeight($cW));
+            }
+        }
+        // Add up what’s the final height
+        $cH = $this->height;
+        // If any element exist
+        if ($cE > 0) {
+            // Check if this is text or some other element, like images
+            if ($eH == 0) {
+                // Number of LF but at least one line
+                $cHT = ($cHT + 1) * $renderer->cellHeightRatio;
+                // Calculate the cell hight with the largest font size used
+                $cHT = $cHT * $renderer->largestFontHeight;
+                if ($cH < $cHT) {
+                    $cH = $cHT;
+                }
+            } // This is any other element
+            else {
+                if ($cH < $eH) {
+                    $cH = $eH;
+                }
+                // Add Footnote height to the rest of the height
+                $cH += $fH;
+            }
+        }
 
-		unset($lw, $cHT, $fH, $w);
+        unset($lw, $cHT, $fH, $w);
 
-		// Finaly, check the last cells height
-		if ($cH < $renderer->lastCellHeight) {
-			$cH = $renderer->lastCellHeight;
-		}
-		// Update max Y incase of a pagebreak
-		// We don't want to over write any images or other stuff
-		$renderer->addMaxY($this->top + $cH);
+        // Finaly, check the last cells height
+        if ($cH < $renderer->lastCellHeight) {
+            $cH = $renderer->lastCellHeight;
+        }
+        // Update max Y incase of a pagebreak
+        // We don't want to over write any images or other stuff
+        $renderer->addMaxY($this->top + $cH);
 
-		// Start to print HTML
-		echo "<div style=\"position:absolute;top:", $this->top, "pt;";
-		// LTR (left) or RTL (right)
-		echo $renderer->alignRTL, ":", $cX, "pt;";
-		// Background color
-		if ($this->fill) {
-			if (!empty($this->bgcolor)) {
-				echo " background-color:", $this->bgcolor, ";";
-			}
-		}
-		// Print padding only when it’s set
-		if ($this->padding) {
-			// Use Cell around padding to support RTL also
-			echo "padding:", $cP, "pt;";
-		}
-		// Border setup
-		if ($this->border) {
-			echo " border:solid black 1pt;";
-			echo "width:", ($this->width - 1 - ($cP * 2)), "pt;height:", $cH - 1, "pt;";
-		} else {
-			echo "width:", ($this->width - ($cP * 2)), "pt;height:", $cH, "pt;";
-		}
-		echo "\">";
+        // Start to print HTML
+        echo "<div style=\"position:absolute;top:", $this->top, "pt;";
+        // LTR (left) or RTL (right)
+        echo $renderer->alignRTL, ":", $cX, "pt;";
+        // Background color
+        if ($this->fill) {
+            if (!empty($this->bgcolor)) {
+                echo " background-color:", $this->bgcolor, ";";
+            }
+        }
+        // Print padding only when it’s set
+        if ($this->padding) {
+            // Use Cell around padding to support RTL also
+            echo "padding:", $cP, "pt;";
+        }
+        // Border setup
+        if ($this->border) {
+            echo " border:solid black 1pt;";
+            echo "width:", ($this->width - 1 - ($cP * 2)), "pt;height:", $cH - 1, "pt;";
+        } else {
+            echo "width:", ($this->width - ($cP * 2)), "pt;height:", $cH, "pt;";
+        }
+        echo "\">";
 
-		// Do a little "margin" trick before print
-		// to get the correct current position => "."
-		$cXT = $renderer->getX();
-		$cYT = $renderer->getY();
-		$renderer->setXy(0, 0);
+        // Do a little "margin" trick before print
+        // to get the correct current position => "."
+        $cXT = $renderer->getX();
+        $cYT = $renderer->getY();
+        $renderer->setXy(0, 0);
 
-		// Print the text elements
-		foreach ($this->elements as $element) {
-			if (is_object($element)) {
-				$element->render($renderer, $cX, false);
-			} elseif (is_string($element) && $element == "footnotetexts") {
-				$renderer->footnotes();
-			} elseif (is_string($element) && $element == "addpage") {
-				$renderer->addPage();
-			}
-		}
-		echo "</div>\n";
+        // Print the text elements
+        foreach ($this->elements as $element) {
+            if (is_object($element)) {
+                $element->render($renderer, $cX, false);
+            } elseif (is_string($element) && $element == "footnotetexts") {
+                $renderer->footnotes();
+            } elseif (is_string($element) && $element == "addpage") {
+                $renderer->addPage();
+            }
+        }
+        echo "</div>\n";
 
-		// Reset "margins"
-		$renderer->setXy($cXT, $cYT);
-		// This will be mostly used to trick the multiple images last height
-		if ($this->reseth) {
-			$cH = 0;
-		}
-		// New line and some clean up
-		if (!$this->newline) {
-			$renderer->setXy($cX + $this->width, $this->top);
-			$renderer->lastCellHeight = $cH;
-		} else {
-			$renderer->setXy(0, $this->top + $cH + ($cP * 2));
-			$renderer->lastCellHeight = 0;
-		}
-	}
+        // Reset "margins"
+        $renderer->setXy($cXT, $cYT);
+        // This will be mostly used to trick the multiple images last height
+        if ($this->reseth) {
+            $cH = 0;
+        }
+        // New line and some clean up
+        if (!$this->newline) {
+            $renderer->setXy($cX + $this->width, $this->top);
+            $renderer->lastCellHeight = $cH;
+        } else {
+            $renderer->setXy(0, $this->top + $cH + ($cP * 2));
+            $renderer->lastCellHeight = 0;
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -18,13 +18,15 @@
 /**
  * Class ReportHtmlTextbox
  */
-class ReportHtmlTextbox extends ReportBaseTextbox {
+class ReportHtmlTextbox extends ReportBaseTextbox
+{
 	/**
 	 * Render the elements.
 	 *
 	 * @param ReportHtml $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		// checkFootnote
 		$newelements      = array();
 		$lastelement      = array();

app/Report/ReportBaseCell.php

Indentation +160 added lines, -160 removed lines

@@ -19,171 +19,171 @@
  * Class ReportBaseCell
  */
 class ReportBaseCell extends ReportBaseElement {
-	/**
-	 * Allows to center or align the text. Possible values are:<ul><li>left or empty string: left align</li><li>center: center align</li><li>right: right align</li><li>justify: justification (default value when $ishtml=false)</li></ul>
-	 *
-	 * @var string
-	 */
-	public $align = "";
-	/**
-	 * Whether or not a border should be printed around this box. 0 = no border, 1 = border. Default is 0.
-	 * Or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-	 *
-	 * @var mixed
-	 */
-	public $border;
-	/**
-	 * Border color in HTML code
-	 *
-	 * @var string
-	 */
-	public $bocolor;
-	/**
-	 * The HTML color code to fill the background of this cell.
-	 *
-	 * @var string
-	 */
-	public $bgcolor;
-	/**
-	 * Indicates if the cell background must be painted (1) or transparent (0). Default value: 1.
-	 * If no background color is set then it will not be painted
-	 *
-	 * @var int
-	 */
-	public $fill;
-	/**
-	 * Cell height DEFAULT 0 (expressed in points)
-	 * The starting height of this cell. If the text wraps the height will automatically be adjusted.
-	 *
-	 * @var int
-	 */
-	public $height;
-	/**
-	 * Left position in user units (X-position). Default is the current position
-	 *
-	 * @var mixed
-	 */
-	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>
-	 *
-	 * @var int
-	 */
-	public $newline;
-	/**
-	 * The name of the Style that should be used to render the text.
-	 *
-	 * @var string
-	 */
-	public $styleName;
-	/**
-	 * Stretch carachter mode: <ul><li>0 = disabled (default)</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
-	 *
-	 * @var int
-	 */
-	public $stretch;
-	/**
-	 * Text color in HTML code
-	 *
-	 * @var string
-	 */
-	public $tcolor;
-	/**
-	 * Top position in user units (Y-position). Default is the current position
-	 *
-	 * @var mixed
-	 */
-	public $top;
-	/**
-	 * URL address
-	 *
-	 * @var string
-	 */
-	public $url;
-	/**
-	 * Cell width DEFAULT 0 (expressed in points)
-	 * Setting the width to 0 will make it the width from the current location to the right margin.
-	 *
-	 * @var int
-	 */
-	public $width;
+    /**
+     * Allows to center or align the text. Possible values are:<ul><li>left or empty string: left align</li><li>center: center align</li><li>right: right align</li><li>justify: justification (default value when $ishtml=false)</li></ul>
+     *
+     * @var string
+     */
+    public $align = "";
+    /**
+     * Whether or not a border should be printed around this box. 0 = no border, 1 = border. Default is 0.
+     * Or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
+     *
+     * @var mixed
+     */
+    public $border;
+    /**
+     * Border color in HTML code
+     *
+     * @var string
+     */
+    public $bocolor;
+    /**
+     * The HTML color code to fill the background of this cell.
+     *
+     * @var string
+     */
+    public $bgcolor;
+    /**
+     * Indicates if the cell background must be painted (1) or transparent (0). Default value: 1.
+     * If no background color is set then it will not be painted
+     *
+     * @var int
+     */
+    public $fill;
+    /**
+     * Cell height DEFAULT 0 (expressed in points)
+     * The starting height of this cell. If the text wraps the height will automatically be adjusted.
+     *
+     * @var int
+     */
+    public $height;
+    /**
+     * Left position in user units (X-position). Default is the current position
+     *
+     * @var mixed
+     */
+    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>
+     *
+     * @var int
+     */
+    public $newline;
+    /**
+     * The name of the Style that should be used to render the text.
+     *
+     * @var string
+     */
+    public $styleName;
+    /**
+     * Stretch carachter mode: <ul><li>0 = disabled (default)</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
+     *
+     * @var int
+     */
+    public $stretch;
+    /**
+     * Text color in HTML code
+     *
+     * @var string
+     */
+    public $tcolor;
+    /**
+     * Top position in user units (Y-position). Default is the current position
+     *
+     * @var mixed
+     */
+    public $top;
+    /**
+     * URL address
+     *
+     * @var string
+     */
+    public $url;
+    /**
+     * Cell width DEFAULT 0 (expressed in points)
+     * Setting the width to 0 will make it the width from the current location to the right margin.
+     *
+     * @var int
+     */
+    public $width;
 
-	/** @var int Unknown */
-	public $reseth;
+    /** @var int Unknown */
+    public $reseth;
 
-	/**
-	 * CELL - Element
-	 *
-	 * @param int    $width   cell width (expressed in points)
-	 * @param int    $height  cell height (expressed in points)
-	 * @param mixed  $border  Border style
-	 * @param string $align   Text alignement
-	 * @param string $bgcolor Background color code
-	 * @param string $style   The name of the text style
-	 * @param int    $ln      Indicates where the current position should go after the call
-	 * @param mixed  $top     Y-position
-	 * @param mixed  $left    X-position
-	 * @param int    $fill    Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
-	 * @param int $stretch Stretch carachter mode
-	 * @param string $bocolor Border color
-	 * @param string $tcolor  Text color
-	 * @param        $reseth
-	 */
-	public function __construct(
-		$width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth
-	) {
-		$this->align     = $align;
-		$this->border    = $border;
-		$this->bgcolor   = $bgcolor;
-		$this->bocolor   = $bocolor;
-		$this->fill      = $fill;
-		$this->height    = $height;
-		$this->left      = $left;
-		$this->newline   = $ln;
-		$this->styleName = $style;
-		$this->text      = "";
-		$this->tcolor    = $tcolor;
-		$this->top       = $top;
-		$this->url       = "";
-		$this->stretch   = $stretch;
-		$this->width     = $width;
-		$this->reseth    = $reseth;
+    /**
+     * CELL - Element
+     *
+     * @param int    $width   cell width (expressed in points)
+     * @param int    $height  cell height (expressed in points)
+     * @param mixed  $border  Border style
+     * @param string $align   Text alignement
+     * @param string $bgcolor Background color code
+     * @param string $style   The name of the text style
+     * @param int    $ln      Indicates where the current position should go after the call
+     * @param mixed  $top     Y-position
+     * @param mixed  $left    X-position
+     * @param int    $fill    Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
+     * @param int $stretch Stretch carachter mode
+     * @param string $bocolor Border color
+     * @param string $tcolor  Text color
+     * @param        $reseth
+     */
+    public function __construct(
+        $width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth
+    ) {
+        $this->align     = $align;
+        $this->border    = $border;
+        $this->bgcolor   = $bgcolor;
+        $this->bocolor   = $bocolor;
+        $this->fill      = $fill;
+        $this->height    = $height;
+        $this->left      = $left;
+        $this->newline   = $ln;
+        $this->styleName = $style;
+        $this->text      = "";
+        $this->tcolor    = $tcolor;
+        $this->top       = $top;
+        $this->url       = "";
+        $this->stretch   = $stretch;
+        $this->width     = $width;
+        $this->reseth    = $reseth;
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Get the cell height
-	 *
-	 * @param $renderer
-	 *
-	 * @return float
-	 */
-	public function getHeight($renderer) {
-		return $this->height;
-	}
+    /**
+     * Get the cell height
+     *
+     * @param $renderer
+     *
+     * @return float
+     */
+    public function getHeight($renderer) {
+        return $this->height;
+    }
 
-	/**
-	 * Sets the current cells URL
-	 *
-	 * @param string $url The URL address to save
-	 *
-	 * @return int
-	 */
-	public function setUrl($url) {
-		$this->url = $url;
+    /**
+     * Sets the current cells URL
+     *
+     * @param string $url The URL address to save
+     *
+     * @return int
+     */
+    public function setUrl($url) {
+        $this->url = $url;
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Get the cell width
-	 *
-	 * @param $renderer
-	 *
-	 * @return float
-	 */
-	public function getWidth($renderer) {
-		return $this->width;
-	}
+    /**
+     * Get the cell width
+     *
+     * @param $renderer
+     *
+     * @return float
+     */
+    public function getWidth($renderer) {
+        return $this->width;
+    }
 }

Braces +8 added lines, -4 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class ReportBaseCell
  */
-class ReportBaseCell extends ReportBaseElement {
+class ReportBaseCell extends ReportBaseElement
+{
 	/**
 	 * Allows to center or align the text. Possible values are:<ul><li>left or empty string: left align</li><li>center: center align</li><li>right: right align</li><li>justify: justification (default value when $ishtml=false)</li></ul>
 	 *
@@ -159,7 +160,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getHeight($renderer) {
+	public function getHeight($renderer)
+	{
 		return $this->height;
 	}
 
@@ -170,7 +172,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function setUrl($url) {
+	public function setUrl($url)
+	{
 		$this->url = $url;
 
 		return 0;
@@ -183,7 +186,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getWidth($renderer) {
+	public function getWidth($renderer)
+	{
 		return $this->width;
 	}
 }

app/Report/ReportHtmlFootnote.php

Indentation +133 added lines, -133 removed lines

@@ -19,150 +19,150 @@
  * class ReportHtmlFootnote
  */
 class ReportHtmlFootnote extends ReportBaseFootnote {
-	/**
-	 * HTML Footnotes number renderer
-	 *
-	 * @param ReportHtml $renderer
-	 */
-	public function render($renderer) {
-		$renderer->setCurrentStyle("footnotenum");
-		echo "<a href=\"#footnote", $this->num, "\"><sup>";
-		$renderer->write($renderer->entityRTL . $this->num);
-		echo "</sup></a>\n";
-	}
+    /**
+     * HTML Footnotes number renderer
+     *
+     * @param ReportHtml $renderer
+     */
+    public function render($renderer) {
+        $renderer->setCurrentStyle("footnotenum");
+        echo "<a href=\"#footnote", $this->num, "\"><sup>";
+        $renderer->write($renderer->entityRTL . $this->num);
+        echo "</sup></a>\n";
+    }
 
-	/**
-	 * Write the Footnote text
-	 * Uses style name "footnote" by default
-	 *
-	 * @param ReportHtml $html
-	 */
-	public function renderFootnote($html) {
+    /**
+     * Write the Footnote text
+     * Uses style name "footnote" by default
+     *
+     * @param ReportHtml $html
+     */
+    public function renderFootnote($html) {
 
-		if ($html->getCurrentStyle() != $this->styleName) {
-			$html->setCurrentStyle($this->styleName);
-		}
+        if ($html->getCurrentStyle() != $this->styleName) {
+            $html->setCurrentStyle($this->styleName);
+        }
 
-		$temptext = str_replace("#PAGENUM#", $html->pageNo(), $this->text);
-		// underline «title» part of Source item
-		$temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext);
-		echo "\n<div><a name=\"footnote", $this->num, "\"></a>";
-		$html->write($this->num . ". " . $temptext);
-		echo "</div>";
+        $temptext = str_replace("#PAGENUM#", $html->pageNo(), $this->text);
+        // underline «title» part of Source item
+        $temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext);
+        echo "\n<div><a name=\"footnote", $this->num, "\"></a>";
+        $html->write($this->num . ". " . $temptext);
+        echo "</div>";
 
-		$html->setXy(0, $html->getY() + $this->getFootnoteHeight($html));
-	}
+        $html->setXy(0, $html->getY() + $this->getFootnoteHeight($html));
+    }
 
-	/**
-	 * Calculates the Footnotes height
-	 *
-	 * @param ReportHtml $html
-	 * @param int        $cellWidth The width of the cell to use it for text wraping
-	 *
-	 * @return int       Footnote height in points
-	 */
-	public function getFootnoteHeight($html, $cellWidth = 0) {
-		if ($html->getCurrentStyle() != $this->styleName) {
-			$html->setCurrentStyle($this->styleName);
-		}
+    /**
+     * Calculates the Footnotes height
+     *
+     * @param ReportHtml $html
+     * @param int        $cellWidth The width of the cell to use it for text wraping
+     *
+     * @return int       Footnote height in points
+     */
+    public function getFootnoteHeight($html, $cellWidth = 0) {
+        if ($html->getCurrentStyle() != $this->styleName) {
+            $html->setCurrentStyle($this->styleName);
+        }
 
-		if ($cellWidth > 0) {
-			$this->text = $html->textWrap($this->text, $cellWidth);
-		}
-		$this->text = $this->text . "\n\n";
-		$ct         = substr_count($this->text, "\n");
-		$fsize      = $html->getCurrentStyleHeight();
+        if ($cellWidth > 0) {
+            $this->text = $html->textWrap($this->text, $cellWidth);
+        }
+        $this->text = $this->text . "\n\n";
+        $ct         = substr_count($this->text, "\n");
+        $fsize      = $html->getCurrentStyleHeight();
 
-		return ($fsize * $ct) * $html->cellHeightRatio;
-	}
+        return ($fsize * $ct) * $html->cellHeightRatio;
+    }
 
-	/**
-	 * Get the width of text
-	 * Breaks up a text into lines if needed
-	 *
-	 * @param ReportHtml $html
-	 *
-	 * @return array
-	 */
-	public function getWidth($html) {
-		// Setup the style name
-		$html->setCurrentStyle("footnotenum");
+    /**
+     * Get the width of text
+     * Breaks up a text into lines if needed
+     *
+     * @param ReportHtml $html
+     *
+     * @return array
+     */
+    public function getWidth($html) {
+        // Setup the style name
+        $html->setCurrentStyle("footnotenum");
 
-		// Check for the largest font size in the box
-		$fsize = $html->getCurrentStyleHeight();
-		if ($fsize > $html->largestFontHeight) {
-			$html->largestFontHeight = $fsize;
-		}
+        // Check for the largest font size in the box
+        $fsize = $html->getCurrentStyleHeight();
+        if ($fsize > $html->largestFontHeight) {
+            $html->largestFontHeight = $fsize;
+        }
 
-		// Returns the Object if already numbered else false
-		if (empty($this->num)) {
-			$html->checkFootnote($this);
-		}
+        // Returns the Object if already numbered else false
+        if (empty($this->num)) {
+            $html->checkFootnote($this);
+        }
 
-		// Get the line width for the text in points + a little margin
-		$lw = $html->getStringWidth($this->numText);
-		// Line Feed counter - Number of lines in the text
-		$lfct = $html->countLines($this->numText);
-		// If there is still remaining wrap width...
-		if ($this->wrapWidthRemaining > 0) {
-			// Check with line counter too!
-			if ($lw >= $this->wrapWidthRemaining || $lfct > 1) {
-				$newtext            = "";
-				$wrapWidthRemaining = $this->wrapWidthRemaining;
-				$lines              = explode("\n", $this->numText);
-				// Go throught the text line by line
-				foreach ($lines as $line) {
-					// Line width in points + a little margin
-					$lw = $html->getStringWidth($line);
-					// If the line has to be wraped
-					if ($lw > $wrapWidthRemaining) {
-						$words    = explode(" ", $line);
-						$addspace = count($words);
-						$lw       = 0;
-						foreach ($words as $word) {
-							$addspace--;
-							$lw += $html->getStringWidth($word . " ");
-							if ($lw <= $wrapWidthRemaining) {
-								$newtext .= $word;
-								if ($addspace != 0) {
-									$newtext .= " ";
-								}
-							} else {
-								$lw = $html->getStringWidth($word . " ");
-								$newtext .= "\n$word";
-								if ($addspace != 0) {
-									$newtext .= " ";
-								}
-								// Reset the wrap width to the cell width
-								$wrapWidthRemaining = $this->wrapWidthCell;
-							}
-						}
-					} else {
-						$newtext .= $line;
-					}
-					// Check the Line Feed counter
-					if ($lfct > 1) {
-						// Add a new line feed as long as it’s not the last line
-						$newtext .= "\n";
-						// Reset the line width
-						$lw = 0;
-						// Reset the wrap width to the cell width
-						$wrapWidthRemaining = $this->wrapWidthCell;
-					}
-					$lfct--;
-				}
-				$this->numText = $newtext;
-				$lfct          = substr_count($this->numText, "\n");
+        // Get the line width for the text in points + a little margin
+        $lw = $html->getStringWidth($this->numText);
+        // Line Feed counter - Number of lines in the text
+        $lfct = $html->countLines($this->numText);
+        // If there is still remaining wrap width...
+        if ($this->wrapWidthRemaining > 0) {
+            // Check with line counter too!
+            if ($lw >= $this->wrapWidthRemaining || $lfct > 1) {
+                $newtext            = "";
+                $wrapWidthRemaining = $this->wrapWidthRemaining;
+                $lines              = explode("\n", $this->numText);
+                // Go throught the text line by line
+                foreach ($lines as $line) {
+                    // Line width in points + a little margin
+                    $lw = $html->getStringWidth($line);
+                    // If the line has to be wraped
+                    if ($lw > $wrapWidthRemaining) {
+                        $words    = explode(" ", $line);
+                        $addspace = count($words);
+                        $lw       = 0;
+                        foreach ($words as $word) {
+                            $addspace--;
+                            $lw += $html->getStringWidth($word . " ");
+                            if ($lw <= $wrapWidthRemaining) {
+                                $newtext .= $word;
+                                if ($addspace != 0) {
+                                    $newtext .= " ";
+                                }
+                            } else {
+                                $lw = $html->getStringWidth($word . " ");
+                                $newtext .= "\n$word";
+                                if ($addspace != 0) {
+                                    $newtext .= " ";
+                                }
+                                // Reset the wrap width to the cell width
+                                $wrapWidthRemaining = $this->wrapWidthCell;
+                            }
+                        }
+                    } else {
+                        $newtext .= $line;
+                    }
+                    // Check the Line Feed counter
+                    if ($lfct > 1) {
+                        // Add a new line feed as long as it’s not the last line
+                        $newtext .= "\n";
+                        // Reset the line width
+                        $lw = 0;
+                        // Reset the wrap width to the cell width
+                        $wrapWidthRemaining = $this->wrapWidthCell;
+                    }
+                    $lfct--;
+                }
+                $this->numText = $newtext;
+                $lfct          = substr_count($this->numText, "\n");
 
-				return array($lw, 1, $lfct);
-			}
-		}
-		$l    = 0;
-		$lfct = substr_count($this->numText, "\n");
-		if ($lfct > 0) {
-			$l = 2;
-		}
+                return array($lw, 1, $lfct);
+            }
+        }
+        $l    = 0;
+        $lfct = substr_count($this->numText, "\n");
+        if ($lfct > 0) {
+            $l = 2;
+        }
 
-		return array($lw, $l, $lfct);
-	}
+        return array($lw, $l, $lfct);
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * class ReportHtmlFootnote
  */
-class ReportHtmlFootnote extends ReportBaseFootnote {
+class ReportHtmlFootnote extends ReportBaseFootnote
+{
 	/**
 	 * HTML Footnotes number renderer
 	 *
 	 * @param ReportHtml $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		$renderer->setCurrentStyle("footnotenum");
 		echo "<a href=\"#footnote", $this->num, "\"><sup>";
 		$renderer->write($renderer->entityRTL . $this->num);
@@ -37,7 +39,8 @@ 
 	 *
 	 * @param ReportHtml $html
 	 */
-	public function renderFootnote($html) {
+	public function renderFootnote($html)
+	{
 
 		if ($html->getCurrentStyle() != $this->styleName) {
 			$html->setCurrentStyle($this->styleName);
@@ -61,7 +64,8 @@ 
 	 *
 	 * @return int       Footnote height in points
 	 */
-	public function getFootnoteHeight($html, $cellWidth = 0) {
+	public function getFootnoteHeight($html, $cellWidth = 0)
+	{
 		if ($html->getCurrentStyle() != $this->styleName) {
 			$html->setCurrentStyle($this->styleName);
 		}
@@ -84,7 +88,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function getWidth($html) {
+	public function getWidth($html)
+	{
 		// Setup the style name
 		$html->setCurrentStyle("footnotenum");
 

app/Report/ReportBaseTextbox.php

Indentation +126 added lines, -126 removed lines

@@ -19,140 +19,140 @@
  * Class ReportBaseTextbox
  */
 class ReportBaseTextbox extends ReportBaseElement {
-	/**
-	 * Array of elements in the TextBox
-	 *
-	 * @var array
-	 */
-	public $elements = array();
+    /**
+     * Array of elements in the TextBox
+     *
+     * @var array
+     */
+    public $elements = array();
 
-	/**
-	 *  Background color in HTML code
-	 *
-	 * @var string
-	 */
-	public $bgcolor;
-	/**
-	 * Whether or not paint the background
-	 *
-	 * @var bool
-	 */
-	public $fill;
+    /**
+     *  Background color in HTML code
+     *
+     * @var string
+     */
+    public $bgcolor;
+    /**
+     * Whether or not paint the background
+     *
+     * @var bool
+     */
+    public $fill;
 
-	/**
-	 * Position the left corner of this box on the page(expressed in points). The default is the current position.
-	 *
-	 * @var mixed
-	 */
-	public $left;
-	/**
-	 * Position the top corner of this box on the page(expressed in points). the default is the current position
-	 *
-	 * @var mixed
-	 */
-	public $top;
-	/**
-	 * After this box is finished rendering, should the next section of text start immediately after the this box or should it start on a new line under this box. 0 = no new line, 1 = force new line. Default is 0
-	 *
-	 * @var bool
-	 */
-	public $newline;
+    /**
+     * Position the left corner of this box on the page(expressed in points). The default is the current position.
+     *
+     * @var mixed
+     */
+    public $left;
+    /**
+     * Position the top corner of this box on the page(expressed in points). the default is the current position
+     *
+     * @var mixed
+     */
+    public $top;
+    /**
+     * After this box is finished rendering, should the next section of text start immediately after the this box or should it start on a new line under this box. 0 = no new line, 1 = force new line. Default is 0
+     *
+     * @var bool
+     */
+    public $newline;
 
-	/** @var bool Unused? */
-	public $pagecheck;
+    /** @var bool Unused? */
+    public $pagecheck;
 
-	/** @var bool Whether to print a border */
-	public $border;
+    /** @var bool Whether to print a border */
+    public $border;
 
-	/**
-	 * Style of rendering
-	 *
-	 * <ul>
-	 * <li>D or empty string: Draw (default).</li>
-	 * <li>F: Fill.</li>
-	 * <li>DF or FD: Draw and fill.</li>
-	 * <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-	 *<li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-	 * </ul>
-	 *
-	 * @var string
-	 */
-	public $style;
+    /**
+     * Style of rendering
+     *
+     * <ul>
+     * <li>D or empty string: Draw (default).</li>
+     * <li>F: Fill.</li>
+     * <li>DF or FD: Draw and fill.</li>
+     * <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
+     *<li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
+     * </ul>
+     *
+     * @var string
+     */
+    public $style;
 
-	/**
-	 * @var array Border style of rectangle. Array with keys among the following:
-	 * <ul>
-	 * <li>all: Line style of all borders. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 * <li>L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 * </ul>
-	 * Not yet in use
-	 * var $borderstyle;
-	 */
+    /**
+     * @var array Border style of rectangle. Array with keys among the following:
+     * <ul>
+     * <li>all: Line style of all borders. Array like for {@link SetLineStyle SetLineStyle}.</li>
+     * <li>L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for {@link SetLineStyle SetLineStyle}.</li>
+     * </ul>
+     * Not yet in use
+     * var $borderstyle;
+     */
 
-	/**
-	 * The starting height of this cell. If the text wraps the height will automatically be adjusted
-	 *
-	 * @var float
-	 */
-	public $height;
-	/**
-	 * Setting the width to 0 will make it the width from the current location to the right margin
-	 *
-	 * @var float
-	 */
-	public $width;
-	/**
-	 * Use cell padding or not
-	 *
-	 * @var bool
-	 */
-	public $padding;
-	/**
-	 * Resets this box last height after it’s done
-	 */
-	public $reseth;
+    /**
+     * The starting height of this cell. If the text wraps the height will automatically be adjusted
+     *
+     * @var float
+     */
+    public $height;
+    /**
+     * Setting the width to 0 will make it the width from the current location to the right margin
+     *
+     * @var float
+     */
+    public $width;
+    /**
+     * Use cell padding or not
+     *
+     * @var bool
+     */
+    public $padding;
+    /**
+     * Resets this box last height after it’s done
+     */
+    public $reseth;
 
-	/**
-	 * TextBox - Element - Base
-	 *
-	 * @param float  $width   Text box width
-	 * @param float  $height  Text box height
-	 * @param bool   $border
-	 * @param string $bgcolor Background color code in HTML
-	 * @param bool   $newline
-	 * @param mixed  $left
-	 * @param mixed  $top
-	 * @param bool   $pagecheck
-	 * @param string $style
-	 * @param bool   $fill
-	 * @param bool   $padding
-	 * @param bool   $reseth
-	 */
-	public function __construct(
-		$width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth
-	) {
-		$this->border    = $border;
-		$this->bgcolor   = $bgcolor;
-		$this->fill      = $fill;
-		$this->height    = $height;
-		$this->left      = $left;
-		$this->newline   = $newline;
-		$this->pagecheck = $pagecheck;
-		$this->style     = $style;
-		$this->top       = $top;
-		$this->width     = $width;
-		$this->padding   = $padding;
-		$this->reseth    = $reseth;
+    /**
+     * TextBox - Element - Base
+     *
+     * @param float  $width   Text box width
+     * @param float  $height  Text box height
+     * @param bool   $border
+     * @param string $bgcolor Background color code in HTML
+     * @param bool   $newline
+     * @param mixed  $left
+     * @param mixed  $top
+     * @param bool   $pagecheck
+     * @param string $style
+     * @param bool   $fill
+     * @param bool   $padding
+     * @param bool   $reseth
+     */
+    public function __construct(
+        $width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth
+    ) {
+        $this->border    = $border;
+        $this->bgcolor   = $bgcolor;
+        $this->fill      = $fill;
+        $this->height    = $height;
+        $this->left      = $left;
+        $this->newline   = $newline;
+        $this->pagecheck = $pagecheck;
+        $this->style     = $style;
+        $this->top       = $top;
+        $this->width     = $width;
+        $this->padding   = $padding;
+        $this->reseth    = $reseth;
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Add an element to the TextBox
-	 *
-	 * @param object|string $element
-	 */
-	public function addElement($element) {
-		$this->elements[] = $element;
-	}
+    /**
+     * Add an element to the TextBox
+     *
+     * @param object|string $element
+     */
+    public function addElement($element) {
+        $this->elements[] = $element;
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class ReportBaseTextbox
  */
-class ReportBaseTextbox extends ReportBaseElement {
+class ReportBaseTextbox extends ReportBaseElement
+{
 	/**
 	 * Array of elements in the TextBox
 	 *
@@ -152,7 +153,8 @@ 
 	 *
 	 * @param object|string $element
 	 */
-	public function addElement($element) {
+	public function addElement($element)
+	{
 		$this->elements[] = $element;
 	}
 }

app/Report/ReportTcpdf.php

Indentation +373 added lines, -373 removed lines

@@ -23,377 +23,377 @@
  * This class inherits from the TCPDF class and is used to generate the PDF document
  */
 class ReportTcpdf extends TCPDF {
-	/** @var ReportBaseElement[] Array of elements in the header */
-	public $headerElements = array();
-
-	/** @var ReportBaseElement[] Array of elements in the page header */
-	public $pageHeaderElements = array();
-
-	/** @var ReportBaseElement[] Array of elements in the footer */
-	public $footerElements = array();
-
-	/** @var ReportBaseElement[] Array of elements in the body */
-	public $bodyElements = array();
-
-	/** @var ReportBaseFootnote[] Array of elements in the footer notes */
-	public $printedfootnotes = array();
-
-	/** @var string Currently used style name */
-	public $currentStyle;
-
-	/** @var int The last cell height */
-	public $lastCellHeight = 0;
-
-	/** @var int The largest font size within a TextBox to calculate the height */
-	public $largestFontHeight = 0;
-
-	/** @var int The last pictures page number */
-	public $lastpicpage = 0;
-
-	/** @var ReportBase The current report. */
-	public $wt_report;
-
-	/**
-	 * PDF Header -PDF
-	 */
-	public function header() {
-		foreach ($this->headerElements as $element) {
-			if (is_object($element)) {
-				$element->render($this);
-			} elseif (is_string($element) && $element == "footnotetexts") {
-				$this->footnotes();
-			} elseif (is_string($element) && $element == "addpage") {
-				$this->newPage();
-			}
-		}
-		foreach ($this->pageHeaderElements as $element) {
-			if (is_object($element)) {
-				$element->render($this);
-			} elseif (is_string($element) && $element == "footnotetexts") {
-				$this->footnotes();
-			} elseif (is_string($element) && $element == "addpage") {
-				$this->newPage();
-			}
-		}
-	}
-
-	/**
-	 * PDF Body -PDF
-	 */
-	public function body() {
-		$this->AddPage();
-		foreach ($this->bodyElements as $key => $element) {
-			if (is_object($element)) {
-				$element->render($this);
-			} elseif (is_string($element) && $element == "footnotetexts") {
-				$this->footnotes();
-			} elseif (is_string($element) && $element == "addpage") {
-				$this->newPage();
-			}
-			// Delete used elements in hope to reduce 'some' memory usage
-			unset($this->bodyElements[$key]);
-		}
-	}
-
-	/**
-	 * PDF Footnotes -PDF
-	 */
-	public function footnotes() {
-		foreach ($this->printedfootnotes as $element) {
-			if (($this->GetY() + $element->getFootnoteHeight($this)) > $this->getPageHeight()) {
-				$this->AddPage();
-			}
-			$element->renderFootnote($this);
-			if ($this->GetY() > $this->getPageHeight()) {
-				$this->AddPage();
-			}
-		}
-	}
-
-	/**
-	 * PDF Footer -PDF
-	 */
-	public function footer() {
-		foreach ($this->footerElements as $element) {
-			if (is_object($element)) {
-				$element->render($this);
-			} elseif (is_string($element) && $element == "footnotetexts") {
-				$this->footnotes();
-			} elseif (is_string($element) && $element == "addpage") {
-				$this->newPage();
-			}
-		}
-	}
-
-	/**
-	 * Add an element to the Header -PDF
-	 *
-	 * @param object|string $element
-	 *
-	 * @return int The number of the Header elements
-	 */
-	public function addHeader($element) {
-		$this->headerElements[] = $element;
-
-		return count($this->headerElements) - 1;
-	}
-
-	/**
-	 * Add an element to the Page Header -PDF
-	 *
-	 * @param object|string $element
-	 *
-	 * @return int The number of the Page Header elements
-	 */
-	public function addPageHeader($element) {
-		$this->pageHeaderElements[] = $element;
-
-		return count($this->pageHeaderElements) - 1;
-	}
-
-	/**
-	 * Add an element to the Body -PDF
-	 *
-	 * @param object|string $element
-	 *
-	 * @return int The number of the Body elements
-	 */
-	public function addBody($element) {
-		$this->bodyElements[] = $element;
-
-		return count($this->bodyElements) - 1;
-	}
-
-	/**
-	 * Add an element to the Footer -PDF
-	 *
-	 * @param object|string $element
-	 *
-	 * @return int The number of the Footer elements
-	 */
-	public function addFooter($element) {
-		$this->footerElements[] = $element;
-
-		return count($this->footerElements) - 1;
-	}
-
-	/**
-	 * Remove the header.
-	 *
-	 * @param $index
-	 */
-	public function removeHeader($index) {
-		unset($this->headerElements[$index]);
-	}
-
-	/**
-	 * Remove the page header.
-	 *
-	 * @param $index
-	 */
-	public function removePageHeader($index) {
-		unset($this->pageHeaderElements[$index]);
-	}
-
-	/**
-	 * Remove the body.
-	 *
-	 * @param $index
-	 */
-	public function removeBody($index) {
-		unset($this->bodyElements[$index]);
-	}
-
-	/**
-	 * Remove the footer.
-	 *
-	 * @param $index
-	 */
-	public function removeFooter($index) {
-		unset($this->footerElements[$index]);
-	}
-
-	/**
-	 * Clear the Header -PDF
-	 */
-	public function clearHeader() {
-		unset($this->headerElements);
-		$this->headerElements = array();
-	}
-
-	/**
-	 * Clear the Page Header -PDF
-	 */
-	public function clearPageHeader() {
-		unset($this->pageHeaderElements);
-		$this->pageHeaderElements = array();
-	}
-
-	/**
-	 * Set the report.
-	 *
-	 * @param $r
-	 */
-	public function setReport($r) {
-		$this->wt_report = $r;
-	}
-
-	/**
-	 * Get the currently used style name -PDF
-	 *
-	 * @return string
-	 */
-	public function getCurrentStyle() {
-		return $this->currentStyle;
-	}
-
-	/**
-	 * Setup a style for usage -PDF
-	 *
-	 * @param string $s Style name
-	 */
-	public function setCurrentStyle($s) {
-		$this->currentStyle = $s;
-		$style              = $this->wt_report->getStyle($s);
-		$this->SetFont($style['font'], $style['style'], $style['size']);
-	}
-
-	/**
-	 * Get the style -PDF
-	 *
-	 * @param string $s Style name
-	 *
-	 * @return array
-	 */
-	public function getStyle($s) {
-		if (!isset($this->wt_report->Styles[$s])) {
-			$s                           = $this->getCurrentStyle();
-			$this->wt_report->Styles[$s] = $s;
-		}
-
-		return $this->wt_report->Styles[$s];
-	}
-
-	/**
-	 * Add margin when static horizontal position is used -PDF
-	 * RTL supported
-	 *
-	 * @param float $x Static position
-	 *
-	 * @return float
-	 */
-	public function addMarginX($x) {
-		$m = $this->getMargins();
-		if ($this->getRTL()) {
-			$x += $m['right'];
-		} else {
-			$x += $m['left'];
-		}
-		$this->SetX($x);
-
-		return $x;
-	}
-
-	/**
-	 * Get the maximum line width to draw from the curren position -PDF
-	 * RTL supported
-	 *
-	 * @return float
-	 */
-	public function getMaxLineWidth() {
-		$m = $this->getMargins();
-		if ($this->getRTL()) {
-			return ($this->getRemainingWidth() + $m['right']);
-		} else {
-			return ($this->getRemainingWidth() + $m['left']);
-		}
-	}
-
-	/**
-	 * Get the height of the footnote.
-	 *
-	 * @return int
-	 */
-	public function getFootnotesHeight() {
-		$h = 0;
-		foreach ($this->printedfootnotes as $element) {
-			$h += $element->getHeight($this);
-		}
-
-		return $h;
-	}
-
-	/**
-	 * Returns the the current font size height -PDF
-	 *
-	 * @return int
-	 */
-	public function getCurrentStyleHeight() {
-		if (empty($this->currentStyle)) {
-			return $this->wt_report->defaultFontSize;
-		}
-		$style = $this->wt_report->getStyle($this->currentStyle);
-
-		return $style['size'];
-	}
-
-	/**
-	 * Checks the Footnote and numbers them
-	 *
-	 * @param object $footnote
-	 *
-	 * @return bool false if not numbered befor | object if already numbered
-	 */
-	public function checkFootnote($footnote) {
-		$ct  = count($this->printedfootnotes);
-		$val = $footnote->getValue();
-		$i   = 0;
-		while ($i < $ct) {
-			if ($this->printedfootnotes[$i]->getValue() == $val) {
-				// If this footnote already exist then set up the numbers for this object
-				$footnote->setNum($i + 1);
-				$footnote->setAddlink($i + 1);
-
-				return $this->printedfootnotes[$i];
-			}
-			$i++;
-		}
-		// If this Footnote has not been set up yet
-		$footnote->setNum($ct + 1);
-		$footnote->setAddlink($this->AddLink());
-		$this->printedfootnotes[] = $footnote;
-
-		return false;
-	}
-
-	/**
-	 * Used this function instead of AddPage()
-	 * This function will make sure that images will not be overwritten
-	 */
-	public function newPage() {
-		if ($this->lastpicpage > $this->getPage()) {
-			$this->setPage($this->lastpicpage);
-		}
-		$this->AddPage();
-	}
-
-	/**
-	 * Add a page if needed -PDF
-	 *
-	 * @param int $height Cell height
-	 *
-	 * @return bool true in case of page break, false otherwise
-	 */
-	public function checkPageBreakPDF($height) {
-		return $this->checkPageBreak($height);
-	}
-
-	/**
-	 * Returns the remaining width between the current position and margins -PDF
-	 *
-	 * @return float Remaining width
-	 */
-	public function getRemainingWidthPDF() {
-		return $this->getRemainingWidth();
-	}
+    /** @var ReportBaseElement[] Array of elements in the header */
+    public $headerElements = array();
+
+    /** @var ReportBaseElement[] Array of elements in the page header */
+    public $pageHeaderElements = array();
+
+    /** @var ReportBaseElement[] Array of elements in the footer */
+    public $footerElements = array();
+
+    /** @var ReportBaseElement[] Array of elements in the body */
+    public $bodyElements = array();
+
+    /** @var ReportBaseFootnote[] Array of elements in the footer notes */
+    public $printedfootnotes = array();
+
+    /** @var string Currently used style name */
+    public $currentStyle;
+
+    /** @var int The last cell height */
+    public $lastCellHeight = 0;
+
+    /** @var int The largest font size within a TextBox to calculate the height */
+    public $largestFontHeight = 0;
+
+    /** @var int The last pictures page number */
+    public $lastpicpage = 0;
+
+    /** @var ReportBase The current report. */
+    public $wt_report;
+
+    /**
+     * PDF Header -PDF
+     */
+    public function header() {
+        foreach ($this->headerElements as $element) {
+            if (is_object($element)) {
+                $element->render($this);
+            } elseif (is_string($element) && $element == "footnotetexts") {
+                $this->footnotes();
+            } elseif (is_string($element) && $element == "addpage") {
+                $this->newPage();
+            }
+        }
+        foreach ($this->pageHeaderElements as $element) {
+            if (is_object($element)) {
+                $element->render($this);
+            } elseif (is_string($element) && $element == "footnotetexts") {
+                $this->footnotes();
+            } elseif (is_string($element) && $element == "addpage") {
+                $this->newPage();
+            }
+        }
+    }
+
+    /**
+     * PDF Body -PDF
+     */
+    public function body() {
+        $this->AddPage();
+        foreach ($this->bodyElements as $key => $element) {
+            if (is_object($element)) {
+                $element->render($this);
+            } elseif (is_string($element) && $element == "footnotetexts") {
+                $this->footnotes();
+            } elseif (is_string($element) && $element == "addpage") {
+                $this->newPage();
+            }
+            // Delete used elements in hope to reduce 'some' memory usage
+            unset($this->bodyElements[$key]);
+        }
+    }
+
+    /**
+     * PDF Footnotes -PDF
+     */
+    public function footnotes() {
+        foreach ($this->printedfootnotes as $element) {
+            if (($this->GetY() + $element->getFootnoteHeight($this)) > $this->getPageHeight()) {
+                $this->AddPage();
+            }
+            $element->renderFootnote($this);
+            if ($this->GetY() > $this->getPageHeight()) {
+                $this->AddPage();
+            }
+        }
+    }
+
+    /**
+     * PDF Footer -PDF
+     */
+    public function footer() {
+        foreach ($this->footerElements as $element) {
+            if (is_object($element)) {
+                $element->render($this);
+            } elseif (is_string($element) && $element == "footnotetexts") {
+                $this->footnotes();
+            } elseif (is_string($element) && $element == "addpage") {
+                $this->newPage();
+            }
+        }
+    }
+
+    /**
+     * Add an element to the Header -PDF
+     *
+     * @param object|string $element
+     *
+     * @return int The number of the Header elements
+     */
+    public function addHeader($element) {
+        $this->headerElements[] = $element;
+
+        return count($this->headerElements) - 1;
+    }
+
+    /**
+     * Add an element to the Page Header -PDF
+     *
+     * @param object|string $element
+     *
+     * @return int The number of the Page Header elements
+     */
+    public function addPageHeader($element) {
+        $this->pageHeaderElements[] = $element;
+
+        return count($this->pageHeaderElements) - 1;
+    }
+
+    /**
+     * Add an element to the Body -PDF
+     *
+     * @param object|string $element
+     *
+     * @return int The number of the Body elements
+     */
+    public function addBody($element) {
+        $this->bodyElements[] = $element;
+
+        return count($this->bodyElements) - 1;
+    }
+
+    /**
+     * Add an element to the Footer -PDF
+     *
+     * @param object|string $element
+     *
+     * @return int The number of the Footer elements
+     */
+    public function addFooter($element) {
+        $this->footerElements[] = $element;
+
+        return count($this->footerElements) - 1;
+    }
+
+    /**
+     * Remove the header.
+     *
+     * @param $index
+     */
+    public function removeHeader($index) {
+        unset($this->headerElements[$index]);
+    }
+
+    /**
+     * Remove the page header.
+     *
+     * @param $index
+     */
+    public function removePageHeader($index) {
+        unset($this->pageHeaderElements[$index]);
+    }
+
+    /**
+     * Remove the body.
+     *
+     * @param $index
+     */
+    public function removeBody($index) {
+        unset($this->bodyElements[$index]);
+    }
+
+    /**
+     * Remove the footer.
+     *
+     * @param $index
+     */
+    public function removeFooter($index) {
+        unset($this->footerElements[$index]);
+    }
+
+    /**
+     * Clear the Header -PDF
+     */
+    public function clearHeader() {
+        unset($this->headerElements);
+        $this->headerElements = array();
+    }
+
+    /**
+     * Clear the Page Header -PDF
+     */
+    public function clearPageHeader() {
+        unset($this->pageHeaderElements);
+        $this->pageHeaderElements = array();
+    }
+
+    /**
+     * Set the report.
+     *
+     * @param $r
+     */
+    public function setReport($r) {
+        $this->wt_report = $r;
+    }
+
+    /**
+     * Get the currently used style name -PDF
+     *
+     * @return string
+     */
+    public function getCurrentStyle() {
+        return $this->currentStyle;
+    }
+
+    /**
+     * Setup a style for usage -PDF
+     *
+     * @param string $s Style name
+     */
+    public function setCurrentStyle($s) {
+        $this->currentStyle = $s;
+        $style              = $this->wt_report->getStyle($s);
+        $this->SetFont($style['font'], $style['style'], $style['size']);
+    }
+
+    /**
+     * Get the style -PDF
+     *
+     * @param string $s Style name
+     *
+     * @return array
+     */
+    public function getStyle($s) {
+        if (!isset($this->wt_report->Styles[$s])) {
+            $s                           = $this->getCurrentStyle();
+            $this->wt_report->Styles[$s] = $s;
+        }
+
+        return $this->wt_report->Styles[$s];
+    }
+
+    /**
+     * Add margin when static horizontal position is used -PDF
+     * RTL supported
+     *
+     * @param float $x Static position
+     *
+     * @return float
+     */
+    public function addMarginX($x) {
+        $m = $this->getMargins();
+        if ($this->getRTL()) {
+            $x += $m['right'];
+        } else {
+            $x += $m['left'];
+        }
+        $this->SetX($x);
+
+        return $x;
+    }
+
+    /**
+     * Get the maximum line width to draw from the curren position -PDF
+     * RTL supported
+     *
+     * @return float
+     */
+    public function getMaxLineWidth() {
+        $m = $this->getMargins();
+        if ($this->getRTL()) {
+            return ($this->getRemainingWidth() + $m['right']);
+        } else {
+            return ($this->getRemainingWidth() + $m['left']);
+        }
+    }
+
+    /**
+     * Get the height of the footnote.
+     *
+     * @return int
+     */
+    public function getFootnotesHeight() {
+        $h = 0;
+        foreach ($this->printedfootnotes as $element) {
+            $h += $element->getHeight($this);
+        }
+
+        return $h;
+    }
+
+    /**
+     * Returns the the current font size height -PDF
+     *
+     * @return int
+     */
+    public function getCurrentStyleHeight() {
+        if (empty($this->currentStyle)) {
+            return $this->wt_report->defaultFontSize;
+        }
+        $style = $this->wt_report->getStyle($this->currentStyle);
+
+        return $style['size'];
+    }
+
+    /**
+     * Checks the Footnote and numbers them
+     *
+     * @param object $footnote
+     *
+     * @return bool false if not numbered befor | object if already numbered
+     */
+    public function checkFootnote($footnote) {
+        $ct  = count($this->printedfootnotes);
+        $val = $footnote->getValue();
+        $i   = 0;
+        while ($i < $ct) {
+            if ($this->printedfootnotes[$i]->getValue() == $val) {
+                // If this footnote already exist then set up the numbers for this object
+                $footnote->setNum($i + 1);
+                $footnote->setAddlink($i + 1);
+
+                return $this->printedfootnotes[$i];
+            }
+            $i++;
+        }
+        // If this Footnote has not been set up yet
+        $footnote->setNum($ct + 1);
+        $footnote->setAddlink($this->AddLink());
+        $this->printedfootnotes[] = $footnote;
+
+        return false;
+    }
+
+    /**
+     * Used this function instead of AddPage()
+     * This function will make sure that images will not be overwritten
+     */
+    public function newPage() {
+        if ($this->lastpicpage > $this->getPage()) {
+            $this->setPage($this->lastpicpage);
+        }
+        $this->AddPage();
+    }
+
+    /**
+     * Add a page if needed -PDF
+     *
+     * @param int $height Cell height
+     *
+     * @return bool true in case of page break, false otherwise
+     */
+    public function checkPageBreakPDF($height) {
+        return $this->checkPageBreak($height);
+    }
+
+    /**
+     * Returns the remaining width between the current position and margins -PDF
+     *
+     * @return float Remaining width
+     */
+    public function getRemainingWidthPDF() {
+        return $this->getRemainingWidth();
+    }
 }

Braces +54 added lines, -27 removed lines

@@ -22,7 +22,8 @@ 
  *
  * This class inherits from the TCPDF class and is used to generate the PDF document
  */
-class ReportTcpdf extends TCPDF {
+class ReportTcpdf extends TCPDF
+{
 	/** @var ReportBaseElement[] Array of elements in the header */
 	public $headerElements = array();
 
@@ -56,7 +57,8 @@ 
 	/**
 	 * PDF Header -PDF
 	 */
-	public function header() {
+	public function header()
+	{
 		foreach ($this->headerElements as $element) {
 			if (is_object($element)) {
 				$element->render($this);
@@ -80,7 +82,8 @@ 
 	/**
 	 * PDF Body -PDF
 	 */
-	public function body() {
+	public function body()
+	{
 		$this->AddPage();
 		foreach ($this->bodyElements as $key => $element) {
 			if (is_object($element)) {
@@ -98,7 +101,8 @@ 
 	/**
 	 * PDF Footnotes -PDF
 	 */
-	public function footnotes() {
+	public function footnotes()
+	{
 		foreach ($this->printedfootnotes as $element) {
 			if (($this->GetY() + $element->getFootnoteHeight($this)) > $this->getPageHeight()) {
 				$this->AddPage();
@@ -113,7 +117,8 @@ 
 	/**
 	 * PDF Footer -PDF
 	 */
-	public function footer() {
+	public function footer()
+	{
 		foreach ($this->footerElements as $element) {
 			if (is_object($element)) {
 				$element->render($this);
@@ -132,7 +137,8 @@ 
 	 *
 	 * @return int The number of the Header elements
 	 */
-	public function addHeader($element) {
+	public function addHeader($element)
+	{
 		$this->headerElements[] = $element;
 
 		return count($this->headerElements) - 1;
@@ -145,7 +151,8 @@ 
 	 *
 	 * @return int The number of the Page Header elements
 	 */
-	public function addPageHeader($element) {
+	public function addPageHeader($element)
+	{
 		$this->pageHeaderElements[] = $element;
 
 		return count($this->pageHeaderElements) - 1;
@@ -158,7 +165,8 @@ 
 	 *
 	 * @return int The number of the Body elements
 	 */
-	public function addBody($element) {
+	public function addBody($element)
+	{
 		$this->bodyElements[] = $element;
 
 		return count($this->bodyElements) - 1;
@@ -171,7 +179,8 @@ 
 	 *
 	 * @return int The number of the Footer elements
 	 */
-	public function addFooter($element) {
+	public function addFooter($element)
+	{
 		$this->footerElements[] = $element;
 
 		return count($this->footerElements) - 1;
@@ -182,7 +191,8 @@ 
 	 *
 	 * @param $index
 	 */
-	public function removeHeader($index) {
+	public function removeHeader($index)
+	{
 		unset($this->headerElements[$index]);
 	}
 
@@ -191,7 +201,8 @@ 
 	 *
 	 * @param $index
 	 */
-	public function removePageHeader($index) {
+	public function removePageHeader($index)
+	{
 		unset($this->pageHeaderElements[$index]);
 	}
 
@@ -200,7 +211,8 @@ 
 	 *
 	 * @param $index
 	 */
-	public function removeBody($index) {
+	public function removeBody($index)
+	{
 		unset($this->bodyElements[$index]);
 	}
 
@@ -209,14 +221,16 @@ 
 	 *
 	 * @param $index
 	 */
-	public function removeFooter($index) {
+	public function removeFooter($index)
+	{
 		unset($this->footerElements[$index]);
 	}
 
 	/**
 	 * Clear the Header -PDF
 	 */
-	public function clearHeader() {
+	public function clearHeader()
+	{
 		unset($this->headerElements);
 		$this->headerElements = array();
 	}
@@ -224,7 +238,8 @@ 
 	/**
 	 * Clear the Page Header -PDF
 	 */
-	public function clearPageHeader() {
+	public function clearPageHeader()
+	{
 		unset($this->pageHeaderElements);
 		$this->pageHeaderElements = array();
 	}
@@ -234,7 +249,8 @@ 
 	 *
 	 * @param $r
 	 */
-	public function setReport($r) {
+	public function setReport($r)
+	{
 		$this->wt_report = $r;
 	}
 
@@ -243,7 +259,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCurrentStyle() {
+	public function getCurrentStyle()
+	{
 		return $this->currentStyle;
 	}
 
@@ -252,7 +269,8 @@ 
 	 *
 	 * @param string $s Style name
 	 */
-	public function setCurrentStyle($s) {
+	public function setCurrentStyle($s)
+	{
 		$this->currentStyle = $s;
 		$style              = $this->wt_report->getStyle($s);
 		$this->SetFont($style['font'], $style['style'], $style['size']);
@@ -265,7 +283,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function getStyle($s) {
+	public function getStyle($s)
+	{
 		if (!isset($this->wt_report->Styles[$s])) {
 			$s                           = $this->getCurrentStyle();
 			$this->wt_report->Styles[$s] = $s;
@@ -282,7 +301,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function addMarginX($x) {
+	public function addMarginX($x)
+	{
 		$m = $this->getMargins();
 		if ($this->getRTL()) {
 			$x += $m['right'];
@@ -300,7 +320,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getMaxLineWidth() {
+	public function getMaxLineWidth()
+	{
 		$m = $this->getMargins();
 		if ($this->getRTL()) {
 			return ($this->getRemainingWidth() + $m['right']);
@@ -314,7 +335,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getFootnotesHeight() {
+	public function getFootnotesHeight()
+	{
 		$h = 0;
 		foreach ($this->printedfootnotes as $element) {
 			$h += $element->getHeight($this);
@@ -328,7 +350,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getCurrentStyleHeight() {
+	public function getCurrentStyleHeight()
+	{
 		if (empty($this->currentStyle)) {
 			return $this->wt_report->defaultFontSize;
 		}
@@ -344,7 +367,8 @@ 
 	 *
 	 * @return bool false if not numbered befor | object if already numbered
 	 */
-	public function checkFootnote($footnote) {
+	public function checkFootnote($footnote)
+	{
 		$ct  = count($this->printedfootnotes);
 		$val = $footnote->getValue();
 		$i   = 0;
@@ -370,7 +394,8 @@ 
 	 * Used this function instead of AddPage()
 	 * This function will make sure that images will not be overwritten
 	 */
-	public function newPage() {
+	public function newPage()
+	{
 		if ($this->lastpicpage > $this->getPage()) {
 			$this->setPage($this->lastpicpage);
 		}
@@ -384,7 +409,8 @@ 
 	 *
 	 * @return bool true in case of page break, false otherwise
 	 */
-	public function checkPageBreakPDF($height) {
+	public function checkPageBreakPDF($height)
+	{
 		return $this->checkPageBreak($height);
 	}
 
@@ -393,7 +419,8 @@ 
 	 *
 	 * @return float Remaining width
 	 */
-	public function getRemainingWidthPDF() {
+	public function getRemainingWidthPDF()
+	{
 		return $this->getRemainingWidth();
 	}
 }

app/Date.php

Indentation +548 added lines, -548 removed lines

@@ -37,552 +37,552 @@
  * years or the OS/NS notation "4 FEB 1750/51".
  */
 class Date {
-	/** @var string Optional qualifier, such as BEF, FROM, ABT */
-	public $qual1;
-
-	/** @var CalendarDate  The first (or only) date */
-	private $date1;
-
-	/** @var string  Optional qualifier, such as TO, AND*/
-	public $qual2;
-
-	/** @var CalendarDate Optional second date */
-	private $date2;
-
-	/** @var string ptional text, as included with an INTerpreted date */
-	private $text;
-
-	/**
-	 * Create a date, from GEDCOM data.
-	 *
-	 * @param string $date A date in GEDCOM format
-	 */
-	public function __construct($date) {
-		// Extract any explanatory text
-		if (preg_match('/^(.*) ?[(](.*)[)]/', $date, $match)) {
-			$date       = $match[1];
-			$this->text = $match[2];
-		}
-		if (preg_match('/^(FROM|BET) (.+) (AND|TO) (.+)/', $date, $match)) {
-			$this->qual1 = $match[1];
-			$this->date1 = $this->parseDate($match[2]);
-			$this->qual2 = $match[3];
-			$this->date2 = $this->parseDate($match[4]);
-		} elseif (preg_match('/^(TO|FROM|BEF|AFT|CAL|EST|INT|ABT) (.+)/', $date, $match)) {
-			$this->qual1 = $match[1];
-			$this->date1 = $this->parseDate($match[2]);
-		} else {
-			$this->date1 = $this->parseDate($date);
-		}
-	}
-
-	/**
-	 * When we copy a date object, we need to create copies of
-	 * its child objects.
-	 */
-	public function __clone() {
-		$this->date1 = clone $this->date1;
-		if (is_object($this->date2)) {
-			$this->date2 = clone $this->date2;
-		}
-	}
-
-	/**
-	 * Convert a calendar date, such as "12 JUN 1943" into calendar date object.
-	 *
-	 * A GEDCOM date range may have two calendar dates.
-	 *
-	 * @param string $date
-	 *
-	 * @throws \DomainException
-	 *
-	 * @return CalendarDate
-	 */
-	private function parseDate($date) {
-		// Valid calendar escape specified? - use it
-		if (preg_match('/^(@#D(?:GREGORIAN|JULIAN|HEBREW|HIJRI|JALALI|FRENCH R|ROMAN)+@) ?(.*)/', $date, $match)) {
-			$cal  = $match[1];
-			$date = $match[2];
-		} else {
-			$cal = '';
-		}
-		// A date with a month: DM, M, MY or DMY
-		if (preg_match('/^(\d?\d?) ?(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC|TSH|CSH|KSL|TVT|SHV|ADR|ADS|NSN|IYR|SVN|TMZ|AAV|ELL|VEND|BRUM|FRIM|NIVO|PLUV|VENT|GERM|FLOR|PRAI|MESS|THER|FRUC|COMP|MUHAR|SAFAR|RABI[AT]|JUMA[AT]|RAJAB|SHAAB|RAMAD|SHAWW|DHUAQ|DHUAH|FARVA|ORDIB|KHORD|TIR|MORDA|SHAHR|MEHR|ABAN|AZAR|DEY|BAHMA|ESFAN) ?((?:\d{1,4}(?: B\.C\.)?|\d\d\d\d\/\d\d)?)$/', $date, $match)) {
-			$d = $match[1];
-			$m = $match[2];
-			$y = $match[3];
-		} elseif (preg_match('/^(\d{1,4}(?: B\.C\.)?|\d\d\d\d\/\d\d)$/', $date, $match)) {
-				// A date with just a year
-				$d = '';
-				$m = '';
-				$y = $match[1];
-			} else {
-				// An invalid date - do the best we can.
-				$d = '';
-				$m = '';
-				$y = '';
-				// Look for a 3/4 digit year anywhere in the date
-				if (preg_match('/\b(\d{3,4})\b/', $date, $match)) {
-					$y = $match[1];
-				}
-				// Look for a month anywhere in the date
-				if (preg_match('/(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC|TSH|CSH|KSL|TVT|SHV|ADR|ADS|NSN|IYR|SVN|TMZ|AAV|ELL|VEND|BRUM|FRIM|NIVO|PLUV|VENT|GERM|FLOR|PRAI|MESS|THER|FRUC|COMP|MUHAR|SAFAR|RABI[AT]|JUMA[AT]|RAJAB|SHAAB|RAMAD|SHAWW|DHUAQ|DHUAH|FARVA|ORDIB|KHORD|TIR|MORDA|SHAHR|MEHR|ABAN|AZAR|DEY|BAHMA|ESFAN)/', $date, $match)) {
-					$m = $match[1];
-					// Look for a day number anywhere in the date
-					if (preg_match('/\b(\d\d?)\b/', $date, $match)) {
-						$d = $match[1];
-					}
-				}
-			}
-
-		// Unambiguous dates - override calendar escape
-		if (preg_match('/^(TSH|CSH|KSL|TVT|SHV|ADR|ADS|NSN|IYR|SVN|TMZ|AAV|ELL)$/', $m)) {
-			$cal = '@#DHEBREW@';
-		} else {
-			if (preg_match('/^(VEND|BRUM|FRIM|NIVO|PLUV|VENT|GERM|FLOR|PRAI|MESS|THER|FRUC|COMP)$/', $m)) {
-				$cal = '@#DFRENCH R@';
-			} else {
-				if (preg_match('/^(MUHAR|SAFAR|RABI[AT]|JUMA[AT]|RAJAB|SHAAB|RAMAD|SHAWW|DHUAQ|DHUAH)$/', $m)) {
-					$cal = '@#DHIJRI@'; // This is a WT extension
-				} else {
-					if (preg_match('/^(FARVA|ORDIB|KHORD|TIR|MORDA|SHAHR|MEHR|ABAN|AZAR|DEY|BAHMA|ESFAN)$/', $m)) {
-						$cal = '@#DJALALI@'; // This is a WT extension
-					} elseif (preg_match('/^\d{1,4}( B\.C\.)|\d\d\d\d\/\d\d$/', $y)) {
-						$cal = '@#DJULIAN@';
-					}
-				}
-			}
-		}
-
-		// Ambiguous dates - don't override calendar escape
-		if ($cal == '') {
-			if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) {
-				$cal = '@#DGREGORIAN@';
-			} else {
-				if (preg_match('/^[345]\d\d\d$/', $y)) {
-					// Year 3000-5999
-					$cal = '@#DHEBREW@';
-				} else {
-					$cal = '@#DGREGORIAN@';
-				}
-			}
-		}
-		// Now construct an object of the correct type
-		switch ($cal) {
-		case '@#DGREGORIAN@':
-			return new GregorianDate(array($y, $m, $d));
-		case '@#DJULIAN@':
-			return new JulianDate(array($y, $m, $d));
-		case '@#DHEBREW@':
-			return new JewishDate(array($y, $m, $d));
-		case '@#DHIJRI@':
-			return new HijriDate(array($y, $m, $d));
-		case '@#DFRENCH R@':
-			return new FrenchDate(array($y, $m, $d));
-		case '@#DJALALI@':
-			return new JalaliDate(array($y, $m, $d));
-		case '@#DROMAN@':
-			return new RomanDate(array($y, $m, $d));
-		default:
-			throw new \DomainException('Invalid calendar');
-		}
-	}
-
-	/**
-	 * A list of supported calendars and their names.
-	 *
-	 * @return string[]
-	 */
-	public static function calendarNames() {
-		return array(
-			'gregorian' => /* I18N: The gregorian calendar */ I18N::translate('Gregorian'),
-			'julian'    => /* I18N: The julian calendar */ I18N::translate('Julian'),
-			'french'    => /* I18N: The French calendar */ I18N::translate('French'),
-			'jewish'    => /* I18N: The Hebrew/Jewish calendar */ I18N::translate('Jewish'),
-			'hijri'     => /* I18N: The Arabic/Hijri calendar */ I18N::translate('Hijri'),
-			'jalali'    => /* I18N: The Persian/Jalali calendar */ I18N::translate('Jalali'),
-		);
-	}
-
-	/**
-	 * Convert a date to the preferred format and calendar(s) display.
-	 *
-	 * @param bool|null   $url               Wrap the date in a link to calendar.php
-	 * @param string|null $date_format       Override the default date format
-	 * @param bool|null   $convert_calendars Convert the date into other calendars
-	 *
-	 * @return string
-	 */
-	public function display($url = false, $date_format = null, $convert_calendars = true) {
-		global $WT_TREE;
-
-		$CALENDAR_FORMAT = $WT_TREE->getPreference('CALENDAR_FORMAT');
-
-		if ($date_format === null) {
-			$date_format = I18N::dateFormat();
-		}
-
-		if ($convert_calendars) {
-			$calendar_format = explode('_and_', $CALENDAR_FORMAT);
-		} else {
-			$calendar_format = array();
-		}
-
-		// Two dates with text before, between and after
-		$q1 = $this->qual1;
-		$d1 = $this->date1->format($date_format, $this->qual1);
-		$q2 = $this->qual2;
-		if (is_null($this->date2)) {
-			$d2 = '';
-		} else {
-			$d2 = $this->date2->format($date_format, $this->qual2);
-		}
-		// Con vert to other calendars, if requested
-		$conv1 = '';
-		$conv2 = '';
-		foreach ($calendar_format as $cal_fmt) {
-			if ($cal_fmt != 'none') {
-				$d1conv = $this->date1->convertToCalendar($cal_fmt);
-				if ($d1conv->inValidRange()) {
-					$d1tmp = $d1conv->format($date_format, $this->qual1);
-				} else {
-					$d1tmp = '';
-				}
-				if (is_null($this->date2)) {
-					$d2conv = null;
-					$d2tmp  = '';
-				} else {
-					$d2conv = $this->date2->convertToCalendar($cal_fmt);
-					if ($d2conv->inValidRange()) {
-						$d2tmp = $d2conv->format($date_format, $this->qual2);
-					} else {
-						$d2tmp = '';
-					}
-				}
-				// If the date is different from the unconverted date, add it to the date string.
-				if ($d1 != $d1tmp && $d1tmp !== '') {
-					if ($url) {
-						if ($CALENDAR_FORMAT !== 'none') {
-							$conv1 .= ' <span dir="' . I18N::direction() . '">(<a href="' . $d1conv->calendarUrl($date_format) . '" rel="nofollow">' . $d1tmp . '</a>)</span>';
-						} else {
-							$conv1 .= ' <span dir="' . I18N::direction() . '"><br><a href="' . $d1conv->calendarUrl($date_format) . '" rel="nofollow">' . $d1tmp . '</a></span>';
-						}
-					} else {
-						$conv1 .= ' <span dir="' . I18N::direction() . '">(' . $d1tmp . ')</span>';
-					}
-				}
-				if (!is_null($this->date2) && $d2 != $d2tmp && $d1tmp != '') {
-					if ($url) {
-						$conv2 .= ' <span dir="' . I18N::direction() . '">(<a href="' . $d2conv->calendarUrl($date_format) . '" rel="nofollow">' . $d2tmp . '</a>)</span>';
-					} else {
-						$conv2 .= ' <span dir="' . I18N::direction() . '">(' . $d2tmp . ')</span>';
-					}
-				}
-			}
-		}
-
-		// Add URLs, if requested
-		if ($url) {
-			$d1 = '<a href="' . $this->date1->calendarUrl($date_format) . '" rel="nofollow">' . $d1 . '</a>';
-			if (!is_null($this->date2)) {
-				$d2 = '<a href="' . $this->date2->calendarUrl($date_format) . '" rel="nofollow">' . $d2 . '</a>';
-			}
-		}
-
-		// Localise the date
-		switch ($q1 . $q2) {
-		case '':
-			$tmp = $d1 . $conv1;
-			break;
-		case 'ABT':
-			$tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
-			break;
-		case 'CAL':
-			$tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
-			break;
-		case 'EST':
-			$tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
-			break;
-		case 'INT':
-			$tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, Filter::escapeHtml($this->text));
-			break;
-		case 'BEF':
-			$tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
-			break;
-		case 'AFT':
-			$tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
-			break;
-		case 'FROM':
-			$tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
-			break;
-		case 'TO':
-			$tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
-			break;
-		case 'BETAND':
-			$tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
-			break;
-		case 'FROMTO':
-			$tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
-			break;
-		default:
-			$tmp = I18N::translate('Invalid date');
-			break; // e.g. BET without AND
-		}
-		if ($this->text && !$q1) {
-			$tmp = I18N::translate('%1$s (%2$s)', $tmp, $this->text);
-		}
-
-		if (strip_tags($tmp) === '') {
-			return '';
-		} else {
-			return '<span class="date">' . $tmp . '</span>';
-		}
-	}
-
-	/**
-	 * Get the earliest calendar date from this GEDCOM date.
-	 *
-	 * In the date “FROM 1900 TO 1910”, this would be 1900.
-	 *
-	 * @return CalendarDate
-	 */
-	public function minimumDate() {
-		return $this->date1;
-	}
-
-	/**
-	 * Get the latest calendar date from this GEDCOM date.
-	 *
-	 * In the date “FROM 1900 TO 1910”, this would be 1910.
-	 *
-	 * @return CalendarDate
-	 */
-	public function maximumDate() {
-		if (is_null($this->date2)) {
-			return $this->date1;
-		} else {
-			return $this->date2;
-		}
-	}
-
-	/**
-	 * Get the earliest Julian day number from this GEDCOM date.
-	 *
-	 * @return int
-	 */
-	public function minimumJulianDay() {
-		return $this->minimumDate()->minJD;
-	}
-
-	/**
-	 * Get the latest Julian day number from this GEDCOM date.
-	 *
-	 * @return int
-	 */
-	public function maximumJulianDay() {
-		return $this->maximumDate()->maxJD;
-	}
-
-	/**
-	 * Get the middle Julian day number from the GEDCOM date.
-	 *
-	 * For a month-only date, this would be somewhere around the 16th day.
-	 * For a year-only date, this would be somewhere around 1st July.
-	 *
-	 * @return int
-	 */
-	public function julianDay() {
-		return (int) (($this->minimumJulianDay() + $this->maximumJulianDay()) / 2);
-	}
-
-	/**
-	 * Offset this date by N years, and round to the whole year.
-	 *
-	 * This is typically used to create an estimated death date,
-	 * which is before a certain number of years after the birth date.
-	 *
-	 * @param int     $years     a number of years, positive or negative
-	 * @param string  $qualifier typically “BEF” or “AFT”
-	 *
-	 * @return Date
-	 */
-	public function addYears($years, $qualifier = '') {
-		$tmp = clone $this;
-		$tmp->date1->y += $years;
-		$tmp->date1->m = 0;
-		$tmp->date1->d = 0;
-		$tmp->date1->setJdFromYmd();
-		$tmp->qual1 = $qualifier;
-		$tmp->qual2 = '';
-		$tmp->date2 = null;
-
-		return $tmp;
-	}
-
-	/**
-	 * Calculate the the age of a person, on a date.
-	 *
-	 * @param Date $d1
-	 * @param Date $d2
-	 * @param int  $format
-	 *
-	 * @throws \InvalidArgumentException
-	 *
-	 * @return int|string
-	 */
-	public static function getAge(Date $d1, Date $d2 = null, $format = 0) {
-		if ($d2) {
-			if ($d2->maximumJulianDay() >= $d1->minimumJulianDay() && $d2->minimumJulianDay() <= $d1->minimumJulianDay()) {
-				// Overlapping dates
-				$jd = $d1->minimumJulianDay();
-			} else {
-				// Non-overlapping dates
-				$jd = $d2->minimumJulianDay();
-			}
-		} else {
-			// If second date not specified, use today’s date
-			$jd = WT_CLIENT_JD;
-		}
-
-		switch ($format) {
-		case 0:
-			// Years - integer only (for statistics, rather than for display)
-			if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
-				return $d1->minimumDate()->getAge(false, $jd, false);
-			} else {
-				return -1;
-			}
-		case 1:
-			// Days - integer only (for sorting, rather than for display)
-			if ($jd && $d1->minimumJulianDay()) {
-				return $jd - $d1->minimumJulianDay();
-			} else {
-				return -1;
-			}
-		case 2:
-			// Just years, in local digits, with warning for negative/
-			if ($jd && $d1->minimumJulianDay()) {
-				if ($d1->minimumJulianDay() > $jd) {
-					return '<i class="icon-warning"></i>';
-				} else {
-					return I18N::number($d1->minimumDate()->getAge(false, $jd));
-				}
-			} else {
-				return '';
-			}
-		default:
-			throw new \InvalidArgumentException('format: ' . $format);
-		}
-	}
-
-	/**
-	 * Calculate the years/months/days between two events
-	 * Return a gedcom style age string: "1y 2m 3d" (for fact details)
-	 *
-	 * @param Date      $d1
-	 * @param Date|null $d2
-	 *
-	 * @return string
-	 */
-	public static function getAgeGedcom(Date $d1, Date $d2 = null) {
-		if (is_null($d2)) {
-			return $d1->date1->getAge(true, WT_CLIENT_JD, true);
-		} else {
-			// If dates overlap, then can’t calculate age.
-			if (self::compare($d1, $d2)) {
-				return $d1->date1->getAge(true, $d2->minimumJulianDay(), true);
-			} elseif (self::compare($d1, $d2) == 0 && $d1->minimumJulianDay() == $d2->minimumJulianDay()) {
-				return '0d';
-			} else {
-				return '';
-			}
-		}
-	}
-
-	/**
-	 * Compare two dates, so they can be sorted.
-	 *
-	 * return <0 if $a<$b
-	 * return >0 if $b>$a
-	 * return  0 if dates same/overlap
-	 * BEF/AFT sort as the day before/after
-	 *
-	 * @param Date $a
-	 * @param Date $b
-	 *
-	 * @return int
-	 */
-	public static function compare(Date $a, Date $b) {
-		// Get min/max JD for each date.
-		switch ($a->qual1) {
-		case 'BEF':
-			$amin = $a->minimumJulianDay() - 1;
-			$amax = $amin;
-			break;
-		case 'AFT':
-			$amax = $a->maximumJulianDay() + 1;
-			$amin = $amax;
-			break;
-		default:
-			$amin = $a->minimumJulianDay();
-			$amax = $a->maximumJulianDay();
-			break;
-		}
-		switch ($b->qual1) {
-		case 'BEF':
-			$bmin = $b->minimumJulianDay() - 1;
-			$bmax = $bmin;
-			break;
-		case 'AFT':
-			$bmax = $b->maximumJulianDay() + 1;
-			$bmin = $bmax;
-			break;
-		default:
-			$bmin = $b->minimumJulianDay();
-			$bmax = $b->maximumJulianDay();
-			break;
-		}
-		if ($amax < $bmin) {
-			return -1;
-		} elseif ($amin > $bmax && $bmax > 0) {
-			return 1;
-		} elseif ($amin < $bmin && $amax <= $bmax) {
-			return -1;
-		} elseif ($amin > $bmin && $amax >= $bmax && $bmax > 0) {
-			return 1;
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Check whether a gedcom date contains usable calendar date(s).
-	 *
-	 * An incomplete date such as "12 AUG" would be invalid, as
-	 * we cannot sort it.
-	 *
-	 * @return bool
-	 */
-	public function isOK() {
-		return $this->minimumJulianDay() && $this->maximumJulianDay();
-	}
-
-	/**
-	 * 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,
-	 * such as the ancestry.com search interface or the dated fact icons.
-	 *
-	 * @return int
-	 */
-	public function gregorianYear() {
-		if ($this->isOK()) {
-			$gregorian_calendar = new GregorianCalendar;
-			list($year)         = $gregorian_calendar->jdToYmd($this->julianDay());
-
-			return $year;
-		} else {
-			return 0;
-		}
-	}
+    /** @var string Optional qualifier, such as BEF, FROM, ABT */
+    public $qual1;
+
+    /** @var CalendarDate  The first (or only) date */
+    private $date1;
+
+    /** @var string  Optional qualifier, such as TO, AND*/
+    public $qual2;
+
+    /** @var CalendarDate Optional second date */
+    private $date2;
+
+    /** @var string ptional text, as included with an INTerpreted date */
+    private $text;
+
+    /**
+     * Create a date, from GEDCOM data.
+     *
+     * @param string $date A date in GEDCOM format
+     */
+    public function __construct($date) {
+        // Extract any explanatory text
+        if (preg_match('/^(.*) ?[(](.*)[)]/', $date, $match)) {
+            $date       = $match[1];
+            $this->text = $match[2];
+        }
+        if (preg_match('/^(FROM|BET) (.+) (AND|TO) (.+)/', $date, $match)) {
+            $this->qual1 = $match[1];
+            $this->date1 = $this->parseDate($match[2]);
+            $this->qual2 = $match[3];
+            $this->date2 = $this->parseDate($match[4]);
+        } elseif (preg_match('/^(TO|FROM|BEF|AFT|CAL|EST|INT|ABT) (.+)/', $date, $match)) {
+            $this->qual1 = $match[1];
+            $this->date1 = $this->parseDate($match[2]);
+        } else {
+            $this->date1 = $this->parseDate($date);
+        }
+    }
+
+    /**
+     * When we copy a date object, we need to create copies of
+     * its child objects.
+     */
+    public function __clone() {
+        $this->date1 = clone $this->date1;
+        if (is_object($this->date2)) {
+            $this->date2 = clone $this->date2;
+        }
+    }
+
+    /**
+     * Convert a calendar date, such as "12 JUN 1943" into calendar date object.
+     *
+     * A GEDCOM date range may have two calendar dates.
+     *
+     * @param string $date
+     *
+     * @throws \DomainException
+     *
+     * @return CalendarDate
+     */
+    private function parseDate($date) {
+        // Valid calendar escape specified? - use it
+        if (preg_match('/^(@#D(?:GREGORIAN|JULIAN|HEBREW|HIJRI|JALALI|FRENCH R|ROMAN)+@) ?(.*)/', $date, $match)) {
+            $cal  = $match[1];
+            $date = $match[2];
+        } else {
+            $cal = '';
+        }
+        // A date with a month: DM, M, MY or DMY
+        if (preg_match('/^(\d?\d?) ?(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC|TSH|CSH|KSL|TVT|SHV|ADR|ADS|NSN|IYR|SVN|TMZ|AAV|ELL|VEND|BRUM|FRIM|NIVO|PLUV|VENT|GERM|FLOR|PRAI|MESS|THER|FRUC|COMP|MUHAR|SAFAR|RABI[AT]|JUMA[AT]|RAJAB|SHAAB|RAMAD|SHAWW|DHUAQ|DHUAH|FARVA|ORDIB|KHORD|TIR|MORDA|SHAHR|MEHR|ABAN|AZAR|DEY|BAHMA|ESFAN) ?((?:\d{1,4}(?: B\.C\.)?|\d\d\d\d\/\d\d)?)$/', $date, $match)) {
+            $d = $match[1];
+            $m = $match[2];
+            $y = $match[3];
+        } elseif (preg_match('/^(\d{1,4}(?: B\.C\.)?|\d\d\d\d\/\d\d)$/', $date, $match)) {
+                // A date with just a year
+                $d = '';
+                $m = '';
+                $y = $match[1];
+            } else {
+                // An invalid date - do the best we can.
+                $d = '';
+                $m = '';
+                $y = '';
+                // Look for a 3/4 digit year anywhere in the date
+                if (preg_match('/\b(\d{3,4})\b/', $date, $match)) {
+                    $y = $match[1];
+                }
+                // Look for a month anywhere in the date
+                if (preg_match('/(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC|TSH|CSH|KSL|TVT|SHV|ADR|ADS|NSN|IYR|SVN|TMZ|AAV|ELL|VEND|BRUM|FRIM|NIVO|PLUV|VENT|GERM|FLOR|PRAI|MESS|THER|FRUC|COMP|MUHAR|SAFAR|RABI[AT]|JUMA[AT]|RAJAB|SHAAB|RAMAD|SHAWW|DHUAQ|DHUAH|FARVA|ORDIB|KHORD|TIR|MORDA|SHAHR|MEHR|ABAN|AZAR|DEY|BAHMA|ESFAN)/', $date, $match)) {
+                    $m = $match[1];
+                    // Look for a day number anywhere in the date
+                    if (preg_match('/\b(\d\d?)\b/', $date, $match)) {
+                        $d = $match[1];
+                    }
+                }
+            }
+
+        // Unambiguous dates - override calendar escape
+        if (preg_match('/^(TSH|CSH|KSL|TVT|SHV|ADR|ADS|NSN|IYR|SVN|TMZ|AAV|ELL)$/', $m)) {
+            $cal = '@#DHEBREW@';
+        } else {
+            if (preg_match('/^(VEND|BRUM|FRIM|NIVO|PLUV|VENT|GERM|FLOR|PRAI|MESS|THER|FRUC|COMP)$/', $m)) {
+                $cal = '@#DFRENCH R@';
+            } else {
+                if (preg_match('/^(MUHAR|SAFAR|RABI[AT]|JUMA[AT]|RAJAB|SHAAB|RAMAD|SHAWW|DHUAQ|DHUAH)$/', $m)) {
+                    $cal = '@#DHIJRI@'; // This is a WT extension
+                } else {
+                    if (preg_match('/^(FARVA|ORDIB|KHORD|TIR|MORDA|SHAHR|MEHR|ABAN|AZAR|DEY|BAHMA|ESFAN)$/', $m)) {
+                        $cal = '@#DJALALI@'; // This is a WT extension
+                    } elseif (preg_match('/^\d{1,4}( B\.C\.)|\d\d\d\d\/\d\d$/', $y)) {
+                        $cal = '@#DJULIAN@';
+                    }
+                }
+            }
+        }
+
+        // Ambiguous dates - don't override calendar escape
+        if ($cal == '') {
+            if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) {
+                $cal = '@#DGREGORIAN@';
+            } else {
+                if (preg_match('/^[345]\d\d\d$/', $y)) {
+                    // Year 3000-5999
+                    $cal = '@#DHEBREW@';
+                } else {
+                    $cal = '@#DGREGORIAN@';
+                }
+            }
+        }
+        // Now construct an object of the correct type
+        switch ($cal) {
+        case '@#DGREGORIAN@':
+            return new GregorianDate(array($y, $m, $d));
+        case '@#DJULIAN@':
+            return new JulianDate(array($y, $m, $d));
+        case '@#DHEBREW@':
+            return new JewishDate(array($y, $m, $d));
+        case '@#DHIJRI@':
+            return new HijriDate(array($y, $m, $d));
+        case '@#DFRENCH R@':
+            return new FrenchDate(array($y, $m, $d));
+        case '@#DJALALI@':
+            return new JalaliDate(array($y, $m, $d));
+        case '@#DROMAN@':
+            return new RomanDate(array($y, $m, $d));
+        default:
+            throw new \DomainException('Invalid calendar');
+        }
+    }
+
+    /**
+     * A list of supported calendars and their names.
+     *
+     * @return string[]
+     */
+    public static function calendarNames() {
+        return array(
+            'gregorian' => /* I18N: The gregorian calendar */ I18N::translate('Gregorian'),
+            'julian'    => /* I18N: The julian calendar */ I18N::translate('Julian'),
+            'french'    => /* I18N: The French calendar */ I18N::translate('French'),
+            'jewish'    => /* I18N: The Hebrew/Jewish calendar */ I18N::translate('Jewish'),
+            'hijri'     => /* I18N: The Arabic/Hijri calendar */ I18N::translate('Hijri'),
+            'jalali'    => /* I18N: The Persian/Jalali calendar */ I18N::translate('Jalali'),
+        );
+    }
+
+    /**
+     * Convert a date to the preferred format and calendar(s) display.
+     *
+     * @param bool|null   $url               Wrap the date in a link to calendar.php
+     * @param string|null $date_format       Override the default date format
+     * @param bool|null   $convert_calendars Convert the date into other calendars
+     *
+     * @return string
+     */
+    public function display($url = false, $date_format = null, $convert_calendars = true) {
+        global $WT_TREE;
+
+        $CALENDAR_FORMAT = $WT_TREE->getPreference('CALENDAR_FORMAT');
+
+        if ($date_format === null) {
+            $date_format = I18N::dateFormat();
+        }
+
+        if ($convert_calendars) {
+            $calendar_format = explode('_and_', $CALENDAR_FORMAT);
+        } else {
+            $calendar_format = array();
+        }
+
+        // Two dates with text before, between and after
+        $q1 = $this->qual1;
+        $d1 = $this->date1->format($date_format, $this->qual1);
+        $q2 = $this->qual2;
+        if (is_null($this->date2)) {
+            $d2 = '';
+        } else {
+            $d2 = $this->date2->format($date_format, $this->qual2);
+        }
+        // Con vert to other calendars, if requested
+        $conv1 = '';
+        $conv2 = '';
+        foreach ($calendar_format as $cal_fmt) {
+            if ($cal_fmt != 'none') {
+                $d1conv = $this->date1->convertToCalendar($cal_fmt);
+                if ($d1conv->inValidRange()) {
+                    $d1tmp = $d1conv->format($date_format, $this->qual1);
+                } else {
+                    $d1tmp = '';
+                }
+                if (is_null($this->date2)) {
+                    $d2conv = null;
+                    $d2tmp  = '';
+                } else {
+                    $d2conv = $this->date2->convertToCalendar($cal_fmt);
+                    if ($d2conv->inValidRange()) {
+                        $d2tmp = $d2conv->format($date_format, $this->qual2);
+                    } else {
+                        $d2tmp = '';
+                    }
+                }
+                // If the date is different from the unconverted date, add it to the date string.
+                if ($d1 != $d1tmp && $d1tmp !== '') {
+                    if ($url) {
+                        if ($CALENDAR_FORMAT !== 'none') {
+                            $conv1 .= ' <span dir="' . I18N::direction() . '">(<a href="' . $d1conv->calendarUrl($date_format) . '" rel="nofollow">' . $d1tmp . '</a>)</span>';
+                        } else {
+                            $conv1 .= ' <span dir="' . I18N::direction() . '"><br><a href="' . $d1conv->calendarUrl($date_format) . '" rel="nofollow">' . $d1tmp . '</a></span>';
+                        }
+                    } else {
+                        $conv1 .= ' <span dir="' . I18N::direction() . '">(' . $d1tmp . ')</span>';
+                    }
+                }
+                if (!is_null($this->date2) && $d2 != $d2tmp && $d1tmp != '') {
+                    if ($url) {
+                        $conv2 .= ' <span dir="' . I18N::direction() . '">(<a href="' . $d2conv->calendarUrl($date_format) . '" rel="nofollow">' . $d2tmp . '</a>)</span>';
+                    } else {
+                        $conv2 .= ' <span dir="' . I18N::direction() . '">(' . $d2tmp . ')</span>';
+                    }
+                }
+            }
+        }
+
+        // Add URLs, if requested
+        if ($url) {
+            $d1 = '<a href="' . $this->date1->calendarUrl($date_format) . '" rel="nofollow">' . $d1 . '</a>';
+            if (!is_null($this->date2)) {
+                $d2 = '<a href="' . $this->date2->calendarUrl($date_format) . '" rel="nofollow">' . $d2 . '</a>';
+            }
+        }
+
+        // Localise the date
+        switch ($q1 . $q2) {
+        case '':
+            $tmp = $d1 . $conv1;
+            break;
+        case 'ABT':
+            $tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
+            break;
+        case 'CAL':
+            $tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
+            break;
+        case 'EST':
+            $tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
+            break;
+        case 'INT':
+            $tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, Filter::escapeHtml($this->text));
+            break;
+        case 'BEF':
+            $tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
+            break;
+        case 'AFT':
+            $tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
+            break;
+        case 'FROM':
+            $tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
+            break;
+        case 'TO':
+            $tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
+            break;
+        case 'BETAND':
+            $tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
+            break;
+        case 'FROMTO':
+            $tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
+            break;
+        default:
+            $tmp = I18N::translate('Invalid date');
+            break; // e.g. BET without AND
+        }
+        if ($this->text && !$q1) {
+            $tmp = I18N::translate('%1$s (%2$s)', $tmp, $this->text);
+        }
+
+        if (strip_tags($tmp) === '') {
+            return '';
+        } else {
+            return '<span class="date">' . $tmp . '</span>';
+        }
+    }
+
+    /**
+     * Get the earliest calendar date from this GEDCOM date.
+     *
+     * In the date “FROM 1900 TO 1910”, this would be 1900.
+     *
+     * @return CalendarDate
+     */
+    public function minimumDate() {
+        return $this->date1;
+    }
+
+    /**
+     * Get the latest calendar date from this GEDCOM date.
+     *
+     * In the date “FROM 1900 TO 1910”, this would be 1910.
+     *
+     * @return CalendarDate
+     */
+    public function maximumDate() {
+        if (is_null($this->date2)) {
+            return $this->date1;
+        } else {
+            return $this->date2;
+        }
+    }
+
+    /**
+     * Get the earliest Julian day number from this GEDCOM date.
+     *
+     * @return int
+     */
+    public function minimumJulianDay() {
+        return $this->minimumDate()->minJD;
+    }
+
+    /**
+     * Get the latest Julian day number from this GEDCOM date.
+     *
+     * @return int
+     */
+    public function maximumJulianDay() {
+        return $this->maximumDate()->maxJD;
+    }
+
+    /**
+     * Get the middle Julian day number from the GEDCOM date.
+     *
+     * For a month-only date, this would be somewhere around the 16th day.
+     * For a year-only date, this would be somewhere around 1st July.
+     *
+     * @return int
+     */
+    public function julianDay() {
+        return (int) (($this->minimumJulianDay() + $this->maximumJulianDay()) / 2);
+    }
+
+    /**
+     * Offset this date by N years, and round to the whole year.
+     *
+     * This is typically used to create an estimated death date,
+     * which is before a certain number of years after the birth date.
+     *
+     * @param int     $years     a number of years, positive or negative
+     * @param string  $qualifier typically “BEF” or “AFT”
+     *
+     * @return Date
+     */
+    public function addYears($years, $qualifier = '') {
+        $tmp = clone $this;
+        $tmp->date1->y += $years;
+        $tmp->date1->m = 0;
+        $tmp->date1->d = 0;
+        $tmp->date1->setJdFromYmd();
+        $tmp->qual1 = $qualifier;
+        $tmp->qual2 = '';
+        $tmp->date2 = null;
+
+        return $tmp;
+    }
+
+    /**
+     * Calculate the the age of a person, on a date.
+     *
+     * @param Date $d1
+     * @param Date $d2
+     * @param int  $format
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return int|string
+     */
+    public static function getAge(Date $d1, Date $d2 = null, $format = 0) {
+        if ($d2) {
+            if ($d2->maximumJulianDay() >= $d1->minimumJulianDay() && $d2->minimumJulianDay() <= $d1->minimumJulianDay()) {
+                // Overlapping dates
+                $jd = $d1->minimumJulianDay();
+            } else {
+                // Non-overlapping dates
+                $jd = $d2->minimumJulianDay();
+            }
+        } else {
+            // If second date not specified, use today’s date
+            $jd = WT_CLIENT_JD;
+        }
+
+        switch ($format) {
+        case 0:
+            // Years - integer only (for statistics, rather than for display)
+            if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
+                return $d1->minimumDate()->getAge(false, $jd, false);
+            } else {
+                return -1;
+            }
+        case 1:
+            // Days - integer only (for sorting, rather than for display)
+            if ($jd && $d1->minimumJulianDay()) {
+                return $jd - $d1->minimumJulianDay();
+            } else {
+                return -1;
+            }
+        case 2:
+            // Just years, in local digits, with warning for negative/
+            if ($jd && $d1->minimumJulianDay()) {
+                if ($d1->minimumJulianDay() > $jd) {
+                    return '<i class="icon-warning"></i>';
+                } else {
+                    return I18N::number($d1->minimumDate()->getAge(false, $jd));
+                }
+            } else {
+                return '';
+            }
+        default:
+            throw new \InvalidArgumentException('format: ' . $format);
+        }
+    }
+
+    /**
+     * Calculate the years/months/days between two events
+     * Return a gedcom style age string: "1y 2m 3d" (for fact details)
+     *
+     * @param Date      $d1
+     * @param Date|null $d2
+     *
+     * @return string
+     */
+    public static function getAgeGedcom(Date $d1, Date $d2 = null) {
+        if (is_null($d2)) {
+            return $d1->date1->getAge(true, WT_CLIENT_JD, true);
+        } else {
+            // If dates overlap, then can’t calculate age.
+            if (self::compare($d1, $d2)) {
+                return $d1->date1->getAge(true, $d2->minimumJulianDay(), true);
+            } elseif (self::compare($d1, $d2) == 0 && $d1->minimumJulianDay() == $d2->minimumJulianDay()) {
+                return '0d';
+            } else {
+                return '';
+            }
+        }
+    }
+
+    /**
+     * Compare two dates, so they can be sorted.
+     *
+     * return <0 if $a<$b
+     * return >0 if $b>$a
+     * return  0 if dates same/overlap
+     * BEF/AFT sort as the day before/after
+     *
+     * @param Date $a
+     * @param Date $b
+     *
+     * @return int
+     */
+    public static function compare(Date $a, Date $b) {
+        // Get min/max JD for each date.
+        switch ($a->qual1) {
+        case 'BEF':
+            $amin = $a->minimumJulianDay() - 1;
+            $amax = $amin;
+            break;
+        case 'AFT':
+            $amax = $a->maximumJulianDay() + 1;
+            $amin = $amax;
+            break;
+        default:
+            $amin = $a->minimumJulianDay();
+            $amax = $a->maximumJulianDay();
+            break;
+        }
+        switch ($b->qual1) {
+        case 'BEF':
+            $bmin = $b->minimumJulianDay() - 1;
+            $bmax = $bmin;
+            break;
+        case 'AFT':
+            $bmax = $b->maximumJulianDay() + 1;
+            $bmin = $bmax;
+            break;
+        default:
+            $bmin = $b->minimumJulianDay();
+            $bmax = $b->maximumJulianDay();
+            break;
+        }
+        if ($amax < $bmin) {
+            return -1;
+        } elseif ($amin > $bmax && $bmax > 0) {
+            return 1;
+        } elseif ($amin < $bmin && $amax <= $bmax) {
+            return -1;
+        } elseif ($amin > $bmin && $amax >= $bmax && $bmax > 0) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Check whether a gedcom date contains usable calendar date(s).
+     *
+     * An incomplete date such as "12 AUG" would be invalid, as
+     * we cannot sort it.
+     *
+     * @return bool
+     */
+    public function isOK() {
+        return $this->minimumJulianDay() && $this->maximumJulianDay();
+    }
+
+    /**
+     * 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,
+     * such as the ancestry.com search interface or the dated fact icons.
+     *
+     * @return int
+     */
+    public function gregorianYear() {
+        if ($this->isOK()) {
+            $gregorian_calendar = new GregorianCalendar;
+            list($year)         = $gregorian_calendar->jdToYmd($this->julianDay());
+
+            return $year;
+        } else {
+            return 0;
+        }
+    }
 }

Switch Indentation +103 added lines, -103 removed lines

@@ -169,22 +169,22 @@ 
 		}
 		// Now construct an object of the correct type
 		switch ($cal) {
-		case '@#DGREGORIAN@':
-			return new GregorianDate(array($y, $m, $d));
-		case '@#DJULIAN@':
-			return new JulianDate(array($y, $m, $d));
-		case '@#DHEBREW@':
-			return new JewishDate(array($y, $m, $d));
-		case '@#DHIJRI@':
-			return new HijriDate(array($y, $m, $d));
-		case '@#DFRENCH R@':
-			return new FrenchDate(array($y, $m, $d));
-		case '@#DJALALI@':
-			return new JalaliDate(array($y, $m, $d));
-		case '@#DROMAN@':
-			return new RomanDate(array($y, $m, $d));
-		default:
-			throw new \DomainException('Invalid calendar');
+		    case '@#DGREGORIAN@':
+			    return new GregorianDate(array($y, $m, $d));
+		    case '@#DJULIAN@':
+			    return new JulianDate(array($y, $m, $d));
+		    case '@#DHEBREW@':
+			    return new JewishDate(array($y, $m, $d));
+		    case '@#DHIJRI@':
+			    return new HijriDate(array($y, $m, $d));
+		    case '@#DFRENCH R@':
+			    return new FrenchDate(array($y, $m, $d));
+		    case '@#DJALALI@':
+			    return new JalaliDate(array($y, $m, $d));
+		    case '@#DROMAN@':
+			    return new RomanDate(array($y, $m, $d));
+		    default:
+			    throw new \DomainException('Invalid calendar');
 		}
 	}
 
@@ -291,42 +291,42 @@ 
 
 		// Localise the date
 		switch ($q1 . $q2) {
-		case '':
-			$tmp = $d1 . $conv1;
-			break;
-		case 'ABT':
-			$tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
-			break;
-		case 'CAL':
-			$tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
-			break;
-		case 'EST':
-			$tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
-			break;
-		case 'INT':
-			$tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, Filter::escapeHtml($this->text));
-			break;
-		case 'BEF':
-			$tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
-			break;
-		case 'AFT':
-			$tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
-			break;
-		case 'FROM':
-			$tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
-			break;
-		case 'TO':
-			$tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
-			break;
-		case 'BETAND':
-			$tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
-			break;
-		case 'FROMTO':
-			$tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
-			break;
-		default:
-			$tmp = I18N::translate('Invalid date');
-			break; // e.g. BET without AND
+		    case '':
+			    $tmp = $d1 . $conv1;
+			    break;
+		    case 'ABT':
+			    $tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
+			    break;
+		    case 'CAL':
+			    $tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
+			    break;
+		    case 'EST':
+			    $tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
+			    break;
+		    case 'INT':
+			    $tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, Filter::escapeHtml($this->text));
+			    break;
+		    case 'BEF':
+			    $tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
+			    break;
+		    case 'AFT':
+			    $tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
+			    break;
+		    case 'FROM':
+			    $tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
+			    break;
+		    case 'TO':
+			    $tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
+			    break;
+		    case 'BETAND':
+			    $tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
+			    break;
+		    case 'FROMTO':
+			    $tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
+			    break;
+		    default:
+			    $tmp = I18N::translate('Invalid date');
+			    break; // e.g. BET without AND
 		}
 		if ($this->text && !$q1) {
 			$tmp = I18N::translate('%1$s (%2$s)', $tmp, $this->text);
@@ -445,33 +445,33 @@ 
 		}
 
 		switch ($format) {
-		case 0:
-			// Years - integer only (for statistics, rather than for display)
-			if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
-				return $d1->minimumDate()->getAge(false, $jd, false);
-			} else {
-				return -1;
-			}
-		case 1:
-			// Days - integer only (for sorting, rather than for display)
-			if ($jd && $d1->minimumJulianDay()) {
-				return $jd - $d1->minimumJulianDay();
-			} else {
-				return -1;
-			}
-		case 2:
-			// Just years, in local digits, with warning for negative/
-			if ($jd && $d1->minimumJulianDay()) {
-				if ($d1->minimumJulianDay() > $jd) {
-					return '<i class="icon-warning"></i>';
-				} else {
-					return I18N::number($d1->minimumDate()->getAge(false, $jd));
-				}
-			} else {
-				return '';
-			}
-		default:
-			throw new \InvalidArgumentException('format: ' . $format);
+		    case 0:
+			    // Years - integer only (for statistics, rather than for display)
+			    if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
+				    return $d1->minimumDate()->getAge(false, $jd, false);
+			    } else {
+				    return -1;
+			    }
+		    case 1:
+			    // Days - integer only (for sorting, rather than for display)
+			    if ($jd && $d1->minimumJulianDay()) {
+				    return $jd - $d1->minimumJulianDay();
+			    } else {
+				    return -1;
+			    }
+		    case 2:
+			    // Just years, in local digits, with warning for negative/
+			    if ($jd && $d1->minimumJulianDay()) {
+				    if ($d1->minimumJulianDay() > $jd) {
+					    return '<i class="icon-warning"></i>';
+				    } else {
+					    return I18N::number($d1->minimumDate()->getAge(false, $jd));
+				    }
+			    } else {
+				    return '';
+			    }
+		    default:
+			    throw new \InvalidArgumentException('format: ' . $format);
 		}
 	}
 
@@ -515,32 +515,32 @@ 
 	public static function compare(Date $a, Date $b) {
 		// Get min/max JD for each date.
 		switch ($a->qual1) {
-		case 'BEF':
-			$amin = $a->minimumJulianDay() - 1;
-			$amax = $amin;
-			break;
-		case 'AFT':
-			$amax = $a->maximumJulianDay() + 1;
-			$amin = $amax;
-			break;
-		default:
-			$amin = $a->minimumJulianDay();
-			$amax = $a->maximumJulianDay();
-			break;
+		    case 'BEF':
+			    $amin = $a->minimumJulianDay() - 1;
+			    $amax = $amin;
+			    break;
+		    case 'AFT':
+			    $amax = $a->maximumJulianDay() + 1;
+			    $amin = $amax;
+			    break;
+		    default:
+			    $amin = $a->minimumJulianDay();
+			    $amax = $a->maximumJulianDay();
+			    break;
 		}
 		switch ($b->qual1) {
-		case 'BEF':
-			$bmin = $b->minimumJulianDay() - 1;
-			$bmax = $bmin;
-			break;
-		case 'AFT':
-			$bmax = $b->maximumJulianDay() + 1;
-			$bmin = $bmax;
-			break;
-		default:
-			$bmin = $b->minimumJulianDay();
-			$bmax = $b->maximumJulianDay();
-			break;
+		    case 'BEF':
+			    $bmin = $b->minimumJulianDay() - 1;
+			    $bmax = $bmin;
+			    break;
+		    case 'AFT':
+			    $bmax = $b->maximumJulianDay() + 1;
+			    $bmin = $bmax;
+			    break;
+		    default:
+			    $bmin = $b->minimumJulianDay();
+			    $bmax = $b->maximumJulianDay();
+			    break;
 		}
 		if ($amax < $bmin) {
 			return -1;

Braces +34 added lines, -17 removed lines

@@ -36,7 +36,8 @@ 
  * 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".
  */
-class Date {
+class Date
+{
 	/** @var string Optional qualifier, such as BEF, FROM, ABT */
 	public $qual1;
 
@@ -57,7 +58,8 @@ 
 	 *
 	 * @param string $date A date in GEDCOM format
 	 */
-	public function __construct($date) {
+	public function __construct($date)
+	{
 		// Extract any explanatory text
 		if (preg_match('/^(.*) ?[(](.*)[)]/', $date, $match)) {
 			$date       = $match[1];
@@ -80,7 +82,8 @@ 
 	 * When we copy a date object, we need to create copies of
 	 * its child objects.
 	 */
-	public function __clone() {
+	public function __clone()
+	{
 		$this->date1 = clone $this->date1;
 		if (is_object($this->date2)) {
 			$this->date2 = clone $this->date2;
@@ -98,7 +101,8 @@ 
 	 *
 	 * @return CalendarDate
 	 */
-	private function parseDate($date) {
+	private function parseDate($date)
+	{
 		// Valid calendar escape specified? - use it
 		if (preg_match('/^(@#D(?:GREGORIAN|JULIAN|HEBREW|HIJRI|JALALI|FRENCH R|ROMAN)+@) ?(.*)/', $date, $match)) {
 			$cal  = $match[1];
@@ -193,7 +197,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function calendarNames() {
+	public static function calendarNames()
+	{
 		return array(
 			'gregorian' => /* I18N: The gregorian calendar */ I18N::translate('Gregorian'),
 			'julian'    => /* I18N: The julian calendar */ I18N::translate('Julian'),
@@ -213,7 +218,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function display($url = false, $date_format = null, $convert_calendars = true) {
+	public function display($url = false, $date_format = null, $convert_calendars = true)
+	{
 		global $WT_TREE;
 
 		$CALENDAR_FORMAT = $WT_TREE->getPreference('CALENDAR_FORMAT');
@@ -346,7 +352,8 @@ 
 	 *
 	 * @return CalendarDate
 	 */
-	public function minimumDate() {
+	public function minimumDate()
+	{
 		return $this->date1;
 	}
 
@@ -357,7 +364,8 @@ 
 	 *
 	 * @return CalendarDate
 	 */
-	public function maximumDate() {
+	public function maximumDate()
+	{
 		if (is_null($this->date2)) {
 			return $this->date1;
 		} else {
@@ -370,7 +378,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function minimumJulianDay() {
+	public function minimumJulianDay()
+	{
 		return $this->minimumDate()->minJD;
 	}
 
@@ -379,7 +388,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function maximumJulianDay() {
+	public function maximumJulianDay()
+	{
 		return $this->maximumDate()->maxJD;
 	}
 
@@ -391,7 +401,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function julianDay() {
+	public function julianDay()
+	{
 		return (int) (($this->minimumJulianDay() + $this->maximumJulianDay()) / 2);
 	}
 
@@ -406,7 +417,8 @@ 
 	 *
 	 * @return Date
 	 */
-	public function addYears($years, $qualifier = '') {
+	public function addYears($years, $qualifier = '')
+	{
 		$tmp = clone $this;
 		$tmp->date1->y += $years;
 		$tmp->date1->m = 0;
@@ -430,7 +442,8 @@ 
 	 *
 	 * @return int|string
 	 */
-	public static function getAge(Date $d1, Date $d2 = null, $format = 0) {
+	public static function getAge(Date $d1, Date $d2 = null, $format = 0)
+	{
 		if ($d2) {
 			if ($d2->maximumJulianDay() >= $d1->minimumJulianDay() && $d2->minimumJulianDay() <= $d1->minimumJulianDay()) {
 				// Overlapping dates
@@ -484,7 +497,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getAgeGedcom(Date $d1, Date $d2 = null) {
+	public static function getAgeGedcom(Date $d1, Date $d2 = null)
+	{
 		if (is_null($d2)) {
 			return $d1->date1->getAge(true, WT_CLIENT_JD, true);
 		} else {
@@ -512,7 +526,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function compare(Date $a, Date $b) {
+	public static function compare(Date $a, Date $b)
+	{
 		// Get min/max JD for each date.
 		switch ($a->qual1) {
 		case 'BEF':
@@ -563,7 +578,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isOK() {
+	public function isOK()
+	{
 		return $this->minimumJulianDay() && $this->maximumJulianDay();
 	}
 
@@ -575,7 +591,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function gregorianYear() {
+	public function gregorianYear()
+	{
 		if ($this->isOK()) {
 			$gregorian_calendar = new GregorianCalendar;
 			list($year)         = $gregorian_calendar->jdToYmd($this->julianDay());

app/Functions/Functions.php

Indentation +2132 added lines, -2132 removed lines

@@ -27,2193 +27,2193 @@
  * Class Functions - common functions
  */
 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
-	 * installation statistics which can be found at http://svn.webtrees.net/statistics.html
-	 *
-	 * @return null|string
-	 */
-	public static function fetchLatestVersion() {
-		$last_update_timestamp = Site::getPreference('LATEST_WT_VERSION_TIMESTAMP');
-		if ($last_update_timestamp < WT_TIMESTAMP - 24 * 60 * 60) {
-			$row                = Database::prepare("SHOW VARIABLES LIKE 'version'")->fetchOneRow();
-			$params             = '?w=' . WT_VERSION . '&p=' . PHP_VERSION . '&m=' . $row->value . '&o=' . (DIRECTORY_SEPARATOR === '/' ? 'u' : 'w');
-			$latest_version_txt = File::fetchUrl('https://dev.webtrees.net/build/latest-version.txt' . $params);
-			if ($latest_version_txt) {
-				Site::setPreference('LATEST_WT_VERSION', $latest_version_txt);
-				Site::setPreference('LATEST_WT_VERSION_TIMESTAMP', WT_TIMESTAMP);
+    /**
+     * 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
+     * installation statistics which can be found at http://svn.webtrees.net/statistics.html
+     *
+     * @return null|string
+     */
+    public static function fetchLatestVersion() {
+        $last_update_timestamp = Site::getPreference('LATEST_WT_VERSION_TIMESTAMP');
+        if ($last_update_timestamp < WT_TIMESTAMP - 24 * 60 * 60) {
+            $row                = Database::prepare("SHOW VARIABLES LIKE 'version'")->fetchOneRow();
+            $params             = '?w=' . WT_VERSION . '&p=' . PHP_VERSION . '&m=' . $row->value . '&o=' . (DIRECTORY_SEPARATOR === '/' ? 'u' : 'w');
+            $latest_version_txt = File::fetchUrl('https://dev.webtrees.net/build/latest-version.txt' . $params);
+            if ($latest_version_txt) {
+                Site::setPreference('LATEST_WT_VERSION', $latest_version_txt);
+                Site::setPreference('LATEST_WT_VERSION_TIMESTAMP', WT_TIMESTAMP);
 
-				return $latest_version_txt;
-			} else {
-				// Cannot connect to server - use cached version (if we have one)
-				return Site::getPreference('LATEST_WT_VERSION');
-			}
-		} else {
-			return Site::getPreference('LATEST_WT_VERSION');
-		}
-	}
+                return $latest_version_txt;
+            } else {
+                // Cannot connect to server - use cached version (if we have one)
+                return Site::getPreference('LATEST_WT_VERSION');
+            }
+        } else {
+            return Site::getPreference('LATEST_WT_VERSION');
+        }
+    }
 
-	/**
-	 * Convert a file upload PHP error code into user-friendly text.
-	 *
-	 * @param int $error_code
-	 *
-	 * @return string
-	 */
-	public static function fileUploadErrorText($error_code) {
-		switch ($error_code) {
-		case UPLOAD_ERR_OK:
-			return I18N::translate('File successfully uploaded');
-		case UPLOAD_ERR_INI_SIZE:
-		case UPLOAD_ERR_FORM_SIZE:
-			// I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
-			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.');
-		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.');
-		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.');
-		case UPLOAD_ERR_CANT_WRITE:
-			// I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
-			return I18N::translate('PHP failed to write to disk.');
-		case UPLOAD_ERR_EXTENSION:
-			// I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
-			return I18N::translate('PHP blocked the file because of its extension.');
-		default:
-			return 'Error: ' . $error_code;
-		}
-	}
+    /**
+     * Convert a file upload PHP error code into user-friendly text.
+     *
+     * @param int $error_code
+     *
+     * @return string
+     */
+    public static function fileUploadErrorText($error_code) {
+        switch ($error_code) {
+        case UPLOAD_ERR_OK:
+            return I18N::translate('File successfully uploaded');
+        case UPLOAD_ERR_INI_SIZE:
+        case UPLOAD_ERR_FORM_SIZE:
+            // I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
+            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.');
+        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.');
+        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.');
+        case UPLOAD_ERR_CANT_WRITE:
+            // I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
+            return I18N::translate('PHP failed to write to disk.');
+        case UPLOAD_ERR_EXTENSION:
+            // I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
+            return I18N::translate('PHP blocked the file because of its extension.');
+        default:
+            return 'Error: ' . $error_code;
+        }
+    }
 
-	/**
-	 * get a gedcom subrecord
-	 *
-	 * 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
-	 * 2 DATE 1 JAN 1900
-	 * 2 PLAC Phoenix, Maricopa, Arizona</code>
-	 * The following example is the DATE subrecord of the above BIRT subrecord:
-	 * <code>2 DATE 1 JAN 1900</code>
-	 *
-	 * @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
-	 *                        second one, etc.
-	 *
-	 * @return string the subrecord that was found or an empty string "" if not found.
-	 */
-	public static function getSubRecord($level, $tag, $gedrec, $num = 1) {
-		if (empty($gedrec)) {
-			return '';
-		}
-		// -- adding \n before and after gedrec
-		$gedrec       = "\n" . $gedrec . "\n";
-		$tag          = trim($tag);
-		$searchTarget = "~[\n]" . $tag . "[\s]~";
-		$ct           = preg_match_all($searchTarget, $gedrec, $match, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
-		if ($ct == 0) {
-			return '';
-		}
-		if ($ct < $num) {
-			return '';
-		}
-		$pos1 = $match[$num - 1][0][1];
-		$pos2 = strpos($gedrec, "\n$level", $pos1 + 1);
-		if (!$pos2) {
-			$pos2 = strpos($gedrec, "\n1", $pos1 + 1);
-		}
-		if (!$pos2) {
-			$pos2 = strpos($gedrec, "\nWT_", $pos1 + 1); // WT_SPOUSE, WT_FAMILY_ID ...
-		}
-		if (!$pos2) {
-			return ltrim(substr($gedrec, $pos1));
-		}
-		$subrec = substr($gedrec, $pos1, $pos2 - $pos1);
+    /**
+     * get a gedcom subrecord
+     *
+     * 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
+     * 2 DATE 1 JAN 1900
+     * 2 PLAC Phoenix, Maricopa, Arizona</code>
+     * The following example is the DATE subrecord of the above BIRT subrecord:
+     * <code>2 DATE 1 JAN 1900</code>
+     *
+     * @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
+     *                        second one, etc.
+     *
+     * @return string the subrecord that was found or an empty string "" if not found.
+     */
+    public static function getSubRecord($level, $tag, $gedrec, $num = 1) {
+        if (empty($gedrec)) {
+            return '';
+        }
+        // -- adding \n before and after gedrec
+        $gedrec       = "\n" . $gedrec . "\n";
+        $tag          = trim($tag);
+        $searchTarget = "~[\n]" . $tag . "[\s]~";
+        $ct           = preg_match_all($searchTarget, $gedrec, $match, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
+        if ($ct == 0) {
+            return '';
+        }
+        if ($ct < $num) {
+            return '';
+        }
+        $pos1 = $match[$num - 1][0][1];
+        $pos2 = strpos($gedrec, "\n$level", $pos1 + 1);
+        if (!$pos2) {
+            $pos2 = strpos($gedrec, "\n1", $pos1 + 1);
+        }
+        if (!$pos2) {
+            $pos2 = strpos($gedrec, "\nWT_", $pos1 + 1); // WT_SPOUSE, WT_FAMILY_ID ...
+        }
+        if (!$pos2) {
+            return ltrim(substr($gedrec, $pos1));
+        }
+        $subrec = substr($gedrec, $pos1, $pos2 - $pos1);
 
-		return ltrim($subrec);
-	}
+        return ltrim($subrec);
+    }
 
-	/**
-	 * get CONT lines
-	 *
-	 * get the N+1 CONT or CONC lines of a gedcom subrecord
-	 *
-	 * @param int $nlevel the level of the CONT lines to get
-	 * @param string $nrec the gedcom subrecord to search in
-	 *
-	 * @return string a string with all CONT lines merged
-	 */
-	public static function getCont($nlevel, $nrec) {
-		$text = '';
+    /**
+     * get CONT lines
+     *
+     * get the N+1 CONT or CONC lines of a gedcom subrecord
+     *
+     * @param int $nlevel the level of the CONT lines to get
+     * @param string $nrec the gedcom subrecord to search in
+     *
+     * @return string a string with all CONT lines merged
+     */
+    public static function getCont($nlevel, $nrec) {
+        $text = '';
 
-		$subrecords = explode("\n", $nrec);
-		foreach ($subrecords as $thisSubrecord) {
-			if (substr($thisSubrecord, 0, 2) !== $nlevel . ' ') {
-				continue;
-			}
-			$subrecordType = substr($thisSubrecord, 2, 4);
-			if ($subrecordType === 'CONT') {
-				$text .= "\n" . substr($thisSubrecord, 7);
-			}
-		}
+        $subrecords = explode("\n", $nrec);
+        foreach ($subrecords as $thisSubrecord) {
+            if (substr($thisSubrecord, 0, 2) !== $nlevel . ' ') {
+                continue;
+            }
+            $subrecordType = substr($thisSubrecord, 2, 4);
+            if ($subrecordType === 'CONT') {
+                $text .= "\n" . substr($thisSubrecord, 7);
+            }
+        }
 
-		return $text;
-	}
+        return $text;
+    }
 
-	/**
-	 * A multi-key sort
-	 * 1. First divide the facts into two arrays one set with dates and one set without dates
-	 * 2. Sort each of the two new arrays, the date using the compare date function, the non-dated
-	 * using the compare type function
-	 * 3. Then merge the arrays back into the original array using the compare type function
-	 *
-	 * @param Fact[] $arr
-	 */
-	public static function sortFacts(&$arr) {
-		$dated    = array();
-		$nondated = array();
-		//-- split the array into dated and non-dated arrays
-		$order = 0;
-		foreach ($arr as $event) {
-			$event->sortOrder = $order;
-			$order++;
-			if ($event->getDate()->isOK()) {
-				$dated[] = $event;
-			} else {
-				$nondated[] = $event;
-			}
-		}
+    /**
+     * A multi-key sort
+     * 1. First divide the facts into two arrays one set with dates and one set without dates
+     * 2. Sort each of the two new arrays, the date using the compare date function, the non-dated
+     * using the compare type function
+     * 3. Then merge the arrays back into the original array using the compare type function
+     *
+     * @param Fact[] $arr
+     */
+    public static function sortFacts(&$arr) {
+        $dated    = array();
+        $nondated = array();
+        //-- split the array into dated and non-dated arrays
+        $order = 0;
+        foreach ($arr as $event) {
+            $event->sortOrder = $order;
+            $order++;
+            if ($event->getDate()->isOK()) {
+                $dated[] = $event;
+            } else {
+                $nondated[] = $event;
+            }
+        }
 
-		//-- sort each type of array
-		usort($dated, '\Fisharebest\Webtrees\Fact::compareDate');
-		usort($nondated, '\Fisharebest\Webtrees\Fact::compareType');
+        //-- sort each type of array
+        usort($dated, '\Fisharebest\Webtrees\Fact::compareDate');
+        usort($nondated, '\Fisharebest\Webtrees\Fact::compareType');
 
-		//-- merge the arrays back together comparing by Facts
-		$dc = count($dated);
-		$nc = count($nondated);
-		$i  = 0;
-		$j  = 0;
-		$k  = 0;
-		// while there is anything in the dated array continue merging
-		while ($i < $dc) {
-			// compare each fact by type to merge them in order
-			if ($j < $nc && Fact::compareType($dated[$i], $nondated[$j]) > 0) {
-				$arr[$k] = $nondated[$j];
-				$j++;
-			} else {
-				$arr[$k] = $dated[$i];
-				$i++;
-			}
-			$k++;
-		}
+        //-- merge the arrays back together comparing by Facts
+        $dc = count($dated);
+        $nc = count($nondated);
+        $i  = 0;
+        $j  = 0;
+        $k  = 0;
+        // while there is anything in the dated array continue merging
+        while ($i < $dc) {
+            // compare each fact by type to merge them in order
+            if ($j < $nc && Fact::compareType($dated[$i], $nondated[$j]) > 0) {
+                $arr[$k] = $nondated[$j];
+                $j++;
+            } else {
+                $arr[$k] = $dated[$i];
+                $i++;
+            }
+            $k++;
+        }
 
-		// get anything that might be left in the nondated array
-		while ($j < $nc) {
-			$arr[$k] = $nondated[$j];
-			$j++;
-			$k++;
-		}
+        // get anything that might be left in the nondated array
+        while ($j < $nc) {
+            $arr[$k] = $nondated[$j];
+            $j++;
+            $k++;
+        }
 
-	}
+    }
 
-	/**
-	 * For close family relationships, such as the families tab and the family navigator
-	 * Display a tick if both individuals are the same.
-	 *
-	 * @param Individual $individual1
-	 * @param Individual $individual2
-	 *
-	 * @return string
-	 */
-	public static function getCloseRelationshipName(Individual $individual1, Individual $individual2) {
-		if ($individual1 === $individual2) {
-			$label = '<i class="icon-selected"></i> ' . self::reflexivePronoun($individual1);
-		} else {
-			$label = self::getRelationshipName(self::getRelationship($individual1, $individual2));
-		}
+    /**
+     * For close family relationships, such as the families tab and the family navigator
+     * Display a tick if both individuals are the same.
+     *
+     * @param Individual $individual1
+     * @param Individual $individual2
+     *
+     * @return string
+     */
+    public static function getCloseRelationshipName(Individual $individual1, Individual $individual2) {
+        if ($individual1 === $individual2) {
+            $label = '<i class="icon-selected"></i> ' . self::reflexivePronoun($individual1);
+        } else {
+            $label = self::getRelationshipName(self::getRelationship($individual1, $individual2));
+        }
 
-		return $label;
-	}
+        return $label;
+    }
 
-	/**
-	 * For facts on the individual/family pages.
-	 *
-	 * @param Individual $individual1
-	 * @param Individual $individual2
-	 *
-	 * @return string
-	 */
-	public static function getAssociateRelationshipName(Individual $individual1, Individual $individual2) {
-		if ($individual1 === $individual2) {
-			$label = self::reflexivePronoun($individual1);
-		} else {
-			$label = self::getRelationshipName(self::getRelationship($individual1, $individual2));
-		}
+    /**
+     * For facts on the individual/family pages.
+     *
+     * @param Individual $individual1
+     * @param Individual $individual2
+     *
+     * @return string
+     */
+    public static function getAssociateRelationshipName(Individual $individual1, Individual $individual2) {
+        if ($individual1 === $individual2) {
+            $label = self::reflexivePronoun($individual1);
+        } else {
+            $label = self::getRelationshipName(self::getRelationship($individual1, $individual2));
+        }
 
-		return $label;
-	}
+        return $label;
+    }
 
-	/**
-	 * Generate a reflexive pronoun for an individual
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	private static function reflexivePronoun(Individual $individual) {
-		switch ($individual->getSex()) {
-		case 'M':
-			return /* I18N: reflexive pronoun */ I18N::translate('himself');
-		case 'F':
-			return /* I18N: reflexive pronoun */ I18N::translate('herself');
-		default:
-			return /* I18N: reflexive pronoun - gender neutral version of himself/herself */ I18N::translate('themself');
-		}
-	}
+    /**
+     * Generate a reflexive pronoun for an individual
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    private static function reflexivePronoun(Individual $individual) {
+        switch ($individual->getSex()) {
+        case 'M':
+            return /* I18N: reflexive pronoun */ I18N::translate('himself');
+        case 'F':
+            return /* I18N: reflexive pronoun */ I18N::translate('herself');
+        default:
+            return /* I18N: reflexive pronoun - gender neutral version of himself/herself */ I18N::translate('themself');
+        }
+    }
 
-	/**
-	 * Get relationship between two individuals in the gedcom
-	 *
-	 * @param Individual $person1 The person to compute the relationship from
-	 * @param Individual $person2 The person to compute the relatiohip to
-	 * @param int $maxlength The maximum length of path
-	 *
-	 * @return array|bool An array of nodes on the relationship path, or false if no path found
-	 */
-	public static function getRelationship(Individual $person1, Individual $person2, $maxlength = 4) {
-		if ($person1 === $person2) {
-			return false;
-		}
+    /**
+     * Get relationship between two individuals in the gedcom
+     *
+     * @param Individual $person1 The person to compute the relationship from
+     * @param Individual $person2 The person to compute the relatiohip to
+     * @param int $maxlength The maximum length of path
+     *
+     * @return array|bool An array of nodes on the relationship path, or false if no path found
+     */
+    public static function getRelationship(Individual $person1, Individual $person2, $maxlength = 4) {
+        if ($person1 === $person2) {
+            return false;
+        }
 
-		$spouse_codes  = array('M' => 'hus', 'F' => 'wif', 'U' => 'spo');
-		$parent_codes  = array('M' => 'fat', 'F' => 'mot', 'U' => 'par');
-		$child_codes   = array('M' => 'son', 'F' => 'dau', 'U' => 'chi');
-		$sibling_codes = array('M' => 'bro', 'F' => 'sis', 'U' => 'sib');
+        $spouse_codes  = array('M' => 'hus', 'F' => 'wif', 'U' => 'spo');
+        $parent_codes  = array('M' => 'fat', 'F' => 'mot', 'U' => 'par');
+        $child_codes   = array('M' => 'son', 'F' => 'dau', 'U' => 'chi');
+        $sibling_codes = array('M' => 'bro', 'F' => 'sis', 'U' => 'sib');
 
-		//-- current path nodes
-		$p1nodes = array();
-		//-- ids visited
-		$visited = array();
+        //-- current path nodes
+        $p1nodes = array();
+        //-- ids visited
+        $visited = array();
 
-		//-- set up first node for person1
-		$node1 = array(
-			'path'      => array($person1),
-			'length'    => 0,
-			'indi'      => $person1,
-			'relations' => array('self'),
-		);
-		$p1nodes[] = $node1;
+        //-- set up first node for person1
+        $node1 = array(
+            'path'      => array($person1),
+            'length'    => 0,
+            'indi'      => $person1,
+            'relations' => array('self'),
+        );
+        $p1nodes[] = $node1;
 
-		$visited[$person1->getXref()] = true;
+        $visited[$person1->getXref()] = true;
 
-		$found = false;
-		while (!$found) {
-			//-- search the node list for the shortest path length
-			$shortest = -1;
-			foreach ($p1nodes as $index => $node) {
-				if ($shortest == -1) {
-					$shortest = $index;
-				} else {
-					$node1 = $p1nodes[$shortest];
-					if ($node1['length'] > $node['length']) {
-						$shortest = $index;
-					}
-				}
-			}
-			if ($shortest === -1) {
-				return false;
-			}
-			$node = $p1nodes[$shortest];
-			if ($maxlength == 0 || count($node['path']) <= $maxlength) {
-				$indi = $node['indi'];
-				//-- check all parents and siblings of this node
-				foreach ($indi->getChildFamilies(Auth::PRIV_HIDE) as $family) {
-					$visited[$family->getXref()] = true;
-					foreach ($family->getSpouses(Auth::PRIV_HIDE) as $spouse) {
-						if (!isset($visited[$spouse->getXref()])) {
-							$node1 = $node;
-							$node1['length']++;
-							$node1['path'][]      = $spouse;
-							$node1['indi']        = $spouse;
-							$node1['relations'][] = $parent_codes[$spouse->getSex()];
-							$p1nodes[]            = $node1;
-							if ($spouse === $person2) {
-								$found   = true;
-								$resnode = $node1;
-							} else {
-								$visited[$spouse->getXref()] = true;
-							}
-						}
-					}
-					foreach ($family->getChildren(Auth::PRIV_HIDE) as $child) {
-						if (!isset($visited[$child->getXref()])) {
-							$node1 = $node;
-							$node1['length']++;
-							$node1['path'][]      = $child;
-							$node1['indi']        = $child;
-							$node1['relations'][] = $sibling_codes[$child->getSex()];
-							$p1nodes[]            = $node1;
-							if ($child === $person2) {
-								$found   = true;
-								$resnode = $node1;
-							} else {
-								$visited[$child->getXref()] = true;
-							}
-						}
-					}
-				}
-				//-- check all spouses and children of this node
-				foreach ($indi->getSpouseFamilies(Auth::PRIV_HIDE) as $family) {
-					$visited[$family->getXref()] = true;
-					foreach ($family->getSpouses(Auth::PRIV_HIDE) as $spouse) {
-						if (!in_array($spouse->getXref(), $node1) || !isset($visited[$spouse->getXref()])) {
-							$node1 = $node;
-							$node1['length']++;
-							$node1['path'][]      = $spouse;
-							$node1['indi']        = $spouse;
-							$node1['relations'][] = $spouse_codes[$spouse->getSex()];
-							$p1nodes[]            = $node1;
-							if ($spouse === $person2) {
-								$found   = true;
-								$resnode = $node1;
-							} else {
-								$visited[$spouse->getXref()] = true;
-							}
-						}
-					}
-					foreach ($family->getChildren(Auth::PRIV_HIDE) as $child) {
-						if (!isset($visited[$child->getXref()])) {
-							$node1 = $node;
-							$node1['length']++;
-							$node1['path'][]      = $child;
-							$node1['indi']        = $child;
-							$node1['relations'][] = $child_codes[$child->getSex()];
-							$p1nodes[]            = $node1;
-							if ($child === $person2) {
-								$found   = true;
-								$resnode = $node1;
-							} else {
-								$visited[$child->getXref()] = true;
-							}
-						}
-					}
-				}
-			}
-			unset($p1nodes[$shortest]);
-		}
+        $found = false;
+        while (!$found) {
+            //-- search the node list for the shortest path length
+            $shortest = -1;
+            foreach ($p1nodes as $index => $node) {
+                if ($shortest == -1) {
+                    $shortest = $index;
+                } else {
+                    $node1 = $p1nodes[$shortest];
+                    if ($node1['length'] > $node['length']) {
+                        $shortest = $index;
+                    }
+                }
+            }
+            if ($shortest === -1) {
+                return false;
+            }
+            $node = $p1nodes[$shortest];
+            if ($maxlength == 0 || count($node['path']) <= $maxlength) {
+                $indi = $node['indi'];
+                //-- check all parents and siblings of this node
+                foreach ($indi->getChildFamilies(Auth::PRIV_HIDE) as $family) {
+                    $visited[$family->getXref()] = true;
+                    foreach ($family->getSpouses(Auth::PRIV_HIDE) as $spouse) {
+                        if (!isset($visited[$spouse->getXref()])) {
+                            $node1 = $node;
+                            $node1['length']++;
+                            $node1['path'][]      = $spouse;
+                            $node1['indi']        = $spouse;
+                            $node1['relations'][] = $parent_codes[$spouse->getSex()];
+                            $p1nodes[]            = $node1;
+                            if ($spouse === $person2) {
+                                $found   = true;
+                                $resnode = $node1;
+                            } else {
+                                $visited[$spouse->getXref()] = true;
+                            }
+                        }
+                    }
+                    foreach ($family->getChildren(Auth::PRIV_HIDE) as $child) {
+                        if (!isset($visited[$child->getXref()])) {
+                            $node1 = $node;
+                            $node1['length']++;
+                            $node1['path'][]      = $child;
+                            $node1['indi']        = $child;
+                            $node1['relations'][] = $sibling_codes[$child->getSex()];
+                            $p1nodes[]            = $node1;
+                            if ($child === $person2) {
+                                $found   = true;
+                                $resnode = $node1;
+                            } else {
+                                $visited[$child->getXref()] = true;
+                            }
+                        }
+                    }
+                }
+                //-- check all spouses and children of this node
+                foreach ($indi->getSpouseFamilies(Auth::PRIV_HIDE) as $family) {
+                    $visited[$family->getXref()] = true;
+                    foreach ($family->getSpouses(Auth::PRIV_HIDE) as $spouse) {
+                        if (!in_array($spouse->getXref(), $node1) || !isset($visited[$spouse->getXref()])) {
+                            $node1 = $node;
+                            $node1['length']++;
+                            $node1['path'][]      = $spouse;
+                            $node1['indi']        = $spouse;
+                            $node1['relations'][] = $spouse_codes[$spouse->getSex()];
+                            $p1nodes[]            = $node1;
+                            if ($spouse === $person2) {
+                                $found   = true;
+                                $resnode = $node1;
+                            } else {
+                                $visited[$spouse->getXref()] = true;
+                            }
+                        }
+                    }
+                    foreach ($family->getChildren(Auth::PRIV_HIDE) as $child) {
+                        if (!isset($visited[$child->getXref()])) {
+                            $node1 = $node;
+                            $node1['length']++;
+                            $node1['path'][]      = $child;
+                            $node1['indi']        = $child;
+                            $node1['relations'][] = $child_codes[$child->getSex()];
+                            $p1nodes[]            = $node1;
+                            if ($child === $person2) {
+                                $found   = true;
+                                $resnode = $node1;
+                            } else {
+                                $visited[$child->getXref()] = true;
+                            }
+                        }
+                    }
+                }
+            }
+            unset($p1nodes[$shortest]);
+        }
 
-		return $resnode;
-	}
+        return $resnode;
+    }
 
-	/**
-	 * Convert the result of get_relationship() into a relationship name.
-	 *
-	 * @param mixed[][] $nodes
-	 *
-	 * @return string
-	 */
-	public static function getRelationshipName($nodes) {
-		if (!is_array($nodes)) {
-			return '';
-		}
-		$person1 = $nodes['path'][0];
-		$person2 = $nodes['path'][count($nodes['path']) - 1];
-		$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.
-		// brother’s wife & husband’s sister = sister-in-law.
-		//
-		// $path is an array of the 12 possible gedcom family relationships:
-		// mother/father/parent
-		// brother/sister/sibling
-		// husband/wife/spouse
-		// son/daughter/child
-		//
-		// This is always the shortest path, so “father, daughter” is “half-sister”, not “sister”.
-		//
-		// This is very repetitive in English, but necessary in order to handle the
-		// complexities of other languages.
+    /**
+     * Convert the result of get_relationship() into a relationship name.
+     *
+     * @param mixed[][] $nodes
+     *
+     * @return string
+     */
+    public static function getRelationshipName($nodes) {
+        if (!is_array($nodes)) {
+            return '';
+        }
+        $person1 = $nodes['path'][0];
+        $person2 = $nodes['path'][count($nodes['path']) - 1];
+        $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.
+        // brother’s wife & husband’s sister = sister-in-law.
+        //
+        // $path is an array of the 12 possible gedcom family relationships:
+        // mother/father/parent
+        // brother/sister/sibling
+        // husband/wife/spouse
+        // son/daughter/child
+        //
+        // This is always the shortest path, so “father, daughter” is “half-sister”, not “sister”.
+        //
+        // This is very repetitive in English, but necessary in order to handle the
+        // complexities of other languages.
 
-		return self::getRelationshipNameFromPath(
-			implode('', $path),
-			$person1,
-			$person2
-		);
-	}
+        return self::getRelationshipNameFromPath(
+            implode('', $path),
+            $person1,
+            $person2
+        );
+    }
 
-	/**
-	 * Calculate the name of a cousin.
-	 *
-	 * @param int $n
-	 * @param string $sex
-	 *
-	 * @return string
-	 */
-	public static function cousinName($n, $sex) {
-		switch ($sex) {
-		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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			return I18N::translateContext('MALE', '%s × cousin', I18N::number($n));
-			}
-		case 'F':
-			switch ($n) {
-			case  1:
-			return I18N::translateContext('FEMALE', 'first cousin');
-			case  2:
-			return I18N::translateContext('FEMALE', 'second cousin');
-			case  3:
-			return I18N::translateContext('FEMALE', 'third cousin');
-			case  4:
-			return I18N::translateContext('FEMALE', 'fourth cousin');
-			case  5:
-			return I18N::translateContext('FEMALE', 'fifth cousin');
-			case  6:
-			return I18N::translateContext('FEMALE', 'sixth cousin');
-			case  7:
-			return I18N::translateContext('FEMALE', 'seventh cousin');
-			case  8:
-			return I18N::translateContext('FEMALE', 'eighth cousin');
-			case  9:
-			return I18N::translateContext('FEMALE', 'ninth cousin');
-			case 10:
-			return I18N::translateContext('FEMALE', 'tenth cousin');
-			case 11:
-			return I18N::translateContext('FEMALE', 'eleventh cousin');
-			case 12:
-			return I18N::translateContext('FEMALE', 'twelfth cousin');
-			case 13:
-			return I18N::translateContext('FEMALE', 'thirteenth cousin');
-			case 14:
-			return I18N::translateContext('FEMALE', 'fourteenth cousin');
-			case 15:
-			return I18N::translateContext('FEMALE', 'fifteenth cousin');
-			default:
-			return I18N::translateContext('FEMALE', '%s × cousin', I18N::number($n));
-			}
-		default:
-			switch ($n) {
-			case  1:
-			return I18N::translate('first cousin');
-			case  2:
-			return I18N::translate('second cousin');
-			case  3:
-			return I18N::translate('third cousin');
-			case  4:
-			return I18N::translate('fourth cousin');
-			case  5:
-			return I18N::translate('fifth cousin');
-			case  6:
-			return I18N::translate('sixth cousin');
-			case  7:
-			return I18N::translate('seventh cousin');
-			case  8:
-			return I18N::translate('eighth cousin');
-			case  9:
-			return I18N::translate('ninth cousin');
-			case 10:
-			return I18N::translate('tenth cousin');
-			case 11:
-			return I18N::translate('eleventh cousin');
-			case 12:
-			return I18N::translate('twelfth cousin');
-			case 13:
-			return I18N::translate('thirteenth cousin');
-			case 14:
-			return I18N::translate('fourteenth cousin');
-			case 15:
-			return I18N::translate('fifteenth cousin');
-			default:
-			return I18N::translate('%s × cousin', I18N::number($n));
-			}
-		}
-	}
+    /**
+     * Calculate the name of a cousin.
+     *
+     * @param int $n
+     * @param string $sex
+     *
+     * @return string
+     */
+    public static function cousinName($n, $sex) {
+        switch ($sex) {
+        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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            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. */
+            return I18N::translateContext('MALE', '%s × cousin', I18N::number($n));
+            }
+        case 'F':
+            switch ($n) {
+            case  1:
+            return I18N::translateContext('FEMALE', 'first cousin');
+            case  2:
+            return I18N::translateContext('FEMALE', 'second cousin');
+            case  3:
+            return I18N::translateContext('FEMALE', 'third cousin');
+            case  4:
+            return I18N::translateContext('FEMALE', 'fourth cousin');
+            case  5:
+            return I18N::translateContext('FEMALE', 'fifth cousin');
+            case  6:
+            return I18N::translateContext('FEMALE', 'sixth cousin');
+            case  7:
+            return I18N::translateContext('FEMALE', 'seventh cousin');
+            case  8:
+            return I18N::translateContext('FEMALE', 'eighth cousin');
+            case  9:
+            return I18N::translateContext('FEMALE', 'ninth cousin');
+            case 10:
+            return I18N::translateContext('FEMALE', 'tenth cousin');
+            case 11:
+            return I18N::translateContext('FEMALE', 'eleventh cousin');
+            case 12:
+            return I18N::translateContext('FEMALE', 'twelfth cousin');
+            case 13:
+            return I18N::translateContext('FEMALE', 'thirteenth cousin');
+            case 14:
+            return I18N::translateContext('FEMALE', 'fourteenth cousin');
+            case 15:
+            return I18N::translateContext('FEMALE', 'fifteenth cousin');
+            default:
+            return I18N::translateContext('FEMALE', '%s × cousin', I18N::number($n));
+            }
+        default:
+            switch ($n) {
+            case  1:
+            return I18N::translate('first cousin');
+            case  2:
+            return I18N::translate('second cousin');
+            case  3:
+            return I18N::translate('third cousin');
+            case  4:
+            return I18N::translate('fourth cousin');
+            case  5:
+            return I18N::translate('fifth cousin');
+            case  6:
+            return I18N::translate('sixth cousin');
+            case  7:
+            return I18N::translate('seventh cousin');
+            case  8:
+            return I18N::translate('eighth cousin');
+            case  9:
+            return I18N::translate('ninth cousin');
+            case 10:
+            return I18N::translate('tenth cousin');
+            case 11:
+            return I18N::translate('eleventh cousin');
+            case 12:
+            return I18N::translate('twelfth cousin');
+            case 13:
+            return I18N::translate('thirteenth cousin');
+            case 14:
+            return I18N::translate('fourteenth cousin');
+            case 15:
+            return I18N::translate('fifteenth cousin');
+            default:
+            return I18N::translate('%s × cousin', I18N::number($n));
+            }
+        }
+    }
 
-	/**
-	 * A variation on cousin_name(), for constructs such as “sixth great-nephew”
-	 * Currently used only by Spanish relationship names.
-	 *
-	 * @param int $n
-	 * @param string $sex
-	 * @param string $relation
-	 *
-	 * @return string
-	 */
-	public static function cousinName2($n, $sex, $relation) {
-		switch ($sex) {
-		case 'M':
-			switch ($n) {
-			case  1:
-				return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('MALE', 'first %s', $relation);
-			case  2:
-				return I18N::translateContext('MALE', 'second %s', $relation);
-			case  3:
-				return I18N::translateContext('MALE', 'third %s', $relation);
-			case  4:
-				return I18N::translateContext('MALE', 'fourth %s', $relation);
-			case  5:
-				return I18N::translateContext('MALE', 'fifth %s', $relation);
-			default:
-				return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('MALE', '%1$s × %2$s', I18N::number($n), $relation);
-			}
-		case 'F':
-			switch ($n) {
-			case  1:
-				return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('FEMALE', 'first %s', $relation);
-			case  2:
-				return I18N::translateContext('FEMALE', 'second %s', $relation);
-			case  3:
-				return I18N::translateContext('FEMALE', 'third %s', $relation);
-			case  4:
-				return I18N::translateContext('FEMALE', 'fourth %s', $relation);
-			case  5:
-				return I18N::translateContext('FEMALE', 'fifth %s', $relation);
-			default: // I18N: A Spanish relationship name, such as third great-nephew
-				return I18N::translateContext('FEMALE', '%1$s × %2$s', I18N::number($n), $relation);
-			}
-		default:
-			switch ($n) {
-			case  1:
-				return /* I18N: A Spanish relationship name, such as first great-nephew */ I18N::translate('first %s', $relation);
-			case  2:
-				return /* I18N: A Spanish relationship name, such as second great-nephew */ I18N::translate('second %s', $relation);
-			case  3:
-				return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translate('third %s', $relation);
-			case  4:
-				return /* I18N: A Spanish relationship name, such as fourth great-nephew */ I18N::translate('fourth %s', $relation);
-			case  5:
-				return /* I18N: A Spanish relationship name, such as fifth great-nephew */ I18N::translate('fifth %s', $relation);
-			default:
-				return /* I18N: A Spanish relationship name, such as 7th great-nephew */ I18N::translate('%1$s × %2$s', I18N::number($n), $relation);
-			}
-		}
-	}
+    /**
+     * A variation on cousin_name(), for constructs such as “sixth great-nephew”
+     * Currently used only by Spanish relationship names.
+     *
+     * @param int $n
+     * @param string $sex
+     * @param string $relation
+     *
+     * @return string
+     */
+    public static function cousinName2($n, $sex, $relation) {
+        switch ($sex) {
+        case 'M':
+            switch ($n) {
+            case  1:
+                return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('MALE', 'first %s', $relation);
+            case  2:
+                return I18N::translateContext('MALE', 'second %s', $relation);
+            case  3:
+                return I18N::translateContext('MALE', 'third %s', $relation);
+            case  4:
+                return I18N::translateContext('MALE', 'fourth %s', $relation);
+            case  5:
+                return I18N::translateContext('MALE', 'fifth %s', $relation);
+            default:
+                return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('MALE', '%1$s × %2$s', I18N::number($n), $relation);
+            }
+        case 'F':
+            switch ($n) {
+            case  1:
+                return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('FEMALE', 'first %s', $relation);
+            case  2:
+                return I18N::translateContext('FEMALE', 'second %s', $relation);
+            case  3:
+                return I18N::translateContext('FEMALE', 'third %s', $relation);
+            case  4:
+                return I18N::translateContext('FEMALE', 'fourth %s', $relation);
+            case  5:
+                return I18N::translateContext('FEMALE', 'fifth %s', $relation);
+            default: // I18N: A Spanish relationship name, such as third great-nephew
+                return I18N::translateContext('FEMALE', '%1$s × %2$s', I18N::number($n), $relation);
+            }
+        default:
+            switch ($n) {
+            case  1:
+                return /* I18N: A Spanish relationship name, such as first great-nephew */ I18N::translate('first %s', $relation);
+            case  2:
+                return /* I18N: A Spanish relationship name, such as second great-nephew */ I18N::translate('second %s', $relation);
+            case  3:
+                return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translate('third %s', $relation);
+            case  4:
+                return /* I18N: A Spanish relationship name, such as fourth great-nephew */ I18N::translate('fourth %s', $relation);
+            case  5:
+                return /* I18N: A Spanish relationship name, such as fifth great-nephew */ I18N::translate('fifth %s', $relation);
+            default:
+                return /* I18N: A Spanish relationship name, such as 7th great-nephew */ I18N::translate('%1$s × %2$s', I18N::number($n), $relation);
+            }
+        }
+    }
 
-	/** @var string[] Cache for generic relationships (key stores the path, and value represents the relationship name) */
-	protected static $relationshipsCache = array();
+    /** @var string[] Cache for generic relationships (key stores the path, and value represents the relationship name) */
+    protected static $relationshipsCache = array();
 
-	/**
-	 * Convert a relationship path into a relationship name.
-	 *
-	 * @param string $path
-	 * @param Individual $person1
-	 * @param Individual $person2
-	 *
-	 * @return string
-	 */
-	public static function getRelationshipNameFromPath($path, Individual $person1 = null, Individual $person2 = null) {
-		if (!preg_match('/^(mot|fat|par|hus|wif|spo|son|dau|chi|bro|sis|sib)*$/', $path)) {
-			// 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
-		// translation for a man’s (relative) is different from a woman’s (relative),
-		// due to inflection.
-		$sex1 = $person1 ? $person1->getSex() : 'U';
+    /**
+     * Convert a relationship path into a relationship name.
+     *
+     * @param string $path
+     * @param Individual $person1
+     * @param Individual $person2
+     *
+     * @return string
+     */
+    public static function getRelationshipNameFromPath($path, Individual $person1 = null, Individual $person2 = null) {
+        if (!preg_match('/^(mot|fat|par|hus|wif|spo|son|dau|chi|bro|sis|sib)*$/', $path)) {
+            // 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
+        // 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
-		if (preg_match('/(fat|hus|son|bro)$/', $path)) {
-			$sex2 = 'M';
-		} elseif (preg_match('/(mot|wif|dau|sis)$/', $path)) {
-			$sex2 = 'F';
-		} else {
-			$sex2 = 'U';
-		}
+        // The sex of the last person in the relationship determines the name in
+        // 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)) {
+            $sex2 = 'F';
+        } else {
+            $sex2 = 'U';
+        }
 
-		switch ($path) {
-		case '':
-			return I18N::translate('self');
-		//  Level One relationships
-		case 'mot':
-			return I18N::translate('mother');
-		case 'fat':
-			return I18N::translate('father');
-		case 'par':
-			return I18N::translate('parent');
-		case 'hus':
-			if ($person1 && $person2) {
-				foreach ($person1->getSpouseFamilies() as $family) {
-					if ($person2 === $family->getSpouse($person1)) {
-						if ($family->getFacts('_NMR')) {
-							if ($family->getFacts(WT_EVENTS_DIV)) {
-								return I18N::translateContext('MALE', 'ex-partner');
-							} else {
-								return I18N::translateContext('MALE', 'partner');
-							}
-						} elseif ($family->getFacts(WT_EVENTS_DIV)) {
-							return I18N::translate('ex-husband');
-						}
-					}
-				}
-			}
+        switch ($path) {
+        case '':
+            return I18N::translate('self');
+        //  Level One relationships
+        case 'mot':
+            return I18N::translate('mother');
+        case 'fat':
+            return I18N::translate('father');
+        case 'par':
+            return I18N::translate('parent');
+        case 'hus':
+            if ($person1 && $person2) {
+                foreach ($person1->getSpouseFamilies() as $family) {
+                    if ($person2 === $family->getSpouse($person1)) {
+                        if ($family->getFacts('_NMR')) {
+                            if ($family->getFacts(WT_EVENTS_DIV)) {
+                                return I18N::translateContext('MALE', 'ex-partner');
+                            } else {
+                                return I18N::translateContext('MALE', 'partner');
+                            }
+                        } elseif ($family->getFacts(WT_EVENTS_DIV)) {
+                            return I18N::translate('ex-husband');
+                        }
+                    }
+                }
+            }
 
-			return I18N::translate('husband');
-		case 'wif':
-			if ($person1 && $person2) {
-				foreach ($person1->getSpouseFamilies() as $family) {
-					if ($person2 === $family->getSpouse($person1)) {
-						if ($family->getFacts('_NMR')) {
-							if ($family->getFacts(WT_EVENTS_DIV)) {
-								return I18N::translateContext('FEMALE', 'ex-partner');
-							} else {
-								return I18N::translateContext('FEMALE', 'partner');
-							}
-						} elseif ($family->getFacts(WT_EVENTS_DIV)) {
-							return I18N::translate('ex-wife');
-						}
-					}
-				}
-			}
+            return I18N::translate('husband');
+        case 'wif':
+            if ($person1 && $person2) {
+                foreach ($person1->getSpouseFamilies() as $family) {
+                    if ($person2 === $family->getSpouse($person1)) {
+                        if ($family->getFacts('_NMR')) {
+                            if ($family->getFacts(WT_EVENTS_DIV)) {
+                                return I18N::translateContext('FEMALE', 'ex-partner');
+                            } else {
+                                return I18N::translateContext('FEMALE', 'partner');
+                            }
+                        } elseif ($family->getFacts(WT_EVENTS_DIV)) {
+                            return I18N::translate('ex-wife');
+                        }
+                    }
+                }
+            }
 
-			return I18N::translate('wife');
-		case 'spo':
-			if ($person1 && $person2) {
-				foreach ($person1->getSpouseFamilies() as $family) {
-					if ($person2 === $family->getSpouse($person1)) {
-						if ($family->getFacts('_NMR')) {
-							if ($family->getFacts(WT_EVENTS_DIV)) {
-								return I18N::translate('ex-partner');
-							} else {
-								return I18N::translate('partner');
-							}
-						} elseif ($family->getFacts(WT_EVENTS_DIV)) {
-							return I18N::translate('ex-spouse');
-						}
-					}
-				}
-			}
+            return I18N::translate('wife');
+        case 'spo':
+            if ($person1 && $person2) {
+                foreach ($person1->getSpouseFamilies() as $family) {
+                    if ($person2 === $family->getSpouse($person1)) {
+                        if ($family->getFacts('_NMR')) {
+                            if ($family->getFacts(WT_EVENTS_DIV)) {
+                                return I18N::translate('ex-partner');
+                            } else {
+                                return I18N::translate('partner');
+                            }
+                        } elseif ($family->getFacts(WT_EVENTS_DIV)) {
+                            return I18N::translate('ex-spouse');
+                        }
+                    }
+                }
+            }
 
-			return I18N::translate('spouse');
-		case 'son':
-			return I18N::translate('son');
-		case 'dau':
-			return I18N::translate('daughter');
-		case 'chi':
-			return I18N::translate('child');
-		case 'bro':
-			if ($person1 && $person2) {
-				$dob1 = $person1->getBirthDate();
-				$dob2 = $person2->getBirthDate();
-				if ($dob1->isOK() && $dob2->isOK()) {
-					if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
-						// Exclude BEF, AFT, etc.
-						return I18N::translate('twin brother');
-					} elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
-						return I18N::translate('younger brother');
-					} elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
-						return I18N::translate('elder brother');
-					}
-				}
-			}
+            return I18N::translate('spouse');
+        case 'son':
+            return I18N::translate('son');
+        case 'dau':
+            return I18N::translate('daughter');
+        case 'chi':
+            return I18N::translate('child');
+        case 'bro':
+            if ($person1 && $person2) {
+                $dob1 = $person1->getBirthDate();
+                $dob2 = $person2->getBirthDate();
+                if ($dob1->isOK() && $dob2->isOK()) {
+                    if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
+                        // Exclude BEF, AFT, etc.
+                        return I18N::translate('twin brother');
+                    } elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
+                        return I18N::translate('younger brother');
+                    } elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
+                        return I18N::translate('elder brother');
+                    }
+                }
+            }
 
-			return I18N::translate('brother');
-		case 'sis':
-			if ($person1 && $person2) {
-				$dob1 = $person1->getBirthDate();
-				$dob2 = $person2->getBirthDate();
-				if ($dob1->isOK() && $dob2->isOK()) {
-					if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
-						// Exclude BEF, AFT, etc.
-						return I18N::translate('twin sister');
-					} elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
-						return I18N::translate('younger sister');
-					} elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
-						return I18N::translate('elder sister');
-					}
-				}
-			}
+            return I18N::translate('brother');
+        case 'sis':
+            if ($person1 && $person2) {
+                $dob1 = $person1->getBirthDate();
+                $dob2 = $person2->getBirthDate();
+                if ($dob1->isOK() && $dob2->isOK()) {
+                    if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
+                        // Exclude BEF, AFT, etc.
+                        return I18N::translate('twin sister');
+                    } elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
+                        return I18N::translate('younger sister');
+                    } elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
+                        return I18N::translate('elder sister');
+                    }
+                }
+            }
 
-			return I18N::translate('sister');
-		case 'sib':
-			if ($person1 && $person2) {
-				$dob1 = $person1->getBirthDate();
-				$dob2 = $person2->getBirthDate();
-				if ($dob1->isOK() && $dob2->isOK()) {
-					if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
-						// Exclude BEF, AFT, etc.
-						return I18N::translate('twin sibling');
-					} elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
-						return I18N::translate('younger sibling');
-					} elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
-						return I18N::translate('elder sibling');
-					}
-				}
-			}
+            return I18N::translate('sister');
+        case 'sib':
+            if ($person1 && $person2) {
+                $dob1 = $person1->getBirthDate();
+                $dob2 = $person2->getBirthDate();
+                if ($dob1->isOK() && $dob2->isOK()) {
+                    if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
+                        // Exclude BEF, AFT, etc.
+                        return I18N::translate('twin sibling');
+                    } elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
+                        return I18N::translate('younger sibling');
+                    } elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
+                        return I18N::translate('elder sibling');
+                    }
+                }
+            }
 
-			return I18N::translate('sibling');
+            return I18N::translate('sibling');
 
-		// Level Two relationships
-		case 'brochi':
-			return I18N::translateContext('brother’s child', 'nephew/niece');
-		case 'brodau':
-			return I18N::translateContext('brother’s daughter', 'niece');
-		case 'broson':
-			return I18N::translateContext('brother’s son', 'nephew');
-		case 'browif':
-			return I18N::translateContext('brother’s wife', 'sister-in-law');
-		case 'chichi':
-			return I18N::translateContext('child’s child', 'grandchild');
-		case 'chidau':
-			return I18N::translateContext('child’s daughter', 'granddaughter');
-		case 'chihus':
-			return I18N::translateContext('child’s husband', 'son-in-law');
-		case 'chison':
-			return I18N::translateContext('child’s son', 'grandson');
-		case 'chispo':
-			return I18N::translateContext('child’s spouse', 'son/daughter-in-law');
-		case 'chiwif':
-			return I18N::translateContext('child’s wife', 'daughter-in-law');
-		case 'dauchi':
-			return I18N::translateContext('daughter’s child', 'grandchild');
-		case 'daudau':
-			return I18N::translateContext('daughter’s daughter', 'granddaughter');
-		case 'dauhus':
-			return I18N::translateContext('daughter’s husband', 'son-in-law');
-		case 'dauson':
-			return I18N::translateContext('daughter’s son', 'grandson');
-		case 'fatbro':
-			return I18N::translateContext('father’s brother', 'uncle');
-		case 'fatchi':
-			return I18N::translateContext('father’s child', 'half-sibling');
-		case 'fatdau':
-			return I18N::translateContext('father’s daughter', 'half-sister');
-		case 'fatfat':
-			return I18N::translateContext('father’s father', 'paternal grandfather');
-		case 'fatmot':
-			return I18N::translateContext('father’s mother', 'paternal grandmother');
-		case 'fatpar':
-			return I18N::translateContext('father’s parent', 'paternal grandparent');
-		case 'fatsib':
-			return I18N::translateContext('father’s sibling', 'aunt/uncle');
-		case 'fatsis':
-			return I18N::translateContext('father’s sister', 'aunt');
-		case 'fatson':
-			return I18N::translateContext('father’s son', 'half-brother');
-		case 'fatwif':
-			return I18N::translateContext('father’s wife', 'step-mother');
-		case 'husbro':
-			return I18N::translateContext('husband’s brother', 'brother-in-law');
-		case 'huschi':
-			return I18N::translateContext('husband’s child', 'step-child');
-		case 'husdau':
-			return I18N::translateContext('husband’s daughter', 'step-daughter');
-		case 'husfat':
-			return I18N::translateContext('husband’s father', 'father-in-law');
-		case 'husmot':
-			return I18N::translateContext('husband’s mother', 'mother-in-law');
-		case 'hussib':
-			return I18N::translateContext('husband’s sibling', 'brother/sister-in-law');
-		case 'hussis':
-			return I18N::translateContext('husband’s sister', 'sister-in-law');
-		case 'husson':
-			return I18N::translateContext('husband’s son', 'step-son');
-		case 'motbro':
-			return I18N::translateContext('mother’s brother', 'uncle');
-		case 'motchi':
-			return I18N::translateContext('mother’s child', 'half-sibling');
-		case 'motdau':
-			return I18N::translateContext('mother’s daughter', 'half-sister');
-		case 'motfat':
-			return I18N::translateContext('mother’s father', 'maternal grandfather');
-		case 'mothus':
-			return I18N::translateContext('mother’s husband', 'step-father');
-		case 'motmot':
-			return I18N::translateContext('mother’s mother', 'maternal grandmother');
-		case 'motpar':
-			return I18N::translateContext('mother’s parent', 'maternal grandparent');
-		case 'motsib':
-			return I18N::translateContext('mother’s sibling', 'aunt/uncle');
-		case 'motsis':
-			return I18N::translateContext('mother’s sister', 'aunt');
-		case 'motson':
-			return I18N::translateContext('mother’s son', 'half-brother');
-		case 'parbro':
-			return I18N::translateContext('parent’s brother', 'uncle');
-		case 'parchi':
-			return I18N::translateContext('parent’s child', 'half-sibling');
-		case 'pardau':
-			return I18N::translateContext('parent’s daughter', 'half-sister');
-		case 'parfat':
-			return I18N::translateContext('parent’s father', 'grandfather');
-		case 'parmot':
-			return I18N::translateContext('parent’s mother', 'grandmother');
-		case 'parpar':
-			return I18N::translateContext('parent’s parent', 'grandparent');
-		case 'parsib':
-			return I18N::translateContext('parent’s sibling', 'aunt/uncle');
-		case 'parsis':
-			return I18N::translateContext('parent’s sister', 'aunt');
-		case 'parson':
-			return I18N::translateContext('parent’s son', 'half-brother');
-		case 'parspo':
-			return I18N::translateContext('parent’s spouse', 'step-parent');
-		case 'sibchi':
-			return I18N::translateContext('sibling’s child', 'nephew/niece');
-		case 'sibdau':
-			return I18N::translateContext('sibling’s daughter', 'niece');
-		case 'sibson':
-			return I18N::translateContext('sibling’s son', 'nephew');
-		case 'sibspo':
-			return I18N::translateContext('sibling’s spouse', 'brother/sister-in-law');
-		case 'sischi':
-			return I18N::translateContext('sister’s child', 'nephew/niece');
-		case 'sisdau':
-			return I18N::translateContext('sister’s daughter', 'niece');
-		case 'sishus':
-			return I18N::translateContext('sister’s husband', 'brother-in-law');
-		case 'sisson':
-			return I18N::translateContext('sister’s son', 'nephew');
-		case 'sonchi':
-			return I18N::translateContext('son’s child', 'grandchild');
-		case 'sondau':
-			return I18N::translateContext('son’s daughter', 'granddaughter');
-		case 'sonson':
-			return I18N::translateContext('son’s son', 'grandson');
-		case 'sonwif':
-			return I18N::translateContext('son’s wife', 'daughter-in-law');
-		case 'spobro':
-			return I18N::translateContext('spouse’s brother', 'brother-in-law');
-		case 'spochi':
-			return I18N::translateContext('spouse’s child', 'step-child');
-		case 'spodau':
-			return I18N::translateContext('spouse’s daughter', 'step-daughter');
-		case 'spofat':
-			return I18N::translateContext('spouse’s father', 'father-in-law');
-		case 'spomot':
-			return I18N::translateContext('spouse’s mother', 'mother-in-law');
-		case 'sposis':
-			return I18N::translateContext('spouse’s sister', 'sister-in-law');
-		case 'sposon':
-			return I18N::translateContext('spouse’s son', 'step-son');
-		case 'spopar':
-			return I18N::translateContext('spouse’s parent', 'mother/father-in-law');
-		case 'sposib':
-			return I18N::translateContext('spouse’s sibling', 'brother/sister-in-law');
-		case 'wifbro':
-			return I18N::translateContext('wife’s brother', 'brother-in-law');
-		case 'wifchi':
-			return I18N::translateContext('wife’s child', 'step-child');
-		case 'wifdau':
-			return I18N::translateContext('wife’s daughter', 'step-daughter');
-		case 'wiffat':
-			return I18N::translateContext('wife’s father', 'father-in-law');
-		case 'wifmot':
-			return I18N::translateContext('wife’s mother', 'mother-in-law');
-		case 'wifsib':
-			return I18N::translateContext('wife’s sibling', 'brother/sister-in-law');
-		case 'wifsis':
-			return I18N::translateContext('wife’s sister', 'sister-in-law');
-		case 'wifson':
-			return I18N::translateContext('wife’s son', 'step-son');
+        // Level Two relationships
+        case 'brochi':
+            return I18N::translateContext('brother’s child', 'nephew/niece');
+        case 'brodau':
+            return I18N::translateContext('brother’s daughter', 'niece');
+        case 'broson':
+            return I18N::translateContext('brother’s son', 'nephew');
+        case 'browif':
+            return I18N::translateContext('brother’s wife', 'sister-in-law');
+        case 'chichi':
+            return I18N::translateContext('child’s child', 'grandchild');
+        case 'chidau':
+            return I18N::translateContext('child’s daughter', 'granddaughter');
+        case 'chihus':
+            return I18N::translateContext('child’s husband', 'son-in-law');
+        case 'chison':
+            return I18N::translateContext('child’s son', 'grandson');
+        case 'chispo':
+            return I18N::translateContext('child’s spouse', 'son/daughter-in-law');
+        case 'chiwif':
+            return I18N::translateContext('child’s wife', 'daughter-in-law');
+        case 'dauchi':
+            return I18N::translateContext('daughter’s child', 'grandchild');
+        case 'daudau':
+            return I18N::translateContext('daughter’s daughter', 'granddaughter');
+        case 'dauhus':
+            return I18N::translateContext('daughter’s husband', 'son-in-law');
+        case 'dauson':
+            return I18N::translateContext('daughter’s son', 'grandson');
+        case 'fatbro':
+            return I18N::translateContext('father’s brother', 'uncle');
+        case 'fatchi':
+            return I18N::translateContext('father’s child', 'half-sibling');
+        case 'fatdau':
+            return I18N::translateContext('father’s daughter', 'half-sister');
+        case 'fatfat':
+            return I18N::translateContext('father’s father', 'paternal grandfather');
+        case 'fatmot':
+            return I18N::translateContext('father’s mother', 'paternal grandmother');
+        case 'fatpar':
+            return I18N::translateContext('father’s parent', 'paternal grandparent');
+        case 'fatsib':
+            return I18N::translateContext('father’s sibling', 'aunt/uncle');
+        case 'fatsis':
+            return I18N::translateContext('father’s sister', 'aunt');
+        case 'fatson':
+            return I18N::translateContext('father’s son', 'half-brother');
+        case 'fatwif':
+            return I18N::translateContext('father’s wife', 'step-mother');
+        case 'husbro':
+            return I18N::translateContext('husband’s brother', 'brother-in-law');
+        case 'huschi':
+            return I18N::translateContext('husband’s child', 'step-child');
+        case 'husdau':
+            return I18N::translateContext('husband’s daughter', 'step-daughter');
+        case 'husfat':
+            return I18N::translateContext('husband’s father', 'father-in-law');
+        case 'husmot':
+            return I18N::translateContext('husband’s mother', 'mother-in-law');
+        case 'hussib':
+            return I18N::translateContext('husband’s sibling', 'brother/sister-in-law');
+        case 'hussis':
+            return I18N::translateContext('husband’s sister', 'sister-in-law');
+        case 'husson':
+            return I18N::translateContext('husband’s son', 'step-son');
+        case 'motbro':
+            return I18N::translateContext('mother’s brother', 'uncle');
+        case 'motchi':
+            return I18N::translateContext('mother’s child', 'half-sibling');
+        case 'motdau':
+            return I18N::translateContext('mother’s daughter', 'half-sister');
+        case 'motfat':
+            return I18N::translateContext('mother’s father', 'maternal grandfather');
+        case 'mothus':
+            return I18N::translateContext('mother’s husband', 'step-father');
+        case 'motmot':
+            return I18N::translateContext('mother’s mother', 'maternal grandmother');
+        case 'motpar':
+            return I18N::translateContext('mother’s parent', 'maternal grandparent');
+        case 'motsib':
+            return I18N::translateContext('mother’s sibling', 'aunt/uncle');
+        case 'motsis':
+            return I18N::translateContext('mother’s sister', 'aunt');
+        case 'motson':
+            return I18N::translateContext('mother’s son', 'half-brother');
+        case 'parbro':
+            return I18N::translateContext('parent’s brother', 'uncle');
+        case 'parchi':
+            return I18N::translateContext('parent’s child', 'half-sibling');
+        case 'pardau':
+            return I18N::translateContext('parent’s daughter', 'half-sister');
+        case 'parfat':
+            return I18N::translateContext('parent’s father', 'grandfather');
+        case 'parmot':
+            return I18N::translateContext('parent’s mother', 'grandmother');
+        case 'parpar':
+            return I18N::translateContext('parent’s parent', 'grandparent');
+        case 'parsib':
+            return I18N::translateContext('parent’s sibling', 'aunt/uncle');
+        case 'parsis':
+            return I18N::translateContext('parent’s sister', 'aunt');
+        case 'parson':
+            return I18N::translateContext('parent’s son', 'half-brother');
+        case 'parspo':
+            return I18N::translateContext('parent’s spouse', 'step-parent');
+        case 'sibchi':
+            return I18N::translateContext('sibling’s child', 'nephew/niece');
+        case 'sibdau':
+            return I18N::translateContext('sibling’s daughter', 'niece');
+        case 'sibson':
+            return I18N::translateContext('sibling’s son', 'nephew');
+        case 'sibspo':
+            return I18N::translateContext('sibling’s spouse', 'brother/sister-in-law');
+        case 'sischi':
+            return I18N::translateContext('sister’s child', 'nephew/niece');
+        case 'sisdau':
+            return I18N::translateContext('sister’s daughter', 'niece');
+        case 'sishus':
+            return I18N::translateContext('sister’s husband', 'brother-in-law');
+        case 'sisson':
+            return I18N::translateContext('sister’s son', 'nephew');
+        case 'sonchi':
+            return I18N::translateContext('son’s child', 'grandchild');
+        case 'sondau':
+            return I18N::translateContext('son’s daughter', 'granddaughter');
+        case 'sonson':
+            return I18N::translateContext('son’s son', 'grandson');
+        case 'sonwif':
+            return I18N::translateContext('son’s wife', 'daughter-in-law');
+        case 'spobro':
+            return I18N::translateContext('spouse’s brother', 'brother-in-law');
+        case 'spochi':
+            return I18N::translateContext('spouse’s child', 'step-child');
+        case 'spodau':
+            return I18N::translateContext('spouse’s daughter', 'step-daughter');
+        case 'spofat':
+            return I18N::translateContext('spouse’s father', 'father-in-law');
+        case 'spomot':
+            return I18N::translateContext('spouse’s mother', 'mother-in-law');
+        case 'sposis':
+            return I18N::translateContext('spouse’s sister', 'sister-in-law');
+        case 'sposon':
+            return I18N::translateContext('spouse’s son', 'step-son');
+        case 'spopar':
+            return I18N::translateContext('spouse’s parent', 'mother/father-in-law');
+        case 'sposib':
+            return I18N::translateContext('spouse’s sibling', 'brother/sister-in-law');
+        case 'wifbro':
+            return I18N::translateContext('wife’s brother', 'brother-in-law');
+        case 'wifchi':
+            return I18N::translateContext('wife’s child', 'step-child');
+        case 'wifdau':
+            return I18N::translateContext('wife’s daughter', 'step-daughter');
+        case 'wiffat':
+            return I18N::translateContext('wife’s father', 'father-in-law');
+        case 'wifmot':
+            return I18N::translateContext('wife’s mother', 'mother-in-law');
+        case 'wifsib':
+            return I18N::translateContext('wife’s sibling', 'brother/sister-in-law');
+        case 'wifsis':
+            return I18N::translateContext('wife’s sister', 'sister-in-law');
+        case 'wifson':
+            return I18N::translateContext('wife’s son', 'step-son');
 
-		// Level Three relationships
-		// I have commented out some of the unknown-sex relationships that are unlikely to to occur.
-		// Feel free to add them in, if you think they might be needed
-		case 'brochichi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s child’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s child’s child', 'great-nephew/niece');
-			}
-		case 'brochidau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s child’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s child’s daughter', 'great-niece');
-			}
-		case 'brochison':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s child’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s child’s son', 'great-nephew');
-			}
-		case 'brodauchi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s daughter’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s daughter’s child', 'great-nephew/niece');
-			}
-		case 'brodaudau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s daughter’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s daughter’s daughter', 'great-niece');
-			}
-		case 'brodauhus':
-			return I18N::translateContext('brother’s daughter’s husband', 'nephew-in-law');
-		case 'brodauson':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s daughter’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s daughter’s son', 'great-nephew');
-			}
-		case 'brosonchi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s son’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s son’s child', 'great-nephew/niece');
-			}
-		case 'brosondau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s son’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s son’s daughter', 'great-niece');
-			}
-		case 'brosonson':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s son’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s son’s son', 'great-nephew');
-			}
-		case 'brosonwif':
-			return I18N::translateContext('brother’s son’s wife', 'niece-in-law');
-		case 'browifbro':
-			return I18N::translateContext('brother’s wife’s brother', 'brother-in-law');
-		case 'browifsib':
-			return I18N::translateContext('brother’s wife’s sibling', 'brother/sister-in-law');
-		case 'browifsis':
-			return I18N::translateContext('brother’s wife’s sister', 'sister-in-law');
-		case 'chichichi':
-			return I18N::translateContext('child’s child’s child', 'great-grandchild');
-		case 'chichidau':
-			return I18N::translateContext('child’s child’s daughter', 'great-granddaughter');
-		case 'chichison':
-			return I18N::translateContext('child’s child’s son', 'great-grandson');
-		case 'chidauchi':
-			return I18N::translateContext('child’s daughter’s child', 'great-grandchild');
-		case 'chidaudau':
-			return I18N::translateContext('child’s daughter’s daughter', 'great-granddaughter');
-		case 'chidauhus':
-			return I18N::translateContext('child’s daughter’s husband', 'granddaughter’s husband');
-		case 'chidauson':
-			return I18N::translateContext('child’s daughter’s son', 'great-grandson');
-		case 'chisonchi':
-			return I18N::translateContext('child’s son’s child', 'great-grandchild');
-		case 'chisondau':
-			return I18N::translateContext('child’s son’s daughter', 'great-granddaughter');
-		case 'chisonson':
-			return I18N::translateContext('child’s son’s son', 'great-grandson');
-		case 'chisonwif':
-			return I18N::translateContext('child’s son’s wife', 'grandson’s wife');
-		case 'dauchichi':
-			return I18N::translateContext('daughter’s child’s child', 'great-grandchild');
-		case 'dauchidau':
-			return I18N::translateContext('daughter’s child’s daughter', 'great-granddaughter');
-		case 'dauchison':
-			return I18N::translateContext('daughter’s child’s son', 'great-grandson');
-		case 'daudauchi':
-			return I18N::translateContext('daughter’s daughter’s child', 'great-grandchild');
-		case 'daudaudau':
-			return I18N::translateContext('daughter’s daughter’s daughter', 'great-granddaughter');
-		case 'daudauhus':
-			return I18N::translateContext('daughter’s daughter’s husband', 'granddaughter’s husband');
-		case 'daudauson':
-			return I18N::translateContext('daughter’s daughter’s son', 'great-grandson');
-		case 'dauhusfat':
-			return I18N::translateContext('daughter’s husband’s father', 'son-in-law’s father');
-		case 'dauhusmot':
-			return I18N::translateContext('daughter’s husband’s mother', 'son-in-law’s mother');
-		case 'dauhuspar':
-			return I18N::translateContext('daughter’s husband’s parent', 'son-in-law’s parent');
-		case 'dausonchi':
-			return I18N::translateContext('daughter’s son’s child', 'great-grandchild');
-		case 'dausondau':
-			return I18N::translateContext('daughter’s son’s daughter', 'great-granddaughter');
-		case 'dausonson':
-			return I18N::translateContext('daughter’s son’s son', 'great-grandson');
-		case 'dausonwif':
-			return I18N::translateContext('daughter’s son’s wife', 'grandson’s wife');
-		case 'fatbrochi':
-			return I18N::translateContext('father’s brother’s child', 'first cousin');
-		case 'fatbrodau':
-			return I18N::translateContext('father’s brother’s daughter', 'first cousin');
-		case 'fatbroson':
-			return I18N::translateContext('father’s brother’s son', 'first cousin');
-		case 'fatbrowif':
-			return I18N::translateContext('father’s brother’s wife', 'aunt');
-		case 'fatfatbro':
-			return I18N::translateContext('father’s father’s brother', 'great-uncle');
-		case 'fatfatfat':
-			return I18N::translateContext('father’s father’s father', 'great-grandfather');
-		case 'fatfatmot':
-			return I18N::translateContext('father’s father’s mother', 'great-grandmother');
-		case 'fatfatpar':
-			return I18N::translateContext('father’s father’s parent', 'great-grandparent');
-		case 'fatfatsib':
-			return I18N::translateContext('father’s father’s sibling', 'great-aunt/uncle');
-		case 'fatfatsis':
-			return I18N::translateContext('father’s father’s sister', 'great-aunt');
-		case 'fatmotbro':
-			return I18N::translateContext('father’s mother’s brother', 'great-uncle');
-		case 'fatmotfat':
-			return I18N::translateContext('father’s mother’s father', 'great-grandfather');
-		case 'fatmotmot':
-			return I18N::translateContext('father’s mother’s mother', 'great-grandmother');
-		case 'fatmotpar':
-			return I18N::translateContext('father’s mother’s parent', 'great-grandparent');
-		case 'fatmotsib':
-			return I18N::translateContext('father’s mother’s sibling', 'great-aunt/uncle');
-		case 'fatmotsis':
-			return I18N::translateContext('father’s mother’s sister', 'great-aunt');
-		case 'fatparbro':
-			return I18N::translateContext('father’s parent’s brother', 'great-uncle');
-		case 'fatparfat':
-			return I18N::translateContext('father’s parent’s father', 'great-grandfather');
-		case 'fatparmot':
-			return I18N::translateContext('father’s parent’s mother', 'great-grandmother');
-		case 'fatparpar':
-			return I18N::translateContext('father’s parent’s parent', 'great-grandparent');
-		case 'fatparsib':
-			return I18N::translateContext('father’s parent’s sibling', 'great-aunt/uncle');
-		case 'fatparsis':
-			return I18N::translateContext('father’s parent’s sister', 'great-aunt');
-		case 'fatsischi':
-			return I18N::translateContext('father’s sister’s child', 'first cousin');
-		case 'fatsisdau':
-			return I18N::translateContext('father’s sister’s daughter', 'first cousin');
-		case 'fatsishus':
-			return I18N::translateContext('father’s sister’s husband', 'uncle');
-		case 'fatsisson':
-			return I18N::translateContext('father’s sister’s son', 'first cousin');
-		case 'fatwifchi':
-			return I18N::translateContext('father’s wife’s child', 'step-sibling');
-		case 'fatwifdau':
-			return I18N::translateContext('father’s wife’s daughter', 'step-sister');
-		case 'fatwifson':
-			return I18N::translateContext('father’s wife’s son', 'step-brother');
-		case 'husbrowif':
-			return I18N::translateContext('husband’s brother’s wife', 'sister-in-law');
-		case 'hussishus':
-			return I18N::translateContext('husband’s sister’s husband', 'brother-in-law');
-		case 'motbrochi':
-			return I18N::translateContext('mother’s brother’s child', 'first cousin');
-		case 'motbrodau':
-			return I18N::translateContext('mother’s brother’s daughter', 'first cousin');
-		case 'motbroson':
-			return I18N::translateContext('mother’s brother’s son', 'first cousin');
-		case 'motbrowif':
-			return I18N::translateContext('mother’s brother’s wife', 'aunt');
-		case 'motfatbro':
-			return I18N::translateContext('mother’s father’s brother', 'great-uncle');
-		case 'motfatfat':
-			return I18N::translateContext('mother’s father’s father', 'great-grandfather');
-		case 'motfatmot':
-			return I18N::translateContext('mother’s father’s mother', 'great-grandmother');
-		case 'motfatpar':
-			return I18N::translateContext('mother’s father’s parent', 'great-grandparent');
-		case 'motfatsib':
-			return I18N::translateContext('mother’s father’s sibling', 'great-aunt/uncle');
-		case 'motfatsis':
-			return I18N::translateContext('mother’s father’s sister', 'great-aunt');
-		case 'mothuschi':
-			return I18N::translateContext('mother’s husband’s child', 'step-sibling');
-		case 'mothusdau':
-			return I18N::translateContext('mother’s husband’s daughter', 'step-sister');
-		case 'mothusson':
-			return I18N::translateContext('mother’s husband’s son', 'step-brother');
-		case 'motmotbro':
-			return I18N::translateContext('mother’s mother’s brother', 'great-uncle');
-		case 'motmotfat':
-			return I18N::translateContext('mother’s mother’s father', 'great-grandfather');
-		case 'motmotmot':
-			return I18N::translateContext('mother’s mother’s mother', 'great-grandmother');
-		case 'motmotpar':
-			return I18N::translateContext('mother’s mother’s parent', 'great-grandparent');
-		case 'motmotsib':
-			return I18N::translateContext('mother’s mother’s sibling', 'great-aunt/uncle');
-		case 'motmotsis':
-			return I18N::translateContext('mother’s mother’s sister', 'great-aunt');
-		case 'motparbro':
-			return I18N::translateContext('mother’s parent’s brother', 'great-uncle');
-		case 'motparfat':
-			return I18N::translateContext('mother’s parent’s father', 'great-grandfather');
-		case 'motparmot':
-			return I18N::translateContext('mother’s parent’s mother', 'great-grandmother');
-		case 'motparpar':
-			return I18N::translateContext('mother’s parent’s parent', 'great-grandparent');
-		case 'motparsib':
-			return I18N::translateContext('mother’s parent’s sibling', 'great-aunt/uncle');
-		case 'motparsis':
-			return I18N::translateContext('mother’s parent’s sister', 'great-aunt');
-		case 'motsischi':
-			return I18N::translateContext('mother’s sister’s child', 'first cousin');
-		case 'motsisdau':
-			return I18N::translateContext('mother’s sister’s daughter', 'first cousin');
-		case 'motsishus':
-			return I18N::translateContext('mother’s sister’s husband', 'uncle');
-		case 'motsisson':
-			return I18N::translateContext('mother’s sister’s son', 'first cousin');
-		case 'parbrowif':
-			return I18N::translateContext('parent’s brother’s wife', 'aunt');
-		case 'parfatbro':
-			return I18N::translateContext('parent’s father’s brother', 'great-uncle');
-		case 'parfatfat':
-			return I18N::translateContext('parent’s father’s father', 'great-grandfather');
-		case 'parfatmot':
-			return I18N::translateContext('parent’s father’s mother', 'great-grandmother');
-		case 'parfatpar':
-			return I18N::translateContext('parent’s father’s parent', 'great-grandparent');
-		case 'parfatsib':
-			return I18N::translateContext('parent’s father’s sibling', 'great-aunt/uncle');
-		case 'parfatsis':
-			return I18N::translateContext('parent’s father’s sister', 'great-aunt');
-		case 'parmotbro':
-			return I18N::translateContext('parent’s mother’s brother', 'great-uncle');
-		case 'parmotfat':
-			return I18N::translateContext('parent’s mother’s father', 'great-grandfather');
-		case 'parmotmot':
-			return I18N::translateContext('parent’s mother’s mother', 'great-grandmother');
-		case 'parmotpar':
-			return I18N::translateContext('parent’s mother’s parent', 'great-grandparent');
-		case 'parmotsib':
-			return I18N::translateContext('parent’s mother’s sibling', 'great-aunt/uncle');
-		case 'parmotsis':
-			return I18N::translateContext('parent’s mother’s sister', 'great-aunt');
-		case 'parparbro':
-			return I18N::translateContext('parent’s parent’s brother', 'great-uncle');
-		case 'parparfat':
-			return I18N::translateContext('parent’s parent’s father', 'great-grandfather');
-		case 'parparmot':
-			return I18N::translateContext('parent’s parent’s mother', 'great-grandmother');
-		case 'parparpar':
-			return I18N::translateContext('parent’s parent’s parent', 'great-grandparent');
-		case 'parparsib':
-			return I18N::translateContext('parent’s parent’s sibling', 'great-aunt/uncle');
-		case 'parparsis':
-			return I18N::translateContext('parent’s parent’s sister', 'great-aunt');
-		case 'parsishus':
-			return I18N::translateContext('parent’s sister’s husband', 'uncle');
-		case 'parspochi':
-			return I18N::translateContext('parent’s spouse’s child', 'step-sibling');
-		case 'parspodau':
-			return I18N::translateContext('parent’s spouse’s daughter', 'step-sister');
-		case 'parsposon':
-			return I18N::translateContext('parent’s spouse’s son', 'step-brother');
-		case 'sibchichi':
-			return I18N::translateContext('sibling’s child’s child', 'great-nephew/niece');
-		case 'sibchidau':
-			return I18N::translateContext('sibling’s child’s daughter', 'great-niece');
-		case 'sibchison':
-			return I18N::translateContext('sibling’s child’s son', 'great-nephew');
-		case 'sibdauchi':
-			return I18N::translateContext('sibling’s daughter’s child', 'great-nephew/niece');
-		case 'sibdaudau':
-			return I18N::translateContext('sibling’s daughter’s daughter', 'great-niece');
-		case 'sibdauhus':
-			return I18N::translateContext('sibling’s daughter’s husband', 'nephew-in-law');
-		case 'sibdauson':
-			return I18N::translateContext('sibling’s daughter’s son', 'great-nephew');
-		case 'sibsonchi':
-			return I18N::translateContext('sibling’s son’s child', 'great-nephew/niece');
-		case 'sibsondau':
-			return I18N::translateContext('sibling’s son’s daughter', 'great-niece');
-		case 'sibsonson':
-			return I18N::translateContext('sibling’s son’s son', 'great-nephew');
-		case 'sibsonwif':
-			return I18N::translateContext('sibling’s son’s wife', 'niece-in-law');
-		case 'sischichi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s child’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s child’s child', 'great-nephew/niece');
-			}
-		case 'sischidau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s child’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s child’s daughter', 'great-niece');
-			}
-		case 'sischison':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s child’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s child’s son', 'great-nephew');
-			}
-		case 'sisdauchi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s daughter’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s daughter’s child', 'great-nephew/niece');
-			}
-		case 'sisdaudau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s daughter’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s daughter’s daughter', 'great-niece');
-			}
-		case 'sisdauhus':
-			return I18N::translateContext('sisters’s daughter’s husband', 'nephew-in-law');
-		case 'sisdauson':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s daughter’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s daughter’s son', 'great-nephew');
-			}
-		case 'sishusbro':
-			return I18N::translateContext('sister’s husband’s brother', 'brother-in-law');
-		case 'sishussib':
-			return I18N::translateContext('sister’s husband’s sibling', 'brother/sister-in-law');
-		case 'sishussis':
-			return I18N::translateContext('sister’s husband’s sister', 'sister-in-law');
-		case 'sissonchi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s son’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s son’s child', 'great-nephew/niece');
-			}
-		case 'sissondau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s son’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s son’s daughter', 'great-niece');
-			}
-		case 'sissonson':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s son’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s son’s son', 'great-nephew');
-			}
-		case 'sissonwif':
-			return I18N::translateContext('sisters’s son’s wife', 'niece-in-law');
-		case 'sonchichi':
-			return I18N::translateContext('son’s child’s child', 'great-grandchild');
-		case 'sonchidau':
-			return I18N::translateContext('son’s child’s daughter', 'great-granddaughter');
-		case 'sonchison':
-			return I18N::translateContext('son’s child’s son', 'great-grandson');
-		case 'sondauchi':
-			return I18N::translateContext('son’s daughter’s child', 'great-grandchild');
-		case 'sondaudau':
-			return I18N::translateContext('son’s daughter’s daughter', 'great-granddaughter');
-		case 'sondauhus':
-			return I18N::translateContext('son’s daughter’s husband', 'granddaughter’s husband');
-		case 'sondauson':
-			return I18N::translateContext('son’s daughter’s son', 'great-grandson');
-		case 'sonsonchi':
-			return I18N::translateContext('son’s son’s child', 'great-grandchild');
-		case 'sonsondau':
-			return I18N::translateContext('son’s son’s daughter', 'great-granddaughter');
-		case 'sonsonson':
-			return I18N::translateContext('son’s son’s son', 'great-grandson');
-		case 'sonsonwif':
-			return I18N::translateContext('son’s son’s wife', 'grandson’s wife');
-		case 'sonwiffat':
-			return I18N::translateContext('son’s wife’s father', 'daughter-in-law’s father');
-		case 'sonwifmot':
-			return I18N::translateContext('son’s wife’s mother', 'daughter-in-law’s mother');
-		case 'sonwifpar':
-			return I18N::translateContext('son’s wife’s parent', 'daughter-in-law’s parent');
-		case 'wifbrowif':
-			return I18N::translateContext('wife’s brother’s wife', 'sister-in-law');
-		case 'wifsishus':
-			return I18N::translateContext('wife’s sister’s husband', 'brother-in-law');
+        // Level Three relationships
+        // I have commented out some of the unknown-sex relationships that are unlikely to to occur.
+        // Feel free to add them in, if you think they might be needed
+        case 'brochichi':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s child’s child', 'great-nephew/niece');
+            } else {
+                return I18N::translateContext('(a woman’s) brother’s child’s child', 'great-nephew/niece');
+            }
+        case 'brochidau':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s child’s daughter', 'great-niece');
+            } else {
+                return I18N::translateContext('(a woman’s) brother’s child’s daughter', 'great-niece');
+            }
+        case 'brochison':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s child’s son', 'great-nephew');
+            } else {
+                return I18N::translateContext('(a woman’s) brother’s child’s son', 'great-nephew');
+            }
+        case 'brodauchi':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s daughter’s child', 'great-nephew/niece');
+            } else {
+                return I18N::translateContext('(a woman’s) brother’s daughter’s child', 'great-nephew/niece');
+            }
+        case 'brodaudau':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s daughter’s daughter', 'great-niece');
+            } else {
+                return I18N::translateContext('(a woman’s) brother’s daughter’s daughter', 'great-niece');
+            }
+        case 'brodauhus':
+            return I18N::translateContext('brother’s daughter’s husband', 'nephew-in-law');
+        case 'brodauson':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s daughter’s son', 'great-nephew');
+            } else {
+                return I18N::translateContext('(a woman’s) brother’s daughter’s son', 'great-nephew');
+            }
+        case 'brosonchi':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s son’s child', 'great-nephew/niece');
+            } else {
+                return I18N::translateContext('(a woman’s) brother’s son’s child', 'great-nephew/niece');
+            }
+        case 'brosondau':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s son’s daughter', 'great-niece');
+            } else {
+                return I18N::translateContext('(a woman’s) brother’s son’s daughter', 'great-niece');
+            }
+        case 'brosonson':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s son’s son', 'great-nephew');
+            } else {
+                return I18N::translateContext('(a woman’s) brother’s son’s son', 'great-nephew');
+            }
+        case 'brosonwif':
+            return I18N::translateContext('brother’s son’s wife', 'niece-in-law');
+        case 'browifbro':
+            return I18N::translateContext('brother’s wife’s brother', 'brother-in-law');
+        case 'browifsib':
+            return I18N::translateContext('brother’s wife’s sibling', 'brother/sister-in-law');
+        case 'browifsis':
+            return I18N::translateContext('brother’s wife’s sister', 'sister-in-law');
+        case 'chichichi':
+            return I18N::translateContext('child’s child’s child', 'great-grandchild');
+        case 'chichidau':
+            return I18N::translateContext('child’s child’s daughter', 'great-granddaughter');
+        case 'chichison':
+            return I18N::translateContext('child’s child’s son', 'great-grandson');
+        case 'chidauchi':
+            return I18N::translateContext('child’s daughter’s child', 'great-grandchild');
+        case 'chidaudau':
+            return I18N::translateContext('child’s daughter’s daughter', 'great-granddaughter');
+        case 'chidauhus':
+            return I18N::translateContext('child’s daughter’s husband', 'granddaughter’s husband');
+        case 'chidauson':
+            return I18N::translateContext('child’s daughter’s son', 'great-grandson');
+        case 'chisonchi':
+            return I18N::translateContext('child’s son’s child', 'great-grandchild');
+        case 'chisondau':
+            return I18N::translateContext('child’s son’s daughter', 'great-granddaughter');
+        case 'chisonson':
+            return I18N::translateContext('child’s son’s son', 'great-grandson');
+        case 'chisonwif':
+            return I18N::translateContext('child’s son’s wife', 'grandson’s wife');
+        case 'dauchichi':
+            return I18N::translateContext('daughter’s child’s child', 'great-grandchild');
+        case 'dauchidau':
+            return I18N::translateContext('daughter’s child’s daughter', 'great-granddaughter');
+        case 'dauchison':
+            return I18N::translateContext('daughter’s child’s son', 'great-grandson');
+        case 'daudauchi':
+            return I18N::translateContext('daughter’s daughter’s child', 'great-grandchild');
+        case 'daudaudau':
+            return I18N::translateContext('daughter’s daughter’s daughter', 'great-granddaughter');
+        case 'daudauhus':
+            return I18N::translateContext('daughter’s daughter’s husband', 'granddaughter’s husband');
+        case 'daudauson':
+            return I18N::translateContext('daughter’s daughter’s son', 'great-grandson');
+        case 'dauhusfat':
+            return I18N::translateContext('daughter’s husband’s father', 'son-in-law’s father');
+        case 'dauhusmot':
+            return I18N::translateContext('daughter’s husband’s mother', 'son-in-law’s mother');
+        case 'dauhuspar':
+            return I18N::translateContext('daughter’s husband’s parent', 'son-in-law’s parent');
+        case 'dausonchi':
+            return I18N::translateContext('daughter’s son’s child', 'great-grandchild');
+        case 'dausondau':
+            return I18N::translateContext('daughter’s son’s daughter', 'great-granddaughter');
+        case 'dausonson':
+            return I18N::translateContext('daughter’s son’s son', 'great-grandson');
+        case 'dausonwif':
+            return I18N::translateContext('daughter’s son’s wife', 'grandson’s wife');
+        case 'fatbrochi':
+            return I18N::translateContext('father’s brother’s child', 'first cousin');
+        case 'fatbrodau':
+            return I18N::translateContext('father’s brother’s daughter', 'first cousin');
+        case 'fatbroson':
+            return I18N::translateContext('father’s brother’s son', 'first cousin');
+        case 'fatbrowif':
+            return I18N::translateContext('father’s brother’s wife', 'aunt');
+        case 'fatfatbro':
+            return I18N::translateContext('father’s father’s brother', 'great-uncle');
+        case 'fatfatfat':
+            return I18N::translateContext('father’s father’s father', 'great-grandfather');
+        case 'fatfatmot':
+            return I18N::translateContext('father’s father’s mother', 'great-grandmother');
+        case 'fatfatpar':
+            return I18N::translateContext('father’s father’s parent', 'great-grandparent');
+        case 'fatfatsib':
+            return I18N::translateContext('father’s father’s sibling', 'great-aunt/uncle');
+        case 'fatfatsis':
+            return I18N::translateContext('father’s father’s sister', 'great-aunt');
+        case 'fatmotbro':
+            return I18N::translateContext('father’s mother’s brother', 'great-uncle');
+        case 'fatmotfat':
+            return I18N::translateContext('father’s mother’s father', 'great-grandfather');
+        case 'fatmotmot':
+            return I18N::translateContext('father’s mother’s mother', 'great-grandmother');
+        case 'fatmotpar':
+            return I18N::translateContext('father’s mother’s parent', 'great-grandparent');
+        case 'fatmotsib':
+            return I18N::translateContext('father’s mother’s sibling', 'great-aunt/uncle');
+        case 'fatmotsis':
+            return I18N::translateContext('father’s mother’s sister', 'great-aunt');
+        case 'fatparbro':
+            return I18N::translateContext('father’s parent’s brother', 'great-uncle');
+        case 'fatparfat':
+            return I18N::translateContext('father’s parent’s father', 'great-grandfather');
+        case 'fatparmot':
+            return I18N::translateContext('father’s parent’s mother', 'great-grandmother');
+        case 'fatparpar':
+            return I18N::translateContext('father’s parent’s parent', 'great-grandparent');
+        case 'fatparsib':
+            return I18N::translateContext('father’s parent’s sibling', 'great-aunt/uncle');
+        case 'fatparsis':
+            return I18N::translateContext('father’s parent’s sister', 'great-aunt');
+        case 'fatsischi':
+            return I18N::translateContext('father’s sister’s child', 'first cousin');
+        case 'fatsisdau':
+            return I18N::translateContext('father’s sister’s daughter', 'first cousin');
+        case 'fatsishus':
+            return I18N::translateContext('father’s sister’s husband', 'uncle');
+        case 'fatsisson':
+            return I18N::translateContext('father’s sister’s son', 'first cousin');
+        case 'fatwifchi':
+            return I18N::translateContext('father’s wife’s child', 'step-sibling');
+        case 'fatwifdau':
+            return I18N::translateContext('father’s wife’s daughter', 'step-sister');
+        case 'fatwifson':
+            return I18N::translateContext('father’s wife’s son', 'step-brother');
+        case 'husbrowif':
+            return I18N::translateContext('husband’s brother’s wife', 'sister-in-law');
+        case 'hussishus':
+            return I18N::translateContext('husband’s sister’s husband', 'brother-in-law');
+        case 'motbrochi':
+            return I18N::translateContext('mother’s brother’s child', 'first cousin');
+        case 'motbrodau':
+            return I18N::translateContext('mother’s brother’s daughter', 'first cousin');
+        case 'motbroson':
+            return I18N::translateContext('mother’s brother’s son', 'first cousin');
+        case 'motbrowif':
+            return I18N::translateContext('mother’s brother’s wife', 'aunt');
+        case 'motfatbro':
+            return I18N::translateContext('mother’s father’s brother', 'great-uncle');
+        case 'motfatfat':
+            return I18N::translateContext('mother’s father’s father', 'great-grandfather');
+        case 'motfatmot':
+            return I18N::translateContext('mother’s father’s mother', 'great-grandmother');
+        case 'motfatpar':
+            return I18N::translateContext('mother’s father’s parent', 'great-grandparent');
+        case 'motfatsib':
+            return I18N::translateContext('mother’s father’s sibling', 'great-aunt/uncle');
+        case 'motfatsis':
+            return I18N::translateContext('mother’s father’s sister', 'great-aunt');
+        case 'mothuschi':
+            return I18N::translateContext('mother’s husband’s child', 'step-sibling');
+        case 'mothusdau':
+            return I18N::translateContext('mother’s husband’s daughter', 'step-sister');
+        case 'mothusson':
+            return I18N::translateContext('mother’s husband’s son', 'step-brother');
+        case 'motmotbro':
+            return I18N::translateContext('mother’s mother’s brother', 'great-uncle');
+        case 'motmotfat':
+            return I18N::translateContext('mother’s mother’s father', 'great-grandfather');
+        case 'motmotmot':
+            return I18N::translateContext('mother’s mother’s mother', 'great-grandmother');
+        case 'motmotpar':
+            return I18N::translateContext('mother’s mother’s parent', 'great-grandparent');
+        case 'motmotsib':
+            return I18N::translateContext('mother’s mother’s sibling', 'great-aunt/uncle');
+        case 'motmotsis':
+            return I18N::translateContext('mother’s mother’s sister', 'great-aunt');
+        case 'motparbro':
+            return I18N::translateContext('mother’s parent’s brother', 'great-uncle');
+        case 'motparfat':
+            return I18N::translateContext('mother’s parent’s father', 'great-grandfather');
+        case 'motparmot':
+            return I18N::translateContext('mother’s parent’s mother', 'great-grandmother');
+        case 'motparpar':
+            return I18N::translateContext('mother’s parent’s parent', 'great-grandparent');
+        case 'motparsib':
+            return I18N::translateContext('mother’s parent’s sibling', 'great-aunt/uncle');
+        case 'motparsis':
+            return I18N::translateContext('mother’s parent’s sister', 'great-aunt');
+        case 'motsischi':
+            return I18N::translateContext('mother’s sister’s child', 'first cousin');
+        case 'motsisdau':
+            return I18N::translateContext('mother’s sister’s daughter', 'first cousin');
+        case 'motsishus':
+            return I18N::translateContext('mother’s sister’s husband', 'uncle');
+        case 'motsisson':
+            return I18N::translateContext('mother’s sister’s son', 'first cousin');
+        case 'parbrowif':
+            return I18N::translateContext('parent’s brother’s wife', 'aunt');
+        case 'parfatbro':
+            return I18N::translateContext('parent’s father’s brother', 'great-uncle');
+        case 'parfatfat':
+            return I18N::translateContext('parent’s father’s father', 'great-grandfather');
+        case 'parfatmot':
+            return I18N::translateContext('parent’s father’s mother', 'great-grandmother');
+        case 'parfatpar':
+            return I18N::translateContext('parent’s father’s parent', 'great-grandparent');
+        case 'parfatsib':
+            return I18N::translateContext('parent’s father’s sibling', 'great-aunt/uncle');
+        case 'parfatsis':
+            return I18N::translateContext('parent’s father’s sister', 'great-aunt');
+        case 'parmotbro':
+            return I18N::translateContext('parent’s mother’s brother', 'great-uncle');
+        case 'parmotfat':
+            return I18N::translateContext('parent’s mother’s father', 'great-grandfather');
+        case 'parmotmot':
+            return I18N::translateContext('parent’s mother’s mother', 'great-grandmother');
+        case 'parmotpar':
+            return I18N::translateContext('parent’s mother’s parent', 'great-grandparent');
+        case 'parmotsib':
+            return I18N::translateContext('parent’s mother’s sibling', 'great-aunt/uncle');
+        case 'parmotsis':
+            return I18N::translateContext('parent’s mother’s sister', 'great-aunt');
+        case 'parparbro':
+            return I18N::translateContext('parent’s parent’s brother', 'great-uncle');
+        case 'parparfat':
+            return I18N::translateContext('parent’s parent’s father', 'great-grandfather');
+        case 'parparmot':
+            return I18N::translateContext('parent’s parent’s mother', 'great-grandmother');
+        case 'parparpar':
+            return I18N::translateContext('parent’s parent’s parent', 'great-grandparent');
+        case 'parparsib':
+            return I18N::translateContext('parent’s parent’s sibling', 'great-aunt/uncle');
+        case 'parparsis':
+            return I18N::translateContext('parent’s parent’s sister', 'great-aunt');
+        case 'parsishus':
+            return I18N::translateContext('parent’s sister’s husband', 'uncle');
+        case 'parspochi':
+            return I18N::translateContext('parent’s spouse’s child', 'step-sibling');
+        case 'parspodau':
+            return I18N::translateContext('parent’s spouse’s daughter', 'step-sister');
+        case 'parsposon':
+            return I18N::translateContext('parent’s spouse’s son', 'step-brother');
+        case 'sibchichi':
+            return I18N::translateContext('sibling’s child’s child', 'great-nephew/niece');
+        case 'sibchidau':
+            return I18N::translateContext('sibling’s child’s daughter', 'great-niece');
+        case 'sibchison':
+            return I18N::translateContext('sibling’s child’s son', 'great-nephew');
+        case 'sibdauchi':
+            return I18N::translateContext('sibling’s daughter’s child', 'great-nephew/niece');
+        case 'sibdaudau':
+            return I18N::translateContext('sibling’s daughter’s daughter', 'great-niece');
+        case 'sibdauhus':
+            return I18N::translateContext('sibling’s daughter’s husband', 'nephew-in-law');
+        case 'sibdauson':
+            return I18N::translateContext('sibling’s daughter’s son', 'great-nephew');
+        case 'sibsonchi':
+            return I18N::translateContext('sibling’s son’s child', 'great-nephew/niece');
+        case 'sibsondau':
+            return I18N::translateContext('sibling’s son’s daughter', 'great-niece');
+        case 'sibsonson':
+            return I18N::translateContext('sibling’s son’s son', 'great-nephew');
+        case 'sibsonwif':
+            return I18N::translateContext('sibling’s son’s wife', 'niece-in-law');
+        case 'sischichi':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s child’s child', 'great-nephew/niece');
+            } else {
+                return I18N::translateContext('(a woman’s) sister’s child’s child', 'great-nephew/niece');
+            }
+        case 'sischidau':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s child’s daughter', 'great-niece');
+            } else {
+                return I18N::translateContext('(a woman’s) sister’s child’s daughter', 'great-niece');
+            }
+        case 'sischison':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s child’s son', 'great-nephew');
+            } else {
+                return I18N::translateContext('(a woman’s) sister’s child’s son', 'great-nephew');
+            }
+        case 'sisdauchi':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s daughter’s child', 'great-nephew/niece');
+            } else {
+                return I18N::translateContext('(a woman’s) sister’s daughter’s child', 'great-nephew/niece');
+            }
+        case 'sisdaudau':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s daughter’s daughter', 'great-niece');
+            } else {
+                return I18N::translateContext('(a woman’s) sister’s daughter’s daughter', 'great-niece');
+            }
+        case 'sisdauhus':
+            return I18N::translateContext('sisters’s daughter’s husband', 'nephew-in-law');
+        case 'sisdauson':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s daughter’s son', 'great-nephew');
+            } else {
+                return I18N::translateContext('(a woman’s) sister’s daughter’s son', 'great-nephew');
+            }
+        case 'sishusbro':
+            return I18N::translateContext('sister’s husband’s brother', 'brother-in-law');
+        case 'sishussib':
+            return I18N::translateContext('sister’s husband’s sibling', 'brother/sister-in-law');
+        case 'sishussis':
+            return I18N::translateContext('sister’s husband’s sister', 'sister-in-law');
+        case 'sissonchi':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s son’s child', 'great-nephew/niece');
+            } else {
+                return I18N::translateContext('(a woman’s) sister’s son’s child', 'great-nephew/niece');
+            }
+        case 'sissondau':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s son’s daughter', 'great-niece');
+            } else {
+                return I18N::translateContext('(a woman’s) sister’s son’s daughter', 'great-niece');
+            }
+        case 'sissonson':
+            if ($sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s son’s son', 'great-nephew');
+            } else {
+                return I18N::translateContext('(a woman’s) sister’s son’s son', 'great-nephew');
+            }
+        case 'sissonwif':
+            return I18N::translateContext('sisters’s son’s wife', 'niece-in-law');
+        case 'sonchichi':
+            return I18N::translateContext('son’s child’s child', 'great-grandchild');
+        case 'sonchidau':
+            return I18N::translateContext('son’s child’s daughter', 'great-granddaughter');
+        case 'sonchison':
+            return I18N::translateContext('son’s child’s son', 'great-grandson');
+        case 'sondauchi':
+            return I18N::translateContext('son’s daughter’s child', 'great-grandchild');
+        case 'sondaudau':
+            return I18N::translateContext('son’s daughter’s daughter', 'great-granddaughter');
+        case 'sondauhus':
+            return I18N::translateContext('son’s daughter’s husband', 'granddaughter’s husband');
+        case 'sondauson':
+            return I18N::translateContext('son’s daughter’s son', 'great-grandson');
+        case 'sonsonchi':
+            return I18N::translateContext('son’s son’s child', 'great-grandchild');
+        case 'sonsondau':
+            return I18N::translateContext('son’s son’s daughter', 'great-granddaughter');
+        case 'sonsonson':
+            return I18N::translateContext('son’s son’s son', 'great-grandson');
+        case 'sonsonwif':
+            return I18N::translateContext('son’s son’s wife', 'grandson’s wife');
+        case 'sonwiffat':
+            return I18N::translateContext('son’s wife’s father', 'daughter-in-law’s father');
+        case 'sonwifmot':
+            return I18N::translateContext('son’s wife’s mother', 'daughter-in-law’s mother');
+        case 'sonwifpar':
+            return I18N::translateContext('son’s wife’s parent', 'daughter-in-law’s parent');
+        case 'wifbrowif':
+            return I18N::translateContext('wife’s brother’s wife', 'sister-in-law');
+        case 'wifsishus':
+            return I18N::translateContext('wife’s sister’s husband', 'brother-in-law');
 
-		// Some “special case” level four relationships that have specific names in certain languages
-		case 'fatfatbrowif':
-			return I18N::translateContext('father’s father’s brother’s wife', 'great-aunt');
-		case 'fatfatsibspo':
-			return I18N::translateContext('father’s father’s sibling’s spouse', 'great-aunt/uncle');
-		case 'fatfatsishus':
-			return I18N::translateContext('father’s father’s sister’s husband', 'great-uncle');
-		case 'fatmotbrowif':
-			return I18N::translateContext('father’s mother’s brother’s wife', 'great-aunt');
-		case 'fatmotsibspo':
-			return I18N::translateContext('father’s mother’s sibling’s spouse', 'great-aunt/uncle');
-		case 'fatmotsishus':
-			return I18N::translateContext('father’s mother’s sister’s husband', 'great-uncle');
-		case 'fatparbrowif':
-			return I18N::translateContext('father’s parent’s brother’s wife', 'great-aunt');
-		case 'fatparsibspo':
-			return I18N::translateContext('father’s parent’s sibling’s spouse', 'great-aunt/uncle');
-		case 'fatparsishus':
-			return I18N::translateContext('father’s parent’s sister’s husband', 'great-uncle');
-		case 'motfatbrowif':
-			return I18N::translateContext('mother’s father’s brother’s wife', 'great-aunt');
-		case 'motfatsibspo':
-			return I18N::translateContext('mother’s father’s sibling’s spouse', 'great-aunt/uncle');
-		case 'motfatsishus':
-			return I18N::translateContext('mother’s father’s sister’s husband', 'great-uncle');
-		case 'motmotbrowif':
-			return I18N::translateContext('mother’s mother’s brother’s wife', 'great-aunt');
-		case 'motmotsibspo':
-			return I18N::translateContext('mother’s mother’s sibling’s spouse', 'great-aunt/uncle');
-		case 'motmotsishus':
-			return I18N::translateContext('mother’s mother’s sister’s husband', 'great-uncle');
-		case 'motparbrowif':
-			return I18N::translateContext('mother’s parent’s brother’s wife', 'great-aunt');
-		case 'motparsibspo':
-			return I18N::translateContext('mother’s parent’s sibling’s spouse', 'great-aunt/uncle');
-		case 'motparsishus':
-			return I18N::translateContext('mother’s parent’s sister’s husband', 'great-uncle');
-		case 'parfatbrowif':
-			return I18N::translateContext('parent’s father’s brother’s wife', 'great-aunt');
-		case 'parfatsibspo':
-			return I18N::translateContext('parent’s father’s sibling’s spouse', 'great-aunt/uncle');
-		case 'parfatsishus':
-			return I18N::translateContext('parent’s father’s sister’s husband', 'great-uncle');
-		case 'parmotbrowif':
-			return I18N::translateContext('parent’s mother’s brother’s wife', 'great-aunt');
-		case 'parmotsibspo':
-			return I18N::translateContext('parent’s mother’s sibling’s spouse', 'great-aunt/uncle');
-		case 'parmotsishus':
-			return I18N::translateContext('parent’s mother’s sister’s husband', 'great-uncle');
-		case 'parparbrowif':
-			return I18N::translateContext('parent’s parent’s brother’s wife', 'great-aunt');
-		case 'parparsibspo':
-			return I18N::translateContext('parent’s parent’s sibling’s spouse', 'great-aunt/uncle');
-		case 'parparsishus':
-			return I18N::translateContext('parent’s parent’s sister’s husband', 'great-uncle');
-		case 'fatfatbrodau':
-			return I18N::translateContext('father’s father’s brother’s daughter', 'first cousin once removed ascending');
-		case 'fatfatbroson':
-			return I18N::translateContext('father’s father’s brother’s son', 'first cousin once removed ascending');
-		case 'fatfatbrochi':
-			return I18N::translateContext('father’s father’s brother’s child', 'first cousin once removed ascending');
-		case 'fatfatsisdau':
-			return I18N::translateContext('father’s father’s sister’s daughter', 'first cousin once removed ascending');
-		case 'fatfatsisson':
-			return I18N::translateContext('father’s father’s sister’s son', 'first cousin once removed ascending');
-		case 'fatfatsischi':
-			return I18N::translateContext('father’s father’s sister’s child', 'first cousin once removed ascending');
-		case 'fatmotbrodau':
-			return I18N::translateContext('father’s mother’s brother’s daughter', 'first cousin once removed ascending');
-		case 'fatmotbroson':
-			return I18N::translateContext('father’s mother’s brother’s son', 'first cousin once removed ascending');
-		case 'fatmotbrochi':
-			return I18N::translateContext('father’s mother’s brother’s child', 'first cousin once removed ascending');
-		case 'fatmotsisdau':
-			return I18N::translateContext('father’s mother’s sister’s daughter', 'first cousin once removed ascending');
-		case 'fatmotsisson':
-			return I18N::translateContext('father’s mother’s sister’s son', 'first cousin once removed ascending');
-		case 'fatmotsischi':
-			return I18N::translateContext('father’s mother’s sister’s child', 'first cousin once removed ascending');
-		case 'motfatbrodau':
-			return I18N::translateContext('mother’s father’s brother’s daughter', 'first cousin once removed ascending');
-		case 'motfatbroson':
-			return I18N::translateContext('mother’s father’s brother’s son', 'first cousin once removed ascending');
-		case 'motfatbrochi':
-			return I18N::translateContext('mother’s father’s brother’s child', 'first cousin once removed ascending');
-		case 'motfatsisdau':
-			return I18N::translateContext('mother’s father’s sister’s daughter', 'first cousin once removed ascending');
-		case 'motfatsisson':
-			return I18N::translateContext('mother’s father’s sister’s son', 'first cousin once removed ascending');
-		case 'motfatsischi':
-			return I18N::translateContext('mother’s father’s sister’s child', 'first cousin once removed ascending');
-		case 'motmotbrodau':
-			return I18N::translateContext('mother’s mother’s brother’s daughter', 'first cousin once removed ascending');
-		case 'motmotbroson':
-			return I18N::translateContext('mother’s mother’s brother’s son', 'first cousin once removed ascending');
-		case 'motmotbrochi':
-			return I18N::translateContext('mother’s mother’s brother’s child', 'first cousin once removed ascending');
-		case 'motmotsisdau':
-			return I18N::translateContext('mother’s mother’s sister’s daughter', 'first cousin once removed ascending');
-		case 'motmotsisson':
-			return I18N::translateContext('mother’s mother’s sister’s son', 'first cousin once removed ascending');
-		case 'motmotsischi':
-			return I18N::translateContext('mother’s mother’s sister’s child', 'first cousin once removed ascending');
-		}
+        // Some “special case” level four relationships that have specific names in certain languages
+        case 'fatfatbrowif':
+            return I18N::translateContext('father’s father’s brother’s wife', 'great-aunt');
+        case 'fatfatsibspo':
+            return I18N::translateContext('father’s father’s sibling’s spouse', 'great-aunt/uncle');
+        case 'fatfatsishus':
+            return I18N::translateContext('father’s father’s sister’s husband', 'great-uncle');
+        case 'fatmotbrowif':
+            return I18N::translateContext('father’s mother’s brother’s wife', 'great-aunt');
+        case 'fatmotsibspo':
+            return I18N::translateContext('father’s mother’s sibling’s spouse', 'great-aunt/uncle');
+        case 'fatmotsishus':
+            return I18N::translateContext('father’s mother’s sister’s husband', 'great-uncle');
+        case 'fatparbrowif':
+            return I18N::translateContext('father’s parent’s brother’s wife', 'great-aunt');
+        case 'fatparsibspo':
+            return I18N::translateContext('father’s parent’s sibling’s spouse', 'great-aunt/uncle');
+        case 'fatparsishus':
+            return I18N::translateContext('father’s parent’s sister’s husband', 'great-uncle');
+        case 'motfatbrowif':
+            return I18N::translateContext('mother’s father’s brother’s wife', 'great-aunt');
+        case 'motfatsibspo':
+            return I18N::translateContext('mother’s father’s sibling’s spouse', 'great-aunt/uncle');
+        case 'motfatsishus':
+            return I18N::translateContext('mother’s father’s sister’s husband', 'great-uncle');
+        case 'motmotbrowif':
+            return I18N::translateContext('mother’s mother’s brother’s wife', 'great-aunt');
+        case 'motmotsibspo':
+            return I18N::translateContext('mother’s mother’s sibling’s spouse', 'great-aunt/uncle');
+        case 'motmotsishus':
+            return I18N::translateContext('mother’s mother’s sister’s husband', 'great-uncle');
+        case 'motparbrowif':
+            return I18N::translateContext('mother’s parent’s brother’s wife', 'great-aunt');
+        case 'motparsibspo':
+            return I18N::translateContext('mother’s parent’s sibling’s spouse', 'great-aunt/uncle');
+        case 'motparsishus':
+            return I18N::translateContext('mother’s parent’s sister’s husband', 'great-uncle');
+        case 'parfatbrowif':
+            return I18N::translateContext('parent’s father’s brother’s wife', 'great-aunt');
+        case 'parfatsibspo':
+            return I18N::translateContext('parent’s father’s sibling’s spouse', 'great-aunt/uncle');
+        case 'parfatsishus':
+            return I18N::translateContext('parent’s father’s sister’s husband', 'great-uncle');
+        case 'parmotbrowif':
+            return I18N::translateContext('parent’s mother’s brother’s wife', 'great-aunt');
+        case 'parmotsibspo':
+            return I18N::translateContext('parent’s mother’s sibling’s spouse', 'great-aunt/uncle');
+        case 'parmotsishus':
+            return I18N::translateContext('parent’s mother’s sister’s husband', 'great-uncle');
+        case 'parparbrowif':
+            return I18N::translateContext('parent’s parent’s brother’s wife', 'great-aunt');
+        case 'parparsibspo':
+            return I18N::translateContext('parent’s parent’s sibling’s spouse', 'great-aunt/uncle');
+        case 'parparsishus':
+            return I18N::translateContext('parent’s parent’s sister’s husband', 'great-uncle');
+        case 'fatfatbrodau':
+            return I18N::translateContext('father’s father’s brother’s daughter', 'first cousin once removed ascending');
+        case 'fatfatbroson':
+            return I18N::translateContext('father’s father’s brother’s son', 'first cousin once removed ascending');
+        case 'fatfatbrochi':
+            return I18N::translateContext('father’s father’s brother’s child', 'first cousin once removed ascending');
+        case 'fatfatsisdau':
+            return I18N::translateContext('father’s father’s sister’s daughter', 'first cousin once removed ascending');
+        case 'fatfatsisson':
+            return I18N::translateContext('father’s father’s sister’s son', 'first cousin once removed ascending');
+        case 'fatfatsischi':
+            return I18N::translateContext('father’s father’s sister’s child', 'first cousin once removed ascending');
+        case 'fatmotbrodau':
+            return I18N::translateContext('father’s mother’s brother’s daughter', 'first cousin once removed ascending');
+        case 'fatmotbroson':
+            return I18N::translateContext('father’s mother’s brother’s son', 'first cousin once removed ascending');
+        case 'fatmotbrochi':
+            return I18N::translateContext('father’s mother’s brother’s child', 'first cousin once removed ascending');
+        case 'fatmotsisdau':
+            return I18N::translateContext('father’s mother’s sister’s daughter', 'first cousin once removed ascending');
+        case 'fatmotsisson':
+            return I18N::translateContext('father’s mother’s sister’s son', 'first cousin once removed ascending');
+        case 'fatmotsischi':
+            return I18N::translateContext('father’s mother’s sister’s child', 'first cousin once removed ascending');
+        case 'motfatbrodau':
+            return I18N::translateContext('mother’s father’s brother’s daughter', 'first cousin once removed ascending');
+        case 'motfatbroson':
+            return I18N::translateContext('mother’s father’s brother’s son', 'first cousin once removed ascending');
+        case 'motfatbrochi':
+            return I18N::translateContext('mother’s father’s brother’s child', 'first cousin once removed ascending');
+        case 'motfatsisdau':
+            return I18N::translateContext('mother’s father’s sister’s daughter', 'first cousin once removed ascending');
+        case 'motfatsisson':
+            return I18N::translateContext('mother’s father’s sister’s son', 'first cousin once removed ascending');
+        case 'motfatsischi':
+            return I18N::translateContext('mother’s father’s sister’s child', 'first cousin once removed ascending');
+        case 'motmotbrodau':
+            return I18N::translateContext('mother’s mother’s brother’s daughter', 'first cousin once removed ascending');
+        case 'motmotbroson':
+            return I18N::translateContext('mother’s mother’s brother’s son', 'first cousin once removed ascending');
+        case 'motmotbrochi':
+            return I18N::translateContext('mother’s mother’s brother’s child', 'first cousin once removed ascending');
+        case 'motmotsisdau':
+            return I18N::translateContext('mother’s mother’s sister’s daughter', 'first cousin once removed ascending');
+        case 'motmotsisson':
+            return I18N::translateContext('mother’s mother’s sister’s son', 'first cousin once removed ascending');
+        case 'motmotsischi':
+            return I18N::translateContext('mother’s mother’s sister’s child', 'first cousin once removed ascending');
+        }
 
-		// Some “special case” level five relationships that have specific names in certain languages
-		if (preg_match('/^(mot|fat|par)fatbro(son|dau|chi)dau$/', $path)) {
-			return I18N::translateContext('grandfather’s brother’s granddaughter', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)fatbro(son|dau|chi)son$/', $path)) {
-			return I18N::translateContext('grandfather’s brother’s grandson', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)fatbro(son|dau|chi)chi$/', $path)) {
-			return I18N::translateContext('grandfather’s brother’s grandchild', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)fatsis(son|dau|chi)dau$/', $path)) {
-			return I18N::translateContext('grandfather’s sister’s granddaughter', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)fatsis(son|dau|chi)son$/', $path)) {
-			return I18N::translateContext('grandfather’s sister’s grandson', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)fatsis(son|dau|chi)chi$/', $path)) {
-			return I18N::translateContext('grandfather’s sister’s grandchild', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)fatsib(son|dau|chi)dau$/', $path)) {
-			return I18N::translateContext('grandfather’s sibling’s granddaughter', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)fatsib(son|dau|chi)son$/', $path)) {
-			return I18N::translateContext('grandfather’s sibling’s grandson', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)fatsib(son|dau|chi)chi$/', $path)) {
-			return I18N::translateContext('grandfather’s sibling’s grandchild', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)motbro(son|dau|chi)dau$/', $path)) {
-			return I18N::translateContext('grandmother’s brother’s granddaughter', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)motbro(son|dau|chi)son$/', $path)) {
-			return I18N::translateContext('grandmother’s brother’s grandson', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)motbro(son|dau|chi)chi$/', $path)) {
-			return I18N::translateContext('grandmother’s brother’s grandchild', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)motsis(son|dau|chi)dau$/', $path)) {
-			return I18N::translateContext('grandmother’s sister’s granddaughter', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)motsis(son|dau|chi)son$/', $path)) {
-			return I18N::translateContext('grandmother’s sister’s grandson', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)motsis(son|dau|chi)chi$/', $path)) {
-			return I18N::translateContext('grandmother’s sister’s grandchild', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)motsib(son|dau|chi)dau$/', $path)) {
-			return I18N::translateContext('grandmother’s sibling’s granddaughter', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)motsib(son|dau|chi)son$/', $path)) {
-			return I18N::translateContext('grandmother’s sibling’s grandson', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)motsib(son|dau|chi)chi$/', $path)) {
-			return I18N::translateContext('grandmother’s sibling’s grandchild', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)parbro(son|dau|chi)dau$/', $path)) {
-			return I18N::translateContext('grandparent’s brother’s granddaughter', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)parbro(son|dau|chi)son$/', $path)) {
-			return I18N::translateContext('grandparent’s brother’s grandson', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)parbro(son|dau|chi)chi$/', $path)) {
-			return I18N::translateContext('grandparent’s brother’s grandchild', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)parsis(son|dau|chi)dau$/', $path)) {
-			return I18N::translateContext('grandparent’s sister’s granddaughter', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)parsis(son|dau|chi)son$/', $path)) {
-			return I18N::translateContext('grandparent’s sister’s grandson', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)parsis(son|dau|chi)chi$/', $path)) {
-			return I18N::translateContext('grandparent’s sister’s grandchild', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)parsib(son|dau|chi)dau$/', $path)) {
-			return I18N::translateContext('grandparent’s sibling’s granddaughter', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)parsib(son|dau|chi)son$/', $path)) {
-			return I18N::translateContext('grandparent’s sibling’s grandson', 'second cousin');
-		} elseif (preg_match('/^(mot|fat|par)parsib(son|dau|chi)chi$/', $path)) {
-			return I18N::translateContext('grandparent’s sibling’s grandchild', 'second cousin');
-		}
+        // Some “special case” level five relationships that have specific names in certain languages
+        if (preg_match('/^(mot|fat|par)fatbro(son|dau|chi)dau$/', $path)) {
+            return I18N::translateContext('grandfather’s brother’s granddaughter', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)fatbro(son|dau|chi)son$/', $path)) {
+            return I18N::translateContext('grandfather’s brother’s grandson', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)fatbro(son|dau|chi)chi$/', $path)) {
+            return I18N::translateContext('grandfather’s brother’s grandchild', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)fatsis(son|dau|chi)dau$/', $path)) {
+            return I18N::translateContext('grandfather’s sister’s granddaughter', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)fatsis(son|dau|chi)son$/', $path)) {
+            return I18N::translateContext('grandfather’s sister’s grandson', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)fatsis(son|dau|chi)chi$/', $path)) {
+            return I18N::translateContext('grandfather’s sister’s grandchild', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)fatsib(son|dau|chi)dau$/', $path)) {
+            return I18N::translateContext('grandfather’s sibling’s granddaughter', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)fatsib(son|dau|chi)son$/', $path)) {
+            return I18N::translateContext('grandfather’s sibling’s grandson', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)fatsib(son|dau|chi)chi$/', $path)) {
+            return I18N::translateContext('grandfather’s sibling’s grandchild', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)motbro(son|dau|chi)dau$/', $path)) {
+            return I18N::translateContext('grandmother’s brother’s granddaughter', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)motbro(son|dau|chi)son$/', $path)) {
+            return I18N::translateContext('grandmother’s brother’s grandson', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)motbro(son|dau|chi)chi$/', $path)) {
+            return I18N::translateContext('grandmother’s brother’s grandchild', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)motsis(son|dau|chi)dau$/', $path)) {
+            return I18N::translateContext('grandmother’s sister’s granddaughter', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)motsis(son|dau|chi)son$/', $path)) {
+            return I18N::translateContext('grandmother’s sister’s grandson', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)motsis(son|dau|chi)chi$/', $path)) {
+            return I18N::translateContext('grandmother’s sister’s grandchild', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)motsib(son|dau|chi)dau$/', $path)) {
+            return I18N::translateContext('grandmother’s sibling’s granddaughter', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)motsib(son|dau|chi)son$/', $path)) {
+            return I18N::translateContext('grandmother’s sibling’s grandson', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)motsib(son|dau|chi)chi$/', $path)) {
+            return I18N::translateContext('grandmother’s sibling’s grandchild', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)parbro(son|dau|chi)dau$/', $path)) {
+            return I18N::translateContext('grandparent’s brother’s granddaughter', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)parbro(son|dau|chi)son$/', $path)) {
+            return I18N::translateContext('grandparent’s brother’s grandson', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)parbro(son|dau|chi)chi$/', $path)) {
+            return I18N::translateContext('grandparent’s brother’s grandchild', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)parsis(son|dau|chi)dau$/', $path)) {
+            return I18N::translateContext('grandparent’s sister’s granddaughter', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)parsis(son|dau|chi)son$/', $path)) {
+            return I18N::translateContext('grandparent’s sister’s grandson', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)parsis(son|dau|chi)chi$/', $path)) {
+            return I18N::translateContext('grandparent’s sister’s grandchild', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)parsib(son|dau|chi)dau$/', $path)) {
+            return I18N::translateContext('grandparent’s sibling’s granddaughter', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)parsib(son|dau|chi)son$/', $path)) {
+            return I18N::translateContext('grandparent’s sibling’s grandson', 'second cousin');
+        } elseif (preg_match('/^(mot|fat|par)parsib(son|dau|chi)chi$/', $path)) {
+            return I18N::translateContext('grandparent’s sibling’s grandchild', 'second cousin');
+        }
 
-		// Look for generic/pattern relationships.
-		if (preg_match('/^((?:mot|fat|par)+)(bro|sis|sib)$/', $path, $match)) {
-			// siblings of direct ancestors
-			$up       = strlen($match[1]) / 3;
-			$bef_last = substr($path, -6, 3);
-			switch ($up) {
-			case 3:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great-grandfather’s brother', 'great-great-uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great-grandmother’s brother', 'great-great-uncle');
-				} else {
-				return I18N::translateContext('great-grandparent’s brother', 'great-great-uncle');
-				}
-				case 'F':
-				return I18N::translate('great-great-aunt');
-				default:
-				return I18N::translate('great-great-aunt/uncle');
-				}
-			case 4:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great-great-grandfather’s brother', 'great-great-great-uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great-great-grandmother’s brother', 'great-great-great-uncle');
-				} else {
-				return I18N::translateContext('great-great-grandparent’s brother', 'great-great-great-uncle');
-				}
-				case 'F':
-				return I18N::translate('great-great-great-aunt');
-				default:
-				return I18N::translate('great-great-great-aunt/uncle');
-				}
-			case 5:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great-great-great-grandfather’s brother', 'great ×4 uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great-great-great-grandmother’s brother', 'great ×4 uncle');
-				} else {
-				return I18N::translateContext('great-great-great-grandparent’s brother', 'great ×4 uncle');
-				}
-				case 'F':
-				return I18N::translate('great ×4 aunt');
-				default:
-				return I18N::translate('great ×4 aunt/uncle');
-				}
-			case 6:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great ×4 grandfather’s brother', 'great ×5 uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great ×4 grandmother’s brother', 'great ×5 uncle');
-				} else {
-				return I18N::translateContext('great ×4 grandparent’s brother', 'great ×5 uncle');
-				}
-				case 'F':
-				return I18N::translate('great ×5 aunt');
-				default:
-				return I18N::translate('great ×5 aunt/uncle');
-				}
-			case 7:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great ×5 grandfather’s brother', 'great ×6 uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great ×5 grandmother’s brother', 'great ×6 uncle');
-				} else {
-				return I18N::translateContext('great ×5 grandparent’s brother', 'great ×6 uncle');
-				}
-				case 'F':
-				return I18N::translate('great ×6 aunt');
-				default:
-				return I18N::translate('great ×6 aunt/uncle');
-				}
-			case 8:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great ×6 grandfather’s brother', 'great ×7 uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great ×6 grandmother’s brother', 'great ×7 uncle');
-				} else {
-				return I18N::translateContext('great ×6 grandparent’s brother', 'great ×7 uncle');
-				}
-				case 'F':
-				return I18N::translate('great ×7 aunt');
-				default:
-				return I18N::translate('great ×7 aunt/uncle');
-				}
-			default:
-				// Different languages have different rules for naming generations.
-				// An English great ×12 uncle is a Danish great ×10 uncle.
-				//
-				// Need to find out which languages use which rules.
-				switch (WT_LOCALE) {
-				case 'da':
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×%s uncle', I18N::number($up - 4));
-				case 'F':
-				return I18N::translate('great ×%s aunt', I18N::number($up - 4));
-				default:
-				return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 4));
-				}
-				case 'pl':
-					switch ($sex2) {
-					case 'M':
-					if ($bef_last === 'fat') {
-					return I18N::translateContext('great ×(%s-1) grandfather’s brother', 'great ×%s uncle', I18N::number($up - 2));
-					} elseif ($bef_last === 'mot') {
-					return I18N::translateContext('great ×(%s-1) grandmother’s brother', 'great ×%s uncle', I18N::number($up - 2));
-					} else {
-					return I18N::translateContext('great ×(%s-1) grandparent’s brother', 'great ×%s uncle', I18N::number($up - 2));
-					}
-					case 'F':
-					return I18N::translate('great ×%s aunt', I18N::number($up - 2));
-					default:
-					return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 2));
-					}
-				case 'it': // Source: Michele Locati
-				case 'en_AU':
-				case 'en_GB':
-				case 'en_US':
-				default:
-					switch ($sex2) {
-					case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
-					return I18N::translate('great ×%s uncle', I18N::number($up - 1));
-					case 'F':
-					return I18N::translate('great ×%s aunt', I18N::number($up - 1));
-					default:
-					return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 1));
-					}
-					}
-			}
-		}
-		if (preg_match('/^(?:bro|sis|sib)((?:son|dau|chi)+)$/', $path, $match)) {
-			// direct descendants of siblings
-			$down  = strlen($match[1]) / 3 + 1; // Add one, as we count generations from the common ancestor
-			$first = substr($path, 0, 3);
-			switch ($down) {
-			case 4:
-				switch ($sex2) {
-				case 'M':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-grandson', 'great-great-nephew');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-grandson', 'great-great-nephew');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-nephew', 'great-great-nephew');
-				}
-				case 'F':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-granddaughter', 'great-great-niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-granddaughter', 'great-great-niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-niece', 'great-great-niece');
-				}
-				default:
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-grandchild', 'great-great-nephew/niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-grandchild', 'great-great-nephew/niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-nephew/niece', 'great-great-nephew/niece');
-				}
-				}
-			case 5:
-				switch ($sex2) {
-				case 'M':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-grandson', 'great-great-great-nephew');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-grandson', 'great-great-great-nephew');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-great-nephew', 'great-great-great-nephew');
-				}
-				case 'F':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-granddaughter', 'great-great-great-niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-granddaughter', 'great-great-great-niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-great-niece', 'great-great-great-niece');
-				}
-				default:
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-grandchild', 'great-great-great-nephew/niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-grandchild', 'great-great-great-nephew/niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-great-nephew/niece', 'great-great-great-nephew/niece');
-				}
-				}
-			case 6:
-				switch ($sex2) {
-				case 'M':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-great-grandson', 'great ×4 nephew');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-great-grandson', 'great ×4 nephew');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×4 nephew', 'great ×4 nephew');
-				}
-				case 'F':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-great-granddaughter', 'great ×4 niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-great-granddaughter', 'great ×4 niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×4 niece', 'great ×4 niece');
-				}
-				default:
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-great-grandchild', 'great ×4 nephew/niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-great-grandchild', 'great ×4 nephew/niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×4 nephew/niece', 'great ×4 nephew/niece');
-				}
-				}
-			case 7:
-				switch ($sex2) {
-				case 'M':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×4 grandson', 'great ×5 nephew');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×4 grandson', 'great ×5 nephew');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×5 nephew', 'great ×5 nephew');
-				}
-				case 'F':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×4 granddaughter', 'great ×5 niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×4 granddaughter', 'great ×5 niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×5 niece', 'great ×5 niece');
-				}
-				default:
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×4 grandchild', 'great ×5 nephew/niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×4 grandchild', 'great ×5 nephew/niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×5 nephew/niece', 'great ×5 nephew/niece');
-				}
-				}
-			default:
-				// Different languages have different rules for naming generations.
-				// An English great ×12 nephew is a Polish great ×11 nephew.
-				//
-				// Need to find out which languages use which rules.
-				switch (WT_LOCALE) {
-				case 'pl': // Source: Lukasz Wilenski
-				switch ($sex2) {
-				case 'M':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 3));
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 3));
-				} else {
-				return I18N::translateContext('(a woman’s) great ×%s nephew', 'great ×%s nephew', I18N::number($down - 3));
-				}
-				case 'F':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×(%s-1) granddaughter', 'great ×%s niece', I18N::number($down - 3));
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×(%s-1) granddaughter', 'great ×%s niece', I18N::number($down - 3));
-				} else {
-				return I18N::translateContext('(a woman’s) great ×%s niece', 'great ×%s niece', I18N::number($down - 3));
-				}
-				default:
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandchild', 'great ×%s nephew/niece', I18N::number($down - 3));
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×(%s-1) grandchild', 'great ×%s nephew/niece', I18N::number($down - 3));
-				} else {
-				return I18N::translateContext('(a woman’s) great ×%s nephew/niece', 'great ×%s nephew/niece', I18N::number($down - 3));
-				}
-				}
-				case 'he': // Source: Meliza Amity
-					switch ($sex2) {
-					case 'M':
-					return I18N::translate('great ×%s nephew', I18N::number($down - 1));
-					case 'F':
-					return I18N::translate('great ×%s niece', I18N::number($down - 1));
-					default:
-					return I18N::translate('great ×%s nephew/niece', I18N::number($down - 1));
-					}
-				case 'it': // Source: Michele Locati.
-				case 'en_AU':
-				case 'en_GB':
-				case 'en_US':
-				default:
-					switch ($sex2) {
-					case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
-					return I18N::translate('great ×%s nephew', I18N::number($down - 2));
-					case 'F':
-					return I18N::translate('great ×%s niece', I18N::number($down - 2));
-					default:
-					return I18N::translate('great ×%s nephew/niece', I18N::number($down - 2));
-					}
-					}
-			}
-		}
-		if (preg_match('/^((?:mot|fat|par)*)$/', $path, $match)) {
-			// direct ancestors
-			$up = strlen($match[1]) / 3;
-			switch ($up) {
-			case 4:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great-great-grandfather');
-				case 'F':
-				return I18N::translate('great-great-grandmother');
-				default:
-				return I18N::translate('great-great-grandparent');
-				}
-			case 5:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great-great-great-grandfather');
-				case 'F':
-				return I18N::translate('great-great-great-grandmother');
-				default:
-				return I18N::translate('great-great-great-grandparent');
-				}
-			case 6:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×4 grandfather');
-				case 'F':
-				return I18N::translate('great ×4 grandmother');
-				default:
-				return I18N::translate('great ×4 grandparent');
-				}
-			case 7:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×5 grandfather');
-				case 'F':
-				return I18N::translate('great ×5 grandmother');
-				default:
-				return I18N::translate('great ×5 grandparent');
-				}
-			case 8:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×6 grandfather');
-				case 'F':
-				return I18N::translate('great ×6 grandmother');
-				default:
-				return I18N::translate('great ×6 grandparent');
-				}
-			case 9:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×7 grandfather');
-				case 'F':
-				return I18N::translate('great ×7 grandmother');
-				default:
-				return I18N::translate('great ×7 grandparent');
-				}
-			default:
-				// Different languages have different rules for naming generations.
-				// An English great ×12 grandfather is a Danish great ×11 grandfather.
-				//
-				// Need to find out which languages use which rules.
-				switch (WT_LOCALE) {
-				case 'da': // Source: Patrick Sorensen
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×%s grandfather', I18N::number($up - 3));
-				case 'F':
-				return I18N::translate('great ×%s grandmother', I18N::number($up - 3));
-				default:
-				return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
-				}
-				case 'it': // Source: Michele Locati
-				case 'es': // Source: Wes Groleau
-					switch ($sex2) {
-					case 'M':
-					return I18N::translate('great ×%s grandfather', I18N::number($up));
-					case 'F':
-					return I18N::translate('great ×%s grandmother', I18N::number($up));
-					default:
-					return I18N::translate('great ×%s grandparent', I18N::number($up));
-					}
-				case 'fr': // Source: Jacqueline Tetreault
-				case 'fr_CA':
-					switch ($sex2) {
-					case 'M':
-					return I18N::translate('great ×%s grandfather', I18N::number($up - 1));
-					case 'F':
-					return I18N::translate('great ×%s grandmother', I18N::number($up - 1));
-					default:
-					return I18N::translate('great ×%s grandparent', I18N::number($up - 1));
-					}
-				case 'nn': // Source: Hogne Røed Nilsen (https://bugs.launchpad.net/webtrees/+bug/1168553)
-				case 'nb':
-					switch ($sex2) {
-					case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
-					return I18N::translate('great ×%s grandfather', I18N::number($up - 3));
-					case 'F':
-					return I18N::translate('great ×%s grandmother', I18N::number($up - 3));
-					default:
-					return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
-					}
-				case 'en_AU':
-				case 'en_GB':
-				case 'en_US':
-				default:
-					switch ($sex2) {
-					case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
-					return I18N::translate('great ×%s grandfather', I18N::number($up - 2));
-					case 'F':
-					return I18N::translate('great ×%s grandmother', I18N::number($up - 2));
-					default:
-					return I18N::translate('great ×%s grandparent', I18N::number($up - 2));
-					}
-					}
-			}
-		}
-		if (preg_match('/^((?:son|dau|chi)*)$/', $path, $match)) {
-			// direct descendants
-			$up = strlen($match[1]) / 3;
-			switch ($up) {
-			case 4:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great-great-grandson');
-				case 'F':
-				return I18N::translate('great-great-granddaughter');
-				default:
-				return I18N::translate('great-great-grandchild');
-				}
+        // Look for generic/pattern relationships.
+        if (preg_match('/^((?:mot|fat|par)+)(bro|sis|sib)$/', $path, $match)) {
+            // siblings of direct ancestors
+            $up       = strlen($match[1]) / 3;
+            $bef_last = substr($path, -6, 3);
+            switch ($up) {
+            case 3:
+                switch ($sex2) {
+                case 'M':
+                if ($bef_last === 'fat') {
+                return I18N::translateContext('great-grandfather’s brother', 'great-great-uncle');
+                } elseif ($bef_last === 'mot') {
+                return I18N::translateContext('great-grandmother’s brother', 'great-great-uncle');
+                } else {
+                return I18N::translateContext('great-grandparent’s brother', 'great-great-uncle');
+                }
+                case 'F':
+                return I18N::translate('great-great-aunt');
+                default:
+                return I18N::translate('great-great-aunt/uncle');
+                }
+            case 4:
+                switch ($sex2) {
+                case 'M':
+                if ($bef_last === 'fat') {
+                return I18N::translateContext('great-great-grandfather’s brother', 'great-great-great-uncle');
+                } elseif ($bef_last === 'mot') {
+                return I18N::translateContext('great-great-grandmother’s brother', 'great-great-great-uncle');
+                } else {
+                return I18N::translateContext('great-great-grandparent’s brother', 'great-great-great-uncle');
+                }
+                case 'F':
+                return I18N::translate('great-great-great-aunt');
+                default:
+                return I18N::translate('great-great-great-aunt/uncle');
+                }
+            case 5:
+                switch ($sex2) {
+                case 'M':
+                if ($bef_last === 'fat') {
+                return I18N::translateContext('great-great-great-grandfather’s brother', 'great ×4 uncle');
+                } elseif ($bef_last === 'mot') {
+                return I18N::translateContext('great-great-great-grandmother’s brother', 'great ×4 uncle');
+                } else {
+                return I18N::translateContext('great-great-great-grandparent’s brother', 'great ×4 uncle');
+                }
+                case 'F':
+                return I18N::translate('great ×4 aunt');
+                default:
+                return I18N::translate('great ×4 aunt/uncle');
+                }
+            case 6:
+                switch ($sex2) {
+                case 'M':
+                if ($bef_last === 'fat') {
+                return I18N::translateContext('great ×4 grandfather’s brother', 'great ×5 uncle');
+                } elseif ($bef_last === 'mot') {
+                return I18N::translateContext('great ×4 grandmother’s brother', 'great ×5 uncle');
+                } else {
+                return I18N::translateContext('great ×4 grandparent’s brother', 'great ×5 uncle');
+                }
+                case 'F':
+                return I18N::translate('great ×5 aunt');
+                default:
+                return I18N::translate('great ×5 aunt/uncle');
+                }
+            case 7:
+                switch ($sex2) {
+                case 'M':
+                if ($bef_last === 'fat') {
+                return I18N::translateContext('great ×5 grandfather’s brother', 'great ×6 uncle');
+                } elseif ($bef_last === 'mot') {
+                return I18N::translateContext('great ×5 grandmother’s brother', 'great ×6 uncle');
+                } else {
+                return I18N::translateContext('great ×5 grandparent’s brother', 'great ×6 uncle');
+                }
+                case 'F':
+                return I18N::translate('great ×6 aunt');
+                default:
+                return I18N::translate('great ×6 aunt/uncle');
+                }
+            case 8:
+                switch ($sex2) {
+                case 'M':
+                if ($bef_last === 'fat') {
+                return I18N::translateContext('great ×6 grandfather’s brother', 'great ×7 uncle');
+                } elseif ($bef_last === 'mot') {
+                return I18N::translateContext('great ×6 grandmother’s brother', 'great ×7 uncle');
+                } else {
+                return I18N::translateContext('great ×6 grandparent’s brother', 'great ×7 uncle');
+                }
+                case 'F':
+                return I18N::translate('great ×7 aunt');
+                default:
+                return I18N::translate('great ×7 aunt/uncle');
+                }
+            default:
+                // Different languages have different rules for naming generations.
+                // An English great ×12 uncle is a Danish great ×10 uncle.
+                //
+                // Need to find out which languages use which rules.
+                switch (WT_LOCALE) {
+                case 'da':
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×%s uncle', I18N::number($up - 4));
+                case 'F':
+                return I18N::translate('great ×%s aunt', I18N::number($up - 4));
+                default:
+                return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 4));
+                }
+                case 'pl':
+                    switch ($sex2) {
+                    case 'M':
+                    if ($bef_last === 'fat') {
+                    return I18N::translateContext('great ×(%s-1) grandfather’s brother', 'great ×%s uncle', I18N::number($up - 2));
+                    } elseif ($bef_last === 'mot') {
+                    return I18N::translateContext('great ×(%s-1) grandmother’s brother', 'great ×%s uncle', I18N::number($up - 2));
+                    } else {
+                    return I18N::translateContext('great ×(%s-1) grandparent’s brother', 'great ×%s uncle', I18N::number($up - 2));
+                    }
+                    case 'F':
+                    return I18N::translate('great ×%s aunt', I18N::number($up - 2));
+                    default:
+                    return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 2));
+                    }
+                case 'it': // Source: Michele Locati
+                case 'en_AU':
+                case 'en_GB':
+                case 'en_US':
+                default:
+                    switch ($sex2) {
+                    case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
+                    return I18N::translate('great ×%s uncle', I18N::number($up - 1));
+                    case 'F':
+                    return I18N::translate('great ×%s aunt', I18N::number($up - 1));
+                    default:
+                    return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 1));
+                    }
+                    }
+            }
+        }
+        if (preg_match('/^(?:bro|sis|sib)((?:son|dau|chi)+)$/', $path, $match)) {
+            // direct descendants of siblings
+            $down  = strlen($match[1]) / 3 + 1; // Add one, as we count generations from the common ancestor
+            $first = substr($path, 0, 3);
+            switch ($down) {
+            case 4:
+                switch ($sex2) {
+                case 'M':
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great-grandson', 'great-great-nephew');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great-grandson', 'great-great-nephew');
+                } else {
+                return I18N::translateContext('(a woman’s) great-great-nephew', 'great-great-nephew');
+                }
+                case 'F':
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great-granddaughter', 'great-great-niece');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great-granddaughter', 'great-great-niece');
+                } else {
+                return I18N::translateContext('(a woman’s) great-great-niece', 'great-great-niece');
+                }
+                default:
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great-grandchild', 'great-great-nephew/niece');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great-grandchild', 'great-great-nephew/niece');
+                } else {
+                return I18N::translateContext('(a woman’s) great-great-nephew/niece', 'great-great-nephew/niece');
+                }
+                }
+            case 5:
+                switch ($sex2) {
+                case 'M':
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great-great-grandson', 'great-great-great-nephew');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great-great-grandson', 'great-great-great-nephew');
+                } else {
+                return I18N::translateContext('(a woman’s) great-great-great-nephew', 'great-great-great-nephew');
+                }
+                case 'F':
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great-great-granddaughter', 'great-great-great-niece');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great-great-granddaughter', 'great-great-great-niece');
+                } else {
+                return I18N::translateContext('(a woman’s) great-great-great-niece', 'great-great-great-niece');
+                }
+                default:
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great-great-grandchild', 'great-great-great-nephew/niece');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great-great-grandchild', 'great-great-great-nephew/niece');
+                } else {
+                return I18N::translateContext('(a woman’s) great-great-great-nephew/niece', 'great-great-great-nephew/niece');
+                }
+                }
+            case 6:
+                switch ($sex2) {
+                case 'M':
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great-great-great-grandson', 'great ×4 nephew');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great-great-great-grandson', 'great ×4 nephew');
+                } else {
+                return I18N::translateContext('(a woman’s) great ×4 nephew', 'great ×4 nephew');
+                }
+                case 'F':
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great-great-great-granddaughter', 'great ×4 niece');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great-great-great-granddaughter', 'great ×4 niece');
+                } else {
+                return I18N::translateContext('(a woman’s) great ×4 niece', 'great ×4 niece');
+                }
+                default:
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great-great-great-grandchild', 'great ×4 nephew/niece');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great-great-great-grandchild', 'great ×4 nephew/niece');
+                } else {
+                return I18N::translateContext('(a woman’s) great ×4 nephew/niece', 'great ×4 nephew/niece');
+                }
+                }
+            case 7:
+                switch ($sex2) {
+                case 'M':
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great ×4 grandson', 'great ×5 nephew');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great ×4 grandson', 'great ×5 nephew');
+                } else {
+                return I18N::translateContext('(a woman’s) great ×5 nephew', 'great ×5 nephew');
+                }
+                case 'F':
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great ×4 granddaughter', 'great ×5 niece');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great ×4 granddaughter', 'great ×5 niece');
+                } else {
+                return I18N::translateContext('(a woman’s) great ×5 niece', 'great ×5 niece');
+                }
+                default:
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great ×4 grandchild', 'great ×5 nephew/niece');
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great ×4 grandchild', 'great ×5 nephew/niece');
+                } else {
+                return I18N::translateContext('(a woman’s) great ×5 nephew/niece', 'great ×5 nephew/niece');
+                }
+                }
+            default:
+                // Different languages have different rules for naming generations.
+                // An English great ×12 nephew is a Polish great ×11 nephew.
+                //
+                // Need to find out which languages use which rules.
+                switch (WT_LOCALE) {
+                case 'pl': // Source: Lukasz Wilenski
+                switch ($sex2) {
+                case 'M':
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 3));
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 3));
+                } else {
+                return I18N::translateContext('(a woman’s) great ×%s nephew', 'great ×%s nephew', I18N::number($down - 3));
+                }
+                case 'F':
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great ×(%s-1) granddaughter', 'great ×%s niece', I18N::number($down - 3));
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great ×(%s-1) granddaughter', 'great ×%s niece', I18N::number($down - 3));
+                } else {
+                return I18N::translateContext('(a woman’s) great ×%s niece', 'great ×%s niece', I18N::number($down - 3));
+                }
+                default:
+                if ($first === 'bro' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandchild', 'great ×%s nephew/niece', I18N::number($down - 3));
+                } elseif ($first === 'sis' && $sex1 === 'M') {
+                return I18N::translateContext('(a man’s) sister’s great ×(%s-1) grandchild', 'great ×%s nephew/niece', I18N::number($down - 3));
+                } else {
+                return I18N::translateContext('(a woman’s) great ×%s nephew/niece', 'great ×%s nephew/niece', I18N::number($down - 3));
+                }
+                }
+                case 'he': // Source: Meliza Amity
+                    switch ($sex2) {
+                    case 'M':
+                    return I18N::translate('great ×%s nephew', I18N::number($down - 1));
+                    case 'F':
+                    return I18N::translate('great ×%s niece', I18N::number($down - 1));
+                    default:
+                    return I18N::translate('great ×%s nephew/niece', I18N::number($down - 1));
+                    }
+                case 'it': // Source: Michele Locati.
+                case 'en_AU':
+                case 'en_GB':
+                case 'en_US':
+                default:
+                    switch ($sex2) {
+                    case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
+                    return I18N::translate('great ×%s nephew', I18N::number($down - 2));
+                    case 'F':
+                    return I18N::translate('great ×%s niece', I18N::number($down - 2));
+                    default:
+                    return I18N::translate('great ×%s nephew/niece', I18N::number($down - 2));
+                    }
+                    }
+            }
+        }
+        if (preg_match('/^((?:mot|fat|par)*)$/', $path, $match)) {
+            // direct ancestors
+            $up = strlen($match[1]) / 3;
+            switch ($up) {
+            case 4:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great-great-grandfather');
+                case 'F':
+                return I18N::translate('great-great-grandmother');
+                default:
+                return I18N::translate('great-great-grandparent');
+                }
+            case 5:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great-great-great-grandfather');
+                case 'F':
+                return I18N::translate('great-great-great-grandmother');
+                default:
+                return I18N::translate('great-great-great-grandparent');
+                }
+            case 6:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×4 grandfather');
+                case 'F':
+                return I18N::translate('great ×4 grandmother');
+                default:
+                return I18N::translate('great ×4 grandparent');
+                }
+            case 7:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×5 grandfather');
+                case 'F':
+                return I18N::translate('great ×5 grandmother');
+                default:
+                return I18N::translate('great ×5 grandparent');
+                }
+            case 8:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×6 grandfather');
+                case 'F':
+                return I18N::translate('great ×6 grandmother');
+                default:
+                return I18N::translate('great ×6 grandparent');
+                }
+            case 9:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×7 grandfather');
+                case 'F':
+                return I18N::translate('great ×7 grandmother');
+                default:
+                return I18N::translate('great ×7 grandparent');
+                }
+            default:
+                // Different languages have different rules for naming generations.
+                // An English great ×12 grandfather is a Danish great ×11 grandfather.
+                //
+                // Need to find out which languages use which rules.
+                switch (WT_LOCALE) {
+                case 'da': // Source: Patrick Sorensen
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×%s grandfather', I18N::number($up - 3));
+                case 'F':
+                return I18N::translate('great ×%s grandmother', I18N::number($up - 3));
+                default:
+                return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
+                }
+                case 'it': // Source: Michele Locati
+                case 'es': // Source: Wes Groleau
+                    switch ($sex2) {
+                    case 'M':
+                    return I18N::translate('great ×%s grandfather', I18N::number($up));
+                    case 'F':
+                    return I18N::translate('great ×%s grandmother', I18N::number($up));
+                    default:
+                    return I18N::translate('great ×%s grandparent', I18N::number($up));
+                    }
+                case 'fr': // Source: Jacqueline Tetreault
+                case 'fr_CA':
+                    switch ($sex2) {
+                    case 'M':
+                    return I18N::translate('great ×%s grandfather', I18N::number($up - 1));
+                    case 'F':
+                    return I18N::translate('great ×%s grandmother', I18N::number($up - 1));
+                    default:
+                    return I18N::translate('great ×%s grandparent', I18N::number($up - 1));
+                    }
+                case 'nn': // Source: Hogne Røed Nilsen (https://bugs.launchpad.net/webtrees/+bug/1168553)
+                case 'nb':
+                    switch ($sex2) {
+                    case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
+                    return I18N::translate('great ×%s grandfather', I18N::number($up - 3));
+                    case 'F':
+                    return I18N::translate('great ×%s grandmother', I18N::number($up - 3));
+                    default:
+                    return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
+                    }
+                case 'en_AU':
+                case 'en_GB':
+                case 'en_US':
+                default:
+                    switch ($sex2) {
+                    case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
+                    return I18N::translate('great ×%s grandfather', I18N::number($up - 2));
+                    case 'F':
+                    return I18N::translate('great ×%s grandmother', I18N::number($up - 2));
+                    default:
+                    return I18N::translate('great ×%s grandparent', I18N::number($up - 2));
+                    }
+                    }
+            }
+        }
+        if (preg_match('/^((?:son|dau|chi)*)$/', $path, $match)) {
+            // direct descendants
+            $up = strlen($match[1]) / 3;
+            switch ($up) {
+            case 4:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great-great-grandson');
+                case 'F':
+                return I18N::translate('great-great-granddaughter');
+                default:
+                return I18N::translate('great-great-grandchild');
+                }
 
-			case 5:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great-great-great-grandson');
-				case 'F':
-				return I18N::translate('great-great-great-granddaughter');
-				default:
-				return I18N::translate('great-great-great-grandchild');
-				}
+            case 5:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great-great-great-grandson');
+                case 'F':
+                return I18N::translate('great-great-great-granddaughter');
+                default:
+                return I18N::translate('great-great-great-grandchild');
+                }
 
-			case 6:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×4 grandson');
-				case 'F':
-				return I18N::translate('great ×4 granddaughter');
-				default:
-				return I18N::translate('great ×4 grandchild');
-				}
+            case 6:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×4 grandson');
+                case 'F':
+                return I18N::translate('great ×4 granddaughter');
+                default:
+                return I18N::translate('great ×4 grandchild');
+                }
 
-			case 7:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×5 grandson');
-				case 'F':
-				return I18N::translate('great ×5 granddaughter');
-				default:
-				return I18N::translate('great ×5 grandchild');
-				}
+            case 7:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×5 grandson');
+                case 'F':
+                return I18N::translate('great ×5 granddaughter');
+                default:
+                return I18N::translate('great ×5 grandchild');
+                }
 
-			case 8:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×6 grandson');
-				case 'F':
-				return I18N::translate('great ×6 granddaughter');
-				default:
-				return I18N::translate('great ×6 grandchild');
-				}
+            case 8:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×6 grandson');
+                case 'F':
+                return I18N::translate('great ×6 granddaughter');
+                default:
+                return I18N::translate('great ×6 grandchild');
+                }
 
-			case 9:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×7 grandson');
-				case 'F':
-				return I18N::translate('great ×7 granddaughter');
-				default:
-				return I18N::translate('great ×7 grandchild');
-				}
+            case 9:
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×7 grandson');
+                case 'F':
+                return I18N::translate('great ×7 granddaughter');
+                default:
+                return I18N::translate('great ×7 grandchild');
+                }
 
-			default:
-				// Different languages have different rules for naming generations.
-				// An English great ×12 grandson is a Danish great ×11 grandson.
-				//
-				// Need to find out which languages use which rules.
-				switch (WT_LOCALE) {
-				case 'nn': // Source: Hogne Røed Nilsen
-				case 'nb':
-				case 'da': // Source: Patrick Sorensen
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×%s grandson', I18N::number($up - 3));
-				case 'F':
-				return I18N::translate('great ×%s granddaughter', I18N::number($up - 3));
-				default:
-				return I18N::translate('great ×%s grandchild', I18N::number($up - 3));
-				}
-				case 'it': // Source: Michele Locati
-				case 'es': // Source: Wes Groleau (adding doesn’t change behavior, but needs to be better researched)
-				case 'en_AU':
-				case 'en_GB':
-				case 'en_US':
-				default:
-					switch ($sex2) {
+            default:
+                // Different languages have different rules for naming generations.
+                // An English great ×12 grandson is a Danish great ×11 grandson.
+                //
+                // Need to find out which languages use which rules.
+                switch (WT_LOCALE) {
+                case 'nn': // Source: Hogne Røed Nilsen
+                case 'nb':
+                case 'da': // Source: Patrick Sorensen
+                switch ($sex2) {
+                case 'M':
+                return I18N::translate('great ×%s grandson', I18N::number($up - 3));
+                case 'F':
+                return I18N::translate('great ×%s granddaughter', I18N::number($up - 3));
+                default:
+                return I18N::translate('great ×%s grandchild', I18N::number($up - 3));
+                }
+                case 'it': // Source: Michele Locati
+                case 'es': // Source: Wes Groleau (adding doesn’t change behavior, but needs to be better researched)
+                case 'en_AU':
+                case 'en_GB':
+                case 'en_US':
+                default:
+                    switch ($sex2) {
 
-					case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
-					return I18N::translate('great ×%s grandson', I18N::number($up - 2));
-					case 'F':
-					return I18N::translate('great ×%s granddaughter', I18N::number($up - 2));
-					default:
-					return I18N::translate('great ×%s grandchild', I18N::number($up - 2));
-					}
-					}
-			}
-		}
-		if (preg_match('/^((?:mot|fat|par)+)(?:bro|sis|sib)((?:son|dau|chi)+)$/', $path, $match)) {
-			// cousins in English
-			$ascent  = $match[1];
-			$descent = $match[2];
-			$up      = strlen($ascent) / 3;
-			$down    = strlen($descent) / 3;
-			$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.
+                    case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
+                    return I18N::translate('great ×%s grandson', I18N::number($up - 2));
+                    case 'F':
+                    return I18N::translate('great ×%s granddaughter', I18N::number($up - 2));
+                    default:
+                    return I18N::translate('great ×%s grandchild', I18N::number($up - 2));
+                    }
+                    }
+            }
+        }
+        if (preg_match('/^((?:mot|fat|par)+)(?:bro|sis|sib)((?:son|dau|chi)+)$/', $path, $match)) {
+            // cousins in English
+            $ascent  = $match[1];
+            $descent = $match[2];
+            $up      = strlen($ascent) / 3;
+            $down    = strlen($descent) / 3;
+            $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,
-			// an English “second cousin once removed” is a Polish “cousin of 7th degree”.
-			//
-			// Need to find out which languages use which rules.
-			switch (WT_LOCALE) {
-			case 'pl': // Source: Lukasz Wilenski
-				return self::cousinName($up + $down + 2, $sex2);
-			case 'it':
-				// Source: Michele Locati. See italian_cousins_names.zip
-				// https://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
-				if ($down == $up) {
-					return self::cousinName($cousin, $sex2);
-				} elseif ($down < $up) {
-					return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sib' . $descent, null, null));
-				} else {
-					switch ($sex2) {
-					case 'M':
-					return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('bro' . $descent, null, null));
-					case 'F':
-					return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sis' . $descent, null, null));
-					default:
-					return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sib' . $descent, null, null));
-					}
-					}
-			case 'en_AU': // See: http://en.wikipedia.org/wiki/File:CousinTree.svg
-			case 'en_GB':
-			case 'en_US':
-			default:
-				switch ($removed) {
-				case 0:
-				return self::cousinName($cousin, $sex2);
-				case 1:
-				if ($up > $down) {
-				/* I18N: %s=“fifth cousin”, etc. http://www.ancestry.com/learn/library/article.aspx?article=2856 */
-				return I18N::translate('%s once removed ascending', self::cousinName($cousin, $sex2));
-				} else {
-				/* I18N: %s=“fifth cousin”, etc. http://www.ancestry.com/learn/library/article.aspx?article=2856 */
-				return I18N::translate('%s once removed descending', self::cousinName($cousin, $sex2));
-				}
-				case 2:
-				if ($up > $down) {
-				/* I18N: %s=“fifth cousin”, etc. */
-				return I18N::translate('%s twice removed ascending', self::cousinName($cousin, $sex2));
-				} else {
-				/* I18N: %s=“fifth cousin”, etc. */
-				return I18N::translate('%s twice removed descending', self::cousinName($cousin, $sex2));
-				}
-				case 3:
-				if ($up > $down) {
-				/* I18N: %s=“fifth cousin”, etc. */
-				return I18N::translate('%s three times removed ascending', self::cousinName($cousin, $sex2));
-				} else {
-				/* I18N: %s=“fifth cousin”, etc. */
-				return I18N::translate('%s three times removed descending', self::cousinName($cousin, $sex2));
-				}
-				default:
-				if ($up > $down) {
-				/* I18N: %1$s=“fifth cousin”, etc., %2$s>=4 */
-				return I18N::translate('%1$s %2$s times removed ascending', self::cousinName($cousin, $sex2), I18N::number($removed));
-				} else {
-				/* I18N: %1$s=“fifth cousin”, etc., %2$s>=4 */
-				return I18N::translate('%1$s %2$s times removed descending', self::cousinName($cousin, $sex2), I18N::number($removed));
-				}
-				}
-			}
-		}
+            // 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.
+            switch (WT_LOCALE) {
+            case 'pl': // Source: Lukasz Wilenski
+                return self::cousinName($up + $down + 2, $sex2);
+            case 'it':
+                // Source: Michele Locati. See italian_cousins_names.zip
+                // https://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
+                if ($down == $up) {
+                    return self::cousinName($cousin, $sex2);
+                } elseif ($down < $up) {
+                    return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sib' . $descent, null, null));
+                } else {
+                    switch ($sex2) {
+                    case 'M':
+                    return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('bro' . $descent, null, null));
+                    case 'F':
+                    return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sis' . $descent, null, null));
+                    default:
+                    return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sib' . $descent, null, null));
+                    }
+                    }
+            case 'en_AU': // See: http://en.wikipedia.org/wiki/File:CousinTree.svg
+            case 'en_GB':
+            case 'en_US':
+            default:
+                switch ($removed) {
+                case 0:
+                return self::cousinName($cousin, $sex2);
+                case 1:
+                if ($up > $down) {
+                /* I18N: %s=“fifth cousin”, etc. http://www.ancestry.com/learn/library/article.aspx?article=2856 */
+                return I18N::translate('%s once removed ascending', self::cousinName($cousin, $sex2));
+                } else {
+                /* I18N: %s=“fifth cousin”, etc. http://www.ancestry.com/learn/library/article.aspx?article=2856 */
+                return I18N::translate('%s once removed descending', self::cousinName($cousin, $sex2));
+                }
+                case 2:
+                if ($up > $down) {
+                /* I18N: %s=“fifth cousin”, etc. */
+                return I18N::translate('%s twice removed ascending', self::cousinName($cousin, $sex2));
+                } else {
+                /* I18N: %s=“fifth cousin”, etc. */
+                return I18N::translate('%s twice removed descending', self::cousinName($cousin, $sex2));
+                }
+                case 3:
+                if ($up > $down) {
+                /* I18N: %s=“fifth cousin”, etc. */
+                return I18N::translate('%s three times removed ascending', self::cousinName($cousin, $sex2));
+                } else {
+                /* I18N: %s=“fifth cousin”, etc. */
+                return I18N::translate('%s three times removed descending', self::cousinName($cousin, $sex2));
+                }
+                default:
+                if ($up > $down) {
+                /* I18N: %1$s=“fifth cousin”, etc., %2$s>=4 */
+                return I18N::translate('%1$s %2$s times removed ascending', self::cousinName($cousin, $sex2), I18N::number($removed));
+                } else {
+                /* I18N: %1$s=“fifth cousin”, etc., %2$s>=4 */
+                return I18N::translate('%1$s %2$s times removed descending', self::cousinName($cousin, $sex2), I18N::number($removed));
+                }
+                }
+            }
+        }
 
-		// Split the relationship into sub-relationships, e.g., third-cousin’s great-uncle.
-		// Try splitting at every point, and choose the path with the shorted translated name.
-		// But before starting to recursively go through all combinations, do a cache look-up
-		if (array_key_exists($path, self::$relationshipsCache)) {
-			return self::$relationshipsCache[$path];
-		}
+        // Split the relationship into sub-relationships, e.g., third-cousin’s great-uncle.
+        // Try splitting at every point, and choose the path with the shorted translated name.
+        // But before starting to recursively go through all combinations, do a cache look-up
+        if (array_key_exists($path, self::$relationshipsCache)) {
+            return self::$relationshipsCache[$path];
+        }
 
-		$relationship = null;
-		$path1        = substr($path, 0, 3);
-		$path2        = substr($path, 3);
-		while ($path2) {
-			$tmp = I18N::translate(
-			// I18N: A complex relationship, such as “third-cousin’s great-uncle”
-				'%1$s’s %2$s',
-				self::getRelationshipNameFromPath($path1, null, null), // TODO: need the actual people
-				self::getRelationshipNameFromPath($path2, null, null)
-			);
-			if (!$relationship || strlen($tmp) < strlen($relationship)) {
-				$relationship = $tmp;
-			}
-			$path1 .= substr($path2, 0, 3);
-			$path2 = substr($path2, 3);
-		}
-		// and store the result in the cache
-		self::$relationshipsCache[$path] = $relationship;
+        $relationship = null;
+        $path1        = substr($path, 0, 3);
+        $path2        = substr($path, 3);
+        while ($path2) {
+            $tmp = I18N::translate(
+            // I18N: A complex relationship, such as “third-cousin’s great-uncle”
+                '%1$s’s %2$s',
+                self::getRelationshipNameFromPath($path1, null, null), // TODO: need the actual people
+                self::getRelationshipNameFromPath($path2, null, null)
+            );
+            if (!$relationship || strlen($tmp) < strlen($relationship)) {
+                $relationship = $tmp;
+            }
+            $path1 .= substr($path2, 0, 3);
+            $path2 = substr($path2, 3);
+        }
+        // and store the result in the cache
+        self::$relationshipsCache[$path] = $relationship;
 
-		return $relationship;
-	}
+        return $relationship;
+    }
 
-	/**
-	 * Function to build an URL querystring from GET variables
-	 * Optionally, add/replace specified values
-	 *
-	 * @param null|string[] $overwrite
-	 * @param null|string $separator
-	 *
-	 * @return string
-	 */
-	public static function getQueryUrl($overwrite = null, $separator = '&') {
-		if (empty($_GET)) {
-			$get = array();
-		} else {
-			$get = $_GET;
-		}
-		if (is_array($overwrite)) {
-			foreach ($overwrite as $key => $value) {
-				$get[$key] = $value;
-			}
-		}
+    /**
+     * Function to build an URL querystring from GET variables
+     * Optionally, add/replace specified values
+     *
+     * @param null|string[] $overwrite
+     * @param null|string $separator
+     *
+     * @return string
+     */
+    public static function getQueryUrl($overwrite = null, $separator = '&') {
+        if (empty($_GET)) {
+            $get = array();
+        } else {
+            $get = $_GET;
+        }
+        if (is_array($overwrite)) {
+            foreach ($overwrite as $key => $value) {
+                $get[$key] = $value;
+            }
+        }
 
-		$query_string = '';
-		foreach ($get as $key => $value) {
-			if (!is_array($value)) {
-				$query_string .= $separator . rawurlencode($key) . '=' . rawurlencode($value);
-			} else {
-				foreach ($value as $k => $v) {
-					$query_string .= $separator . rawurlencode($key) . '%5B' . rawurlencode($k) . '%5D=' . rawurlencode($v);
-				}
-			}
-		}
-		$query_string = substr($query_string, strlen($separator)); // Remove leading “&amp;”
-		if ($query_string) {
-			return WT_SCRIPT_NAME . '?' . $query_string;
-		} else {
-			return WT_SCRIPT_NAME;
-		}
-	}
+        $query_string = '';
+        foreach ($get as $key => $value) {
+            if (!is_array($value)) {
+                $query_string .= $separator . rawurlencode($key) . '=' . rawurlencode($value);
+            } else {
+                foreach ($value as $k => $v) {
+                    $query_string .= $separator . rawurlencode($key) . '%5B' . rawurlencode($k) . '%5D=' . rawurlencode($v);
+                }
+            }
+        }
+        $query_string = substr($query_string, strlen($separator)); // Remove leading “&amp;”
+        if ($query_string) {
+            return WT_SCRIPT_NAME . '?' . $query_string;
+        } else {
+            return WT_SCRIPT_NAME;
+        }
+    }
 
-	/**
-	 * Determines whether the passed in filename is a link to an external source (i.e. contains “://”)
-	 *
-	 * @param string $file
-	 *
-	 * @return bool
-	 */
-	public static function isFileExternal($file) {
-		return strpos($file, '://') !== false;
-	}
+    /**
+     * Determines whether the passed in filename is a link to an external source (i.e. contains “://”)
+     *
+     * @param string $file
+     *
+     * @return bool
+     */
+    public static function isFileExternal($file) {
+        return strpos($file, '://') !== false;
+    }
 }

Switch Indentation +1483 added lines, -1483 removed lines

@@ -65,29 +65,29 @@ 
 	 */
 	public static function fileUploadErrorText($error_code) {
 		switch ($error_code) {
-		case UPLOAD_ERR_OK:
-			return I18N::translate('File successfully uploaded');
-		case UPLOAD_ERR_INI_SIZE:
-		case UPLOAD_ERR_FORM_SIZE:
-			// I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
-			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.');
-		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.');
-		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.');
-		case UPLOAD_ERR_CANT_WRITE:
-			// I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
-			return I18N::translate('PHP failed to write to disk.');
-		case UPLOAD_ERR_EXTENSION:
-			// I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
-			return I18N::translate('PHP blocked the file because of its extension.');
-		default:
-			return 'Error: ' . $error_code;
+		    case UPLOAD_ERR_OK:
+			    return I18N::translate('File successfully uploaded');
+		    case UPLOAD_ERR_INI_SIZE:
+		    case UPLOAD_ERR_FORM_SIZE:
+			    // I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
+			    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.');
+		    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.');
+		    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.');
+		    case UPLOAD_ERR_CANT_WRITE:
+			    // I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
+			    return I18N::translate('PHP failed to write to disk.');
+		    case UPLOAD_ERR_EXTENSION:
+			    // I18N: PHP internal error message - php.net/manual/en/features.file-upload.errors.php
+			    return I18N::translate('PHP blocked the file because of its extension.');
+		    default:
+			    return 'Error: ' . $error_code;
 		}
 	}
 
@@ -273,12 +273,12 @@ 
 	 */
 	private static function reflexivePronoun(Individual $individual) {
 		switch ($individual->getSex()) {
-		case 'M':
-			return /* I18N: reflexive pronoun */ I18N::translate('himself');
-		case 'F':
-			return /* I18N: reflexive pronoun */ I18N::translate('herself');
-		default:
-			return /* I18N: reflexive pronoun - gender neutral version of himself/herself */ I18N::translate('themself');
+		    case 'M':
+			    return /* I18N: reflexive pronoun */ I18N::translate('himself');
+		    case 'F':
+			    return /* I18N: reflexive pronoun */ I18N::translate('herself');
+		    default:
+			    return /* I18N: reflexive pronoun - gender neutral version of himself/herself */ I18N::translate('themself');
 		}
 	}
 
@@ -463,127 +463,127 @@ 
 	 */
 	public static function cousinName($n, $sex) {
 		switch ($sex) {
-		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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			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. */
-			return I18N::translateContext('MALE', '%s × cousin', I18N::number($n));
-			}
-		case 'F':
-			switch ($n) {
-			case  1:
-			return I18N::translateContext('FEMALE', 'first cousin');
-			case  2:
-			return I18N::translateContext('FEMALE', 'second cousin');
-			case  3:
-			return I18N::translateContext('FEMALE', 'third cousin');
-			case  4:
-			return I18N::translateContext('FEMALE', 'fourth cousin');
-			case  5:
-			return I18N::translateContext('FEMALE', 'fifth cousin');
-			case  6:
-			return I18N::translateContext('FEMALE', 'sixth cousin');
-			case  7:
-			return I18N::translateContext('FEMALE', 'seventh cousin');
-			case  8:
-			return I18N::translateContext('FEMALE', 'eighth cousin');
-			case  9:
-			return I18N::translateContext('FEMALE', 'ninth cousin');
-			case 10:
-			return I18N::translateContext('FEMALE', 'tenth cousin');
-			case 11:
-			return I18N::translateContext('FEMALE', 'eleventh cousin');
-			case 12:
-			return I18N::translateContext('FEMALE', 'twelfth cousin');
-			case 13:
-			return I18N::translateContext('FEMALE', 'thirteenth cousin');
-			case 14:
-			return I18N::translateContext('FEMALE', 'fourteenth cousin');
-			case 15:
-			return I18N::translateContext('FEMALE', 'fifteenth cousin');
-			default:
-			return I18N::translateContext('FEMALE', '%s × cousin', I18N::number($n));
-			}
-		default:
-			switch ($n) {
-			case  1:
-			return I18N::translate('first cousin');
-			case  2:
-			return I18N::translate('second cousin');
-			case  3:
-			return I18N::translate('third cousin');
-			case  4:
-			return I18N::translate('fourth cousin');
-			case  5:
-			return I18N::translate('fifth cousin');
-			case  6:
-			return I18N::translate('sixth cousin');
-			case  7:
-			return I18N::translate('seventh cousin');
-			case  8:
-			return I18N::translate('eighth cousin');
-			case  9:
-			return I18N::translate('ninth cousin');
-			case 10:
-			return I18N::translate('tenth cousin');
-			case 11:
-			return I18N::translate('eleventh cousin');
-			case 12:
-			return I18N::translate('twelfth cousin');
-			case 13:
-			return I18N::translate('thirteenth cousin');
-			case 14:
-			return I18N::translate('fourteenth cousin');
-			case 15:
-			return I18N::translate('fifteenth cousin');
-			default:
-			return I18N::translate('%s × cousin', I18N::number($n));
-			}
+		    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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        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. */
+			        return I18N::translateContext('MALE', '%s × cousin', I18N::number($n));
+			    }
+		    case 'F':
+			    switch ($n) {
+			        case  1:
+			        return I18N::translateContext('FEMALE', 'first cousin');
+			        case  2:
+			        return I18N::translateContext('FEMALE', 'second cousin');
+			        case  3:
+			        return I18N::translateContext('FEMALE', 'third cousin');
+			        case  4:
+			        return I18N::translateContext('FEMALE', 'fourth cousin');
+			        case  5:
+			        return I18N::translateContext('FEMALE', 'fifth cousin');
+			        case  6:
+			        return I18N::translateContext('FEMALE', 'sixth cousin');
+			        case  7:
+			        return I18N::translateContext('FEMALE', 'seventh cousin');
+			        case  8:
+			        return I18N::translateContext('FEMALE', 'eighth cousin');
+			        case  9:
+			        return I18N::translateContext('FEMALE', 'ninth cousin');
+			        case 10:
+			        return I18N::translateContext('FEMALE', 'tenth cousin');
+			        case 11:
+			        return I18N::translateContext('FEMALE', 'eleventh cousin');
+			        case 12:
+			        return I18N::translateContext('FEMALE', 'twelfth cousin');
+			        case 13:
+			        return I18N::translateContext('FEMALE', 'thirteenth cousin');
+			        case 14:
+			        return I18N::translateContext('FEMALE', 'fourteenth cousin');
+			        case 15:
+			        return I18N::translateContext('FEMALE', 'fifteenth cousin');
+			        default:
+			        return I18N::translateContext('FEMALE', '%s × cousin', I18N::number($n));
+			    }
+		    default:
+			    switch ($n) {
+			        case  1:
+			        return I18N::translate('first cousin');
+			        case  2:
+			        return I18N::translate('second cousin');
+			        case  3:
+			        return I18N::translate('third cousin');
+			        case  4:
+			        return I18N::translate('fourth cousin');
+			        case  5:
+			        return I18N::translate('fifth cousin');
+			        case  6:
+			        return I18N::translate('sixth cousin');
+			        case  7:
+			        return I18N::translate('seventh cousin');
+			        case  8:
+			        return I18N::translate('eighth cousin');
+			        case  9:
+			        return I18N::translate('ninth cousin');
+			        case 10:
+			        return I18N::translate('tenth cousin');
+			        case 11:
+			        return I18N::translate('eleventh cousin');
+			        case 12:
+			        return I18N::translate('twelfth cousin');
+			        case 13:
+			        return I18N::translate('thirteenth cousin');
+			        case 14:
+			        return I18N::translate('fourteenth cousin');
+			        case 15:
+			        return I18N::translate('fifteenth cousin');
+			        default:
+			        return I18N::translate('%s × cousin', I18N::number($n));
+			    }
 		}
 	}
 
@@ -599,51 +599,51 @@ 
 	 */
 	public static function cousinName2($n, $sex, $relation) {
 		switch ($sex) {
-		case 'M':
-			switch ($n) {
-			case  1:
-				return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('MALE', 'first %s', $relation);
-			case  2:
-				return I18N::translateContext('MALE', 'second %s', $relation);
-			case  3:
-				return I18N::translateContext('MALE', 'third %s', $relation);
-			case  4:
-				return I18N::translateContext('MALE', 'fourth %s', $relation);
-			case  5:
-				return I18N::translateContext('MALE', 'fifth %s', $relation);
-			default:
-				return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('MALE', '%1$s × %2$s', I18N::number($n), $relation);
-			}
-		case 'F':
-			switch ($n) {
-			case  1:
-				return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('FEMALE', 'first %s', $relation);
-			case  2:
-				return I18N::translateContext('FEMALE', 'second %s', $relation);
-			case  3:
-				return I18N::translateContext('FEMALE', 'third %s', $relation);
-			case  4:
-				return I18N::translateContext('FEMALE', 'fourth %s', $relation);
-			case  5:
-				return I18N::translateContext('FEMALE', 'fifth %s', $relation);
-			default: // I18N: A Spanish relationship name, such as third great-nephew
-				return I18N::translateContext('FEMALE', '%1$s × %2$s', I18N::number($n), $relation);
-			}
-		default:
-			switch ($n) {
-			case  1:
-				return /* I18N: A Spanish relationship name, such as first great-nephew */ I18N::translate('first %s', $relation);
-			case  2:
-				return /* I18N: A Spanish relationship name, such as second great-nephew */ I18N::translate('second %s', $relation);
-			case  3:
-				return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translate('third %s', $relation);
-			case  4:
-				return /* I18N: A Spanish relationship name, such as fourth great-nephew */ I18N::translate('fourth %s', $relation);
-			case  5:
-				return /* I18N: A Spanish relationship name, such as fifth great-nephew */ I18N::translate('fifth %s', $relation);
-			default:
-				return /* I18N: A Spanish relationship name, such as 7th great-nephew */ I18N::translate('%1$s × %2$s', I18N::number($n), $relation);
-			}
+		    case 'M':
+			    switch ($n) {
+			        case  1:
+				        return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('MALE', 'first %s', $relation);
+			        case  2:
+				        return I18N::translateContext('MALE', 'second %s', $relation);
+			        case  3:
+				        return I18N::translateContext('MALE', 'third %s', $relation);
+			        case  4:
+				        return I18N::translateContext('MALE', 'fourth %s', $relation);
+			        case  5:
+				        return I18N::translateContext('MALE', 'fifth %s', $relation);
+			        default:
+				        return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('MALE', '%1$s × %2$s', I18N::number($n), $relation);
+			    }
+		    case 'F':
+			    switch ($n) {
+			        case  1:
+				        return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translateContext('FEMALE', 'first %s', $relation);
+			        case  2:
+				        return I18N::translateContext('FEMALE', 'second %s', $relation);
+			        case  3:
+				        return I18N::translateContext('FEMALE', 'third %s', $relation);
+			        case  4:
+				        return I18N::translateContext('FEMALE', 'fourth %s', $relation);
+			        case  5:
+				        return I18N::translateContext('FEMALE', 'fifth %s', $relation);
+			        default: // I18N: A Spanish relationship name, such as third great-nephew
+				        return I18N::translateContext('FEMALE', '%1$s × %2$s', I18N::number($n), $relation);
+			    }
+		    default:
+			    switch ($n) {
+			        case  1:
+				        return /* I18N: A Spanish relationship name, such as first great-nephew */ I18N::translate('first %s', $relation);
+			        case  2:
+				        return /* I18N: A Spanish relationship name, such as second great-nephew */ I18N::translate('second %s', $relation);
+			        case  3:
+				        return /* I18N: A Spanish relationship name, such as third great-nephew */ I18N::translate('third %s', $relation);
+			        case  4:
+				        return /* I18N: A Spanish relationship name, such as fourth great-nephew */ I18N::translate('fourth %s', $relation);
+			        case  5:
+				        return /* I18N: A Spanish relationship name, such as fifth great-nephew */ I18N::translate('fifth %s', $relation);
+			        default:
+				        return /* I18N: A Spanish relationship name, such as 7th great-nephew */ I18N::translate('%1$s × %2$s', I18N::number($n), $relation);
+			    }
 		}
 	}
 
@@ -680,796 +680,796 @@ 
 		}
 
 		switch ($path) {
-		case '':
-			return I18N::translate('self');
-		//  Level One relationships
-		case 'mot':
-			return I18N::translate('mother');
-		case 'fat':
-			return I18N::translate('father');
-		case 'par':
-			return I18N::translate('parent');
-		case 'hus':
-			if ($person1 && $person2) {
-				foreach ($person1->getSpouseFamilies() as $family) {
-					if ($person2 === $family->getSpouse($person1)) {
-						if ($family->getFacts('_NMR')) {
-							if ($family->getFacts(WT_EVENTS_DIV)) {
-								return I18N::translateContext('MALE', 'ex-partner');
-							} else {
-								return I18N::translateContext('MALE', 'partner');
-							}
-						} elseif ($family->getFacts(WT_EVENTS_DIV)) {
-							return I18N::translate('ex-husband');
-						}
-					}
-				}
-			}
+		    case '':
+			    return I18N::translate('self');
+		    //  Level One relationships
+		    case 'mot':
+			    return I18N::translate('mother');
+		    case 'fat':
+			    return I18N::translate('father');
+		    case 'par':
+			    return I18N::translate('parent');
+		    case 'hus':
+			    if ($person1 && $person2) {
+				    foreach ($person1->getSpouseFamilies() as $family) {
+					    if ($person2 === $family->getSpouse($person1)) {
+						    if ($family->getFacts('_NMR')) {
+							    if ($family->getFacts(WT_EVENTS_DIV)) {
+								    return I18N::translateContext('MALE', 'ex-partner');
+							    } else {
+								    return I18N::translateContext('MALE', 'partner');
+							    }
+						    } elseif ($family->getFacts(WT_EVENTS_DIV)) {
+							    return I18N::translate('ex-husband');
+						    }
+					    }
+				    }
+			    }
 
-			return I18N::translate('husband');
-		case 'wif':
-			if ($person1 && $person2) {
-				foreach ($person1->getSpouseFamilies() as $family) {
-					if ($person2 === $family->getSpouse($person1)) {
-						if ($family->getFacts('_NMR')) {
-							if ($family->getFacts(WT_EVENTS_DIV)) {
-								return I18N::translateContext('FEMALE', 'ex-partner');
-							} else {
-								return I18N::translateContext('FEMALE', 'partner');
-							}
-						} elseif ($family->getFacts(WT_EVENTS_DIV)) {
-							return I18N::translate('ex-wife');
-						}
-					}
-				}
-			}
+			    return I18N::translate('husband');
+		    case 'wif':
+			    if ($person1 && $person2) {
+				    foreach ($person1->getSpouseFamilies() as $family) {
+					    if ($person2 === $family->getSpouse($person1)) {
+						    if ($family->getFacts('_NMR')) {
+							    if ($family->getFacts(WT_EVENTS_DIV)) {
+								    return I18N::translateContext('FEMALE', 'ex-partner');
+							    } else {
+								    return I18N::translateContext('FEMALE', 'partner');
+							    }
+						    } elseif ($family->getFacts(WT_EVENTS_DIV)) {
+							    return I18N::translate('ex-wife');
+						    }
+					    }
+				    }
+			    }
 
-			return I18N::translate('wife');
-		case 'spo':
-			if ($person1 && $person2) {
-				foreach ($person1->getSpouseFamilies() as $family) {
-					if ($person2 === $family->getSpouse($person1)) {
-						if ($family->getFacts('_NMR')) {
-							if ($family->getFacts(WT_EVENTS_DIV)) {
-								return I18N::translate('ex-partner');
-							} else {
-								return I18N::translate('partner');
-							}
-						} elseif ($family->getFacts(WT_EVENTS_DIV)) {
-							return I18N::translate('ex-spouse');
-						}
-					}
-				}
-			}
+			    return I18N::translate('wife');
+		    case 'spo':
+			    if ($person1 && $person2) {
+				    foreach ($person1->getSpouseFamilies() as $family) {
+					    if ($person2 === $family->getSpouse($person1)) {
+						    if ($family->getFacts('_NMR')) {
+							    if ($family->getFacts(WT_EVENTS_DIV)) {
+								    return I18N::translate('ex-partner');
+							    } else {
+								    return I18N::translate('partner');
+							    }
+						    } elseif ($family->getFacts(WT_EVENTS_DIV)) {
+							    return I18N::translate('ex-spouse');
+						    }
+					    }
+				    }
+			    }
 
-			return I18N::translate('spouse');
-		case 'son':
-			return I18N::translate('son');
-		case 'dau':
-			return I18N::translate('daughter');
-		case 'chi':
-			return I18N::translate('child');
-		case 'bro':
-			if ($person1 && $person2) {
-				$dob1 = $person1->getBirthDate();
-				$dob2 = $person2->getBirthDate();
-				if ($dob1->isOK() && $dob2->isOK()) {
-					if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
-						// Exclude BEF, AFT, etc.
-						return I18N::translate('twin brother');
-					} elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
-						return I18N::translate('younger brother');
-					} elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
-						return I18N::translate('elder brother');
-					}
-				}
-			}
+			    return I18N::translate('spouse');
+		    case 'son':
+			    return I18N::translate('son');
+		    case 'dau':
+			    return I18N::translate('daughter');
+		    case 'chi':
+			    return I18N::translate('child');
+		    case 'bro':
+			    if ($person1 && $person2) {
+				    $dob1 = $person1->getBirthDate();
+				    $dob2 = $person2->getBirthDate();
+				    if ($dob1->isOK() && $dob2->isOK()) {
+					    if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
+						    // Exclude BEF, AFT, etc.
+						    return I18N::translate('twin brother');
+					    } elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
+						    return I18N::translate('younger brother');
+					    } elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
+						    return I18N::translate('elder brother');
+					    }
+				    }
+			    }
 
-			return I18N::translate('brother');
-		case 'sis':
-			if ($person1 && $person2) {
-				$dob1 = $person1->getBirthDate();
-				$dob2 = $person2->getBirthDate();
-				if ($dob1->isOK() && $dob2->isOK()) {
-					if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
-						// Exclude BEF, AFT, etc.
-						return I18N::translate('twin sister');
-					} elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
-						return I18N::translate('younger sister');
-					} elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
-						return I18N::translate('elder sister');
-					}
-				}
-			}
+			    return I18N::translate('brother');
+		    case 'sis':
+			    if ($person1 && $person2) {
+				    $dob1 = $person1->getBirthDate();
+				    $dob2 = $person2->getBirthDate();
+				    if ($dob1->isOK() && $dob2->isOK()) {
+					    if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
+						    // Exclude BEF, AFT, etc.
+						    return I18N::translate('twin sister');
+					    } elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
+						    return I18N::translate('younger sister');
+					    } elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
+						    return I18N::translate('elder sister');
+					    }
+				    }
+			    }
 
-			return I18N::translate('sister');
-		case 'sib':
-			if ($person1 && $person2) {
-				$dob1 = $person1->getBirthDate();
-				$dob2 = $person2->getBirthDate();
-				if ($dob1->isOK() && $dob2->isOK()) {
-					if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
-						// Exclude BEF, AFT, etc.
-						return I18N::translate('twin sibling');
-					} elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
-						return I18N::translate('younger sibling');
-					} elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
-						return I18N::translate('elder sibling');
-					}
-				}
-			}
+			    return I18N::translate('sister');
+		    case 'sib':
+			    if ($person1 && $person2) {
+				    $dob1 = $person1->getBirthDate();
+				    $dob2 = $person2->getBirthDate();
+				    if ($dob1->isOK() && $dob2->isOK()) {
+					    if (abs($dob1->julianDay() - $dob2->julianDay()) < 2 && !$dob1->minimumDate()->d !== 0 && !$dob2->minimumDate()->d !== 0) {
+						    // Exclude BEF, AFT, etc.
+						    return I18N::translate('twin sibling');
+					    } elseif ($dob1->maximumJulianDay() < $dob2->minimumJulianDay()) {
+						    return I18N::translate('younger sibling');
+					    } elseif ($dob1->minimumJulianDay() > $dob2->maximumJulianDay()) {
+						    return I18N::translate('elder sibling');
+					    }
+				    }
+			    }
 
-			return I18N::translate('sibling');
+			    return I18N::translate('sibling');
 
-		// Level Two relationships
-		case 'brochi':
-			return I18N::translateContext('brother’s child', 'nephew/niece');
-		case 'brodau':
-			return I18N::translateContext('brother’s daughter', 'niece');
-		case 'broson':
-			return I18N::translateContext('brother’s son', 'nephew');
-		case 'browif':
-			return I18N::translateContext('brother’s wife', 'sister-in-law');
-		case 'chichi':
-			return I18N::translateContext('child’s child', 'grandchild');
-		case 'chidau':
-			return I18N::translateContext('child’s daughter', 'granddaughter');
-		case 'chihus':
-			return I18N::translateContext('child’s husband', 'son-in-law');
-		case 'chison':
-			return I18N::translateContext('child’s son', 'grandson');
-		case 'chispo':
-			return I18N::translateContext('child’s spouse', 'son/daughter-in-law');
-		case 'chiwif':
-			return I18N::translateContext('child’s wife', 'daughter-in-law');
-		case 'dauchi':
-			return I18N::translateContext('daughter’s child', 'grandchild');
-		case 'daudau':
-			return I18N::translateContext('daughter’s daughter', 'granddaughter');
-		case 'dauhus':
-			return I18N::translateContext('daughter’s husband', 'son-in-law');
-		case 'dauson':
-			return I18N::translateContext('daughter’s son', 'grandson');
-		case 'fatbro':
-			return I18N::translateContext('father’s brother', 'uncle');
-		case 'fatchi':
-			return I18N::translateContext('father’s child', 'half-sibling');
-		case 'fatdau':
-			return I18N::translateContext('father’s daughter', 'half-sister');
-		case 'fatfat':
-			return I18N::translateContext('father’s father', 'paternal grandfather');
-		case 'fatmot':
-			return I18N::translateContext('father’s mother', 'paternal grandmother');
-		case 'fatpar':
-			return I18N::translateContext('father’s parent', 'paternal grandparent');
-		case 'fatsib':
-			return I18N::translateContext('father’s sibling', 'aunt/uncle');
-		case 'fatsis':
-			return I18N::translateContext('father’s sister', 'aunt');
-		case 'fatson':
-			return I18N::translateContext('father’s son', 'half-brother');
-		case 'fatwif':
-			return I18N::translateContext('father’s wife', 'step-mother');
-		case 'husbro':
-			return I18N::translateContext('husband’s brother', 'brother-in-law');
-		case 'huschi':
-			return I18N::translateContext('husband’s child', 'step-child');
-		case 'husdau':
-			return I18N::translateContext('husband’s daughter', 'step-daughter');
-		case 'husfat':
-			return I18N::translateContext('husband’s father', 'father-in-law');
-		case 'husmot':
-			return I18N::translateContext('husband’s mother', 'mother-in-law');
-		case 'hussib':
-			return I18N::translateContext('husband’s sibling', 'brother/sister-in-law');
-		case 'hussis':
-			return I18N::translateContext('husband’s sister', 'sister-in-law');
-		case 'husson':
-			return I18N::translateContext('husband’s son', 'step-son');
-		case 'motbro':
-			return I18N::translateContext('mother’s brother', 'uncle');
-		case 'motchi':
-			return I18N::translateContext('mother’s child', 'half-sibling');
-		case 'motdau':
-			return I18N::translateContext('mother’s daughter', 'half-sister');
-		case 'motfat':
-			return I18N::translateContext('mother’s father', 'maternal grandfather');
-		case 'mothus':
-			return I18N::translateContext('mother’s husband', 'step-father');
-		case 'motmot':
-			return I18N::translateContext('mother’s mother', 'maternal grandmother');
-		case 'motpar':
-			return I18N::translateContext('mother’s parent', 'maternal grandparent');
-		case 'motsib':
-			return I18N::translateContext('mother’s sibling', 'aunt/uncle');
-		case 'motsis':
-			return I18N::translateContext('mother’s sister', 'aunt');
-		case 'motson':
-			return I18N::translateContext('mother’s son', 'half-brother');
-		case 'parbro':
-			return I18N::translateContext('parent’s brother', 'uncle');
-		case 'parchi':
-			return I18N::translateContext('parent’s child', 'half-sibling');
-		case 'pardau':
-			return I18N::translateContext('parent’s daughter', 'half-sister');
-		case 'parfat':
-			return I18N::translateContext('parent’s father', 'grandfather');
-		case 'parmot':
-			return I18N::translateContext('parent’s mother', 'grandmother');
-		case 'parpar':
-			return I18N::translateContext('parent’s parent', 'grandparent');
-		case 'parsib':
-			return I18N::translateContext('parent’s sibling', 'aunt/uncle');
-		case 'parsis':
-			return I18N::translateContext('parent’s sister', 'aunt');
-		case 'parson':
-			return I18N::translateContext('parent’s son', 'half-brother');
-		case 'parspo':
-			return I18N::translateContext('parent’s spouse', 'step-parent');
-		case 'sibchi':
-			return I18N::translateContext('sibling’s child', 'nephew/niece');
-		case 'sibdau':
-			return I18N::translateContext('sibling’s daughter', 'niece');
-		case 'sibson':
-			return I18N::translateContext('sibling’s son', 'nephew');
-		case 'sibspo':
-			return I18N::translateContext('sibling’s spouse', 'brother/sister-in-law');
-		case 'sischi':
-			return I18N::translateContext('sister’s child', 'nephew/niece');
-		case 'sisdau':
-			return I18N::translateContext('sister’s daughter', 'niece');
-		case 'sishus':
-			return I18N::translateContext('sister’s husband', 'brother-in-law');
-		case 'sisson':
-			return I18N::translateContext('sister’s son', 'nephew');
-		case 'sonchi':
-			return I18N::translateContext('son’s child', 'grandchild');
-		case 'sondau':
-			return I18N::translateContext('son’s daughter', 'granddaughter');
-		case 'sonson':
-			return I18N::translateContext('son’s son', 'grandson');
-		case 'sonwif':
-			return I18N::translateContext('son’s wife', 'daughter-in-law');
-		case 'spobro':
-			return I18N::translateContext('spouse’s brother', 'brother-in-law');
-		case 'spochi':
-			return I18N::translateContext('spouse’s child', 'step-child');
-		case 'spodau':
-			return I18N::translateContext('spouse’s daughter', 'step-daughter');
-		case 'spofat':
-			return I18N::translateContext('spouse’s father', 'father-in-law');
-		case 'spomot':
-			return I18N::translateContext('spouse’s mother', 'mother-in-law');
-		case 'sposis':
-			return I18N::translateContext('spouse’s sister', 'sister-in-law');
-		case 'sposon':
-			return I18N::translateContext('spouse’s son', 'step-son');
-		case 'spopar':
-			return I18N::translateContext('spouse’s parent', 'mother/father-in-law');
-		case 'sposib':
-			return I18N::translateContext('spouse’s sibling', 'brother/sister-in-law');
-		case 'wifbro':
-			return I18N::translateContext('wife’s brother', 'brother-in-law');
-		case 'wifchi':
-			return I18N::translateContext('wife’s child', 'step-child');
-		case 'wifdau':
-			return I18N::translateContext('wife’s daughter', 'step-daughter');
-		case 'wiffat':
-			return I18N::translateContext('wife’s father', 'father-in-law');
-		case 'wifmot':
-			return I18N::translateContext('wife’s mother', 'mother-in-law');
-		case 'wifsib':
-			return I18N::translateContext('wife’s sibling', 'brother/sister-in-law');
-		case 'wifsis':
-			return I18N::translateContext('wife’s sister', 'sister-in-law');
-		case 'wifson':
-			return I18N::translateContext('wife’s son', 'step-son');
+		    // Level Two relationships
+		    case 'brochi':
+			    return I18N::translateContext('brother’s child', 'nephew/niece');
+		    case 'brodau':
+			    return I18N::translateContext('brother’s daughter', 'niece');
+		    case 'broson':
+			    return I18N::translateContext('brother’s son', 'nephew');
+		    case 'browif':
+			    return I18N::translateContext('brother’s wife', 'sister-in-law');
+		    case 'chichi':
+			    return I18N::translateContext('child’s child', 'grandchild');
+		    case 'chidau':
+			    return I18N::translateContext('child’s daughter', 'granddaughter');
+		    case 'chihus':
+			    return I18N::translateContext('child’s husband', 'son-in-law');
+		    case 'chison':
+			    return I18N::translateContext('child’s son', 'grandson');
+		    case 'chispo':
+			    return I18N::translateContext('child’s spouse', 'son/daughter-in-law');
+		    case 'chiwif':
+			    return I18N::translateContext('child’s wife', 'daughter-in-law');
+		    case 'dauchi':
+			    return I18N::translateContext('daughter’s child', 'grandchild');
+		    case 'daudau':
+			    return I18N::translateContext('daughter’s daughter', 'granddaughter');
+		    case 'dauhus':
+			    return I18N::translateContext('daughter’s husband', 'son-in-law');
+		    case 'dauson':
+			    return I18N::translateContext('daughter’s son', 'grandson');
+		    case 'fatbro':
+			    return I18N::translateContext('father’s brother', 'uncle');
+		    case 'fatchi':
+			    return I18N::translateContext('father’s child', 'half-sibling');
+		    case 'fatdau':
+			    return I18N::translateContext('father’s daughter', 'half-sister');
+		    case 'fatfat':
+			    return I18N::translateContext('father’s father', 'paternal grandfather');
+		    case 'fatmot':
+			    return I18N::translateContext('father’s mother', 'paternal grandmother');
+		    case 'fatpar':
+			    return I18N::translateContext('father’s parent', 'paternal grandparent');
+		    case 'fatsib':
+			    return I18N::translateContext('father’s sibling', 'aunt/uncle');
+		    case 'fatsis':
+			    return I18N::translateContext('father’s sister', 'aunt');
+		    case 'fatson':
+			    return I18N::translateContext('father’s son', 'half-brother');
+		    case 'fatwif':
+			    return I18N::translateContext('father’s wife', 'step-mother');
+		    case 'husbro':
+			    return I18N::translateContext('husband’s brother', 'brother-in-law');
+		    case 'huschi':
+			    return I18N::translateContext('husband’s child', 'step-child');
+		    case 'husdau':
+			    return I18N::translateContext('husband’s daughter', 'step-daughter');
+		    case 'husfat':
+			    return I18N::translateContext('husband’s father', 'father-in-law');
+		    case 'husmot':
+			    return I18N::translateContext('husband’s mother', 'mother-in-law');
+		    case 'hussib':
+			    return I18N::translateContext('husband’s sibling', 'brother/sister-in-law');
+		    case 'hussis':
+			    return I18N::translateContext('husband’s sister', 'sister-in-law');
+		    case 'husson':
+			    return I18N::translateContext('husband’s son', 'step-son');
+		    case 'motbro':
+			    return I18N::translateContext('mother’s brother', 'uncle');
+		    case 'motchi':
+			    return I18N::translateContext('mother’s child', 'half-sibling');
+		    case 'motdau':
+			    return I18N::translateContext('mother’s daughter', 'half-sister');
+		    case 'motfat':
+			    return I18N::translateContext('mother’s father', 'maternal grandfather');
+		    case 'mothus':
+			    return I18N::translateContext('mother’s husband', 'step-father');
+		    case 'motmot':
+			    return I18N::translateContext('mother’s mother', 'maternal grandmother');
+		    case 'motpar':
+			    return I18N::translateContext('mother’s parent', 'maternal grandparent');
+		    case 'motsib':
+			    return I18N::translateContext('mother’s sibling', 'aunt/uncle');
+		    case 'motsis':
+			    return I18N::translateContext('mother’s sister', 'aunt');
+		    case 'motson':
+			    return I18N::translateContext('mother’s son', 'half-brother');
+		    case 'parbro':
+			    return I18N::translateContext('parent’s brother', 'uncle');
+		    case 'parchi':
+			    return I18N::translateContext('parent’s child', 'half-sibling');
+		    case 'pardau':
+			    return I18N::translateContext('parent’s daughter', 'half-sister');
+		    case 'parfat':
+			    return I18N::translateContext('parent’s father', 'grandfather');
+		    case 'parmot':
+			    return I18N::translateContext('parent’s mother', 'grandmother');
+		    case 'parpar':
+			    return I18N::translateContext('parent’s parent', 'grandparent');
+		    case 'parsib':
+			    return I18N::translateContext('parent’s sibling', 'aunt/uncle');
+		    case 'parsis':
+			    return I18N::translateContext('parent’s sister', 'aunt');
+		    case 'parson':
+			    return I18N::translateContext('parent’s son', 'half-brother');
+		    case 'parspo':
+			    return I18N::translateContext('parent’s spouse', 'step-parent');
+		    case 'sibchi':
+			    return I18N::translateContext('sibling’s child', 'nephew/niece');
+		    case 'sibdau':
+			    return I18N::translateContext('sibling’s daughter', 'niece');
+		    case 'sibson':
+			    return I18N::translateContext('sibling’s son', 'nephew');
+		    case 'sibspo':
+			    return I18N::translateContext('sibling’s spouse', 'brother/sister-in-law');
+		    case 'sischi':
+			    return I18N::translateContext('sister’s child', 'nephew/niece');
+		    case 'sisdau':
+			    return I18N::translateContext('sister’s daughter', 'niece');
+		    case 'sishus':
+			    return I18N::translateContext('sister’s husband', 'brother-in-law');
+		    case 'sisson':
+			    return I18N::translateContext('sister’s son', 'nephew');
+		    case 'sonchi':
+			    return I18N::translateContext('son’s child', 'grandchild');
+		    case 'sondau':
+			    return I18N::translateContext('son’s daughter', 'granddaughter');
+		    case 'sonson':
+			    return I18N::translateContext('son’s son', 'grandson');
+		    case 'sonwif':
+			    return I18N::translateContext('son’s wife', 'daughter-in-law');
+		    case 'spobro':
+			    return I18N::translateContext('spouse’s brother', 'brother-in-law');
+		    case 'spochi':
+			    return I18N::translateContext('spouse’s child', 'step-child');
+		    case 'spodau':
+			    return I18N::translateContext('spouse’s daughter', 'step-daughter');
+		    case 'spofat':
+			    return I18N::translateContext('spouse’s father', 'father-in-law');
+		    case 'spomot':
+			    return I18N::translateContext('spouse’s mother', 'mother-in-law');
+		    case 'sposis':
+			    return I18N::translateContext('spouse’s sister', 'sister-in-law');
+		    case 'sposon':
+			    return I18N::translateContext('spouse’s son', 'step-son');
+		    case 'spopar':
+			    return I18N::translateContext('spouse’s parent', 'mother/father-in-law');
+		    case 'sposib':
+			    return I18N::translateContext('spouse’s sibling', 'brother/sister-in-law');
+		    case 'wifbro':
+			    return I18N::translateContext('wife’s brother', 'brother-in-law');
+		    case 'wifchi':
+			    return I18N::translateContext('wife’s child', 'step-child');
+		    case 'wifdau':
+			    return I18N::translateContext('wife’s daughter', 'step-daughter');
+		    case 'wiffat':
+			    return I18N::translateContext('wife’s father', 'father-in-law');
+		    case 'wifmot':
+			    return I18N::translateContext('wife’s mother', 'mother-in-law');
+		    case 'wifsib':
+			    return I18N::translateContext('wife’s sibling', 'brother/sister-in-law');
+		    case 'wifsis':
+			    return I18N::translateContext('wife’s sister', 'sister-in-law');
+		    case 'wifson':
+			    return I18N::translateContext('wife’s son', 'step-son');
 
-		// Level Three relationships
-		// I have commented out some of the unknown-sex relationships that are unlikely to to occur.
-		// Feel free to add them in, if you think they might be needed
-		case 'brochichi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s child’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s child’s child', 'great-nephew/niece');
-			}
-		case 'brochidau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s child’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s child’s daughter', 'great-niece');
-			}
-		case 'brochison':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s child’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s child’s son', 'great-nephew');
-			}
-		case 'brodauchi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s daughter’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s daughter’s child', 'great-nephew/niece');
-			}
-		case 'brodaudau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s daughter’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s daughter’s daughter', 'great-niece');
-			}
-		case 'brodauhus':
-			return I18N::translateContext('brother’s daughter’s husband', 'nephew-in-law');
-		case 'brodauson':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s daughter’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s daughter’s son', 'great-nephew');
-			}
-		case 'brosonchi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s son’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s son’s child', 'great-nephew/niece');
-			}
-		case 'brosondau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s son’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s son’s daughter', 'great-niece');
-			}
-		case 'brosonson':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s son’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) brother’s son’s son', 'great-nephew');
-			}
-		case 'brosonwif':
-			return I18N::translateContext('brother’s son’s wife', 'niece-in-law');
-		case 'browifbro':
-			return I18N::translateContext('brother’s wife’s brother', 'brother-in-law');
-		case 'browifsib':
-			return I18N::translateContext('brother’s wife’s sibling', 'brother/sister-in-law');
-		case 'browifsis':
-			return I18N::translateContext('brother’s wife’s sister', 'sister-in-law');
-		case 'chichichi':
-			return I18N::translateContext('child’s child’s child', 'great-grandchild');
-		case 'chichidau':
-			return I18N::translateContext('child’s child’s daughter', 'great-granddaughter');
-		case 'chichison':
-			return I18N::translateContext('child’s child’s son', 'great-grandson');
-		case 'chidauchi':
-			return I18N::translateContext('child’s daughter’s child', 'great-grandchild');
-		case 'chidaudau':
-			return I18N::translateContext('child’s daughter’s daughter', 'great-granddaughter');
-		case 'chidauhus':
-			return I18N::translateContext('child’s daughter’s husband', 'granddaughter’s husband');
-		case 'chidauson':
-			return I18N::translateContext('child’s daughter’s son', 'great-grandson');
-		case 'chisonchi':
-			return I18N::translateContext('child’s son’s child', 'great-grandchild');
-		case 'chisondau':
-			return I18N::translateContext('child’s son’s daughter', 'great-granddaughter');
-		case 'chisonson':
-			return I18N::translateContext('child’s son’s son', 'great-grandson');
-		case 'chisonwif':
-			return I18N::translateContext('child’s son’s wife', 'grandson’s wife');
-		case 'dauchichi':
-			return I18N::translateContext('daughter’s child’s child', 'great-grandchild');
-		case 'dauchidau':
-			return I18N::translateContext('daughter’s child’s daughter', 'great-granddaughter');
-		case 'dauchison':
-			return I18N::translateContext('daughter’s child’s son', 'great-grandson');
-		case 'daudauchi':
-			return I18N::translateContext('daughter’s daughter’s child', 'great-grandchild');
-		case 'daudaudau':
-			return I18N::translateContext('daughter’s daughter’s daughter', 'great-granddaughter');
-		case 'daudauhus':
-			return I18N::translateContext('daughter’s daughter’s husband', 'granddaughter’s husband');
-		case 'daudauson':
-			return I18N::translateContext('daughter’s daughter’s son', 'great-grandson');
-		case 'dauhusfat':
-			return I18N::translateContext('daughter’s husband’s father', 'son-in-law’s father');
-		case 'dauhusmot':
-			return I18N::translateContext('daughter’s husband’s mother', 'son-in-law’s mother');
-		case 'dauhuspar':
-			return I18N::translateContext('daughter’s husband’s parent', 'son-in-law’s parent');
-		case 'dausonchi':
-			return I18N::translateContext('daughter’s son’s child', 'great-grandchild');
-		case 'dausondau':
-			return I18N::translateContext('daughter’s son’s daughter', 'great-granddaughter');
-		case 'dausonson':
-			return I18N::translateContext('daughter’s son’s son', 'great-grandson');
-		case 'dausonwif':
-			return I18N::translateContext('daughter’s son’s wife', 'grandson’s wife');
-		case 'fatbrochi':
-			return I18N::translateContext('father’s brother’s child', 'first cousin');
-		case 'fatbrodau':
-			return I18N::translateContext('father’s brother’s daughter', 'first cousin');
-		case 'fatbroson':
-			return I18N::translateContext('father’s brother’s son', 'first cousin');
-		case 'fatbrowif':
-			return I18N::translateContext('father’s brother’s wife', 'aunt');
-		case 'fatfatbro':
-			return I18N::translateContext('father’s father’s brother', 'great-uncle');
-		case 'fatfatfat':
-			return I18N::translateContext('father’s father’s father', 'great-grandfather');
-		case 'fatfatmot':
-			return I18N::translateContext('father’s father’s mother', 'great-grandmother');
-		case 'fatfatpar':
-			return I18N::translateContext('father’s father’s parent', 'great-grandparent');
-		case 'fatfatsib':
-			return I18N::translateContext('father’s father’s sibling', 'great-aunt/uncle');
-		case 'fatfatsis':
-			return I18N::translateContext('father’s father’s sister', 'great-aunt');
-		case 'fatmotbro':
-			return I18N::translateContext('father’s mother’s brother', 'great-uncle');
-		case 'fatmotfat':
-			return I18N::translateContext('father’s mother’s father', 'great-grandfather');
-		case 'fatmotmot':
-			return I18N::translateContext('father’s mother’s mother', 'great-grandmother');
-		case 'fatmotpar':
-			return I18N::translateContext('father’s mother’s parent', 'great-grandparent');
-		case 'fatmotsib':
-			return I18N::translateContext('father’s mother’s sibling', 'great-aunt/uncle');
-		case 'fatmotsis':
-			return I18N::translateContext('father’s mother’s sister', 'great-aunt');
-		case 'fatparbro':
-			return I18N::translateContext('father’s parent’s brother', 'great-uncle');
-		case 'fatparfat':
-			return I18N::translateContext('father’s parent’s father', 'great-grandfather');
-		case 'fatparmot':
-			return I18N::translateContext('father’s parent’s mother', 'great-grandmother');
-		case 'fatparpar':
-			return I18N::translateContext('father’s parent’s parent', 'great-grandparent');
-		case 'fatparsib':
-			return I18N::translateContext('father’s parent’s sibling', 'great-aunt/uncle');
-		case 'fatparsis':
-			return I18N::translateContext('father’s parent’s sister', 'great-aunt');
-		case 'fatsischi':
-			return I18N::translateContext('father’s sister’s child', 'first cousin');
-		case 'fatsisdau':
-			return I18N::translateContext('father’s sister’s daughter', 'first cousin');
-		case 'fatsishus':
-			return I18N::translateContext('father’s sister’s husband', 'uncle');
-		case 'fatsisson':
-			return I18N::translateContext('father’s sister’s son', 'first cousin');
-		case 'fatwifchi':
-			return I18N::translateContext('father’s wife’s child', 'step-sibling');
-		case 'fatwifdau':
-			return I18N::translateContext('father’s wife’s daughter', 'step-sister');
-		case 'fatwifson':
-			return I18N::translateContext('father’s wife’s son', 'step-brother');
-		case 'husbrowif':
-			return I18N::translateContext('husband’s brother’s wife', 'sister-in-law');
-		case 'hussishus':
-			return I18N::translateContext('husband’s sister’s husband', 'brother-in-law');
-		case 'motbrochi':
-			return I18N::translateContext('mother’s brother’s child', 'first cousin');
-		case 'motbrodau':
-			return I18N::translateContext('mother’s brother’s daughter', 'first cousin');
-		case 'motbroson':
-			return I18N::translateContext('mother’s brother’s son', 'first cousin');
-		case 'motbrowif':
-			return I18N::translateContext('mother’s brother’s wife', 'aunt');
-		case 'motfatbro':
-			return I18N::translateContext('mother’s father’s brother', 'great-uncle');
-		case 'motfatfat':
-			return I18N::translateContext('mother’s father’s father', 'great-grandfather');
-		case 'motfatmot':
-			return I18N::translateContext('mother’s father’s mother', 'great-grandmother');
-		case 'motfatpar':
-			return I18N::translateContext('mother’s father’s parent', 'great-grandparent');
-		case 'motfatsib':
-			return I18N::translateContext('mother’s father’s sibling', 'great-aunt/uncle');
-		case 'motfatsis':
-			return I18N::translateContext('mother’s father’s sister', 'great-aunt');
-		case 'mothuschi':
-			return I18N::translateContext('mother’s husband’s child', 'step-sibling');
-		case 'mothusdau':
-			return I18N::translateContext('mother’s husband’s daughter', 'step-sister');
-		case 'mothusson':
-			return I18N::translateContext('mother’s husband’s son', 'step-brother');
-		case 'motmotbro':
-			return I18N::translateContext('mother’s mother’s brother', 'great-uncle');
-		case 'motmotfat':
-			return I18N::translateContext('mother’s mother’s father', 'great-grandfather');
-		case 'motmotmot':
-			return I18N::translateContext('mother’s mother’s mother', 'great-grandmother');
-		case 'motmotpar':
-			return I18N::translateContext('mother’s mother’s parent', 'great-grandparent');
-		case 'motmotsib':
-			return I18N::translateContext('mother’s mother’s sibling', 'great-aunt/uncle');
-		case 'motmotsis':
-			return I18N::translateContext('mother’s mother’s sister', 'great-aunt');
-		case 'motparbro':
-			return I18N::translateContext('mother’s parent’s brother', 'great-uncle');
-		case 'motparfat':
-			return I18N::translateContext('mother’s parent’s father', 'great-grandfather');
-		case 'motparmot':
-			return I18N::translateContext('mother’s parent’s mother', 'great-grandmother');
-		case 'motparpar':
-			return I18N::translateContext('mother’s parent’s parent', 'great-grandparent');
-		case 'motparsib':
-			return I18N::translateContext('mother’s parent’s sibling', 'great-aunt/uncle');
-		case 'motparsis':
-			return I18N::translateContext('mother’s parent’s sister', 'great-aunt');
-		case 'motsischi':
-			return I18N::translateContext('mother’s sister’s child', 'first cousin');
-		case 'motsisdau':
-			return I18N::translateContext('mother’s sister’s daughter', 'first cousin');
-		case 'motsishus':
-			return I18N::translateContext('mother’s sister’s husband', 'uncle');
-		case 'motsisson':
-			return I18N::translateContext('mother’s sister’s son', 'first cousin');
-		case 'parbrowif':
-			return I18N::translateContext('parent’s brother’s wife', 'aunt');
-		case 'parfatbro':
-			return I18N::translateContext('parent’s father’s brother', 'great-uncle');
-		case 'parfatfat':
-			return I18N::translateContext('parent’s father’s father', 'great-grandfather');
-		case 'parfatmot':
-			return I18N::translateContext('parent’s father’s mother', 'great-grandmother');
-		case 'parfatpar':
-			return I18N::translateContext('parent’s father’s parent', 'great-grandparent');
-		case 'parfatsib':
-			return I18N::translateContext('parent’s father’s sibling', 'great-aunt/uncle');
-		case 'parfatsis':
-			return I18N::translateContext('parent’s father’s sister', 'great-aunt');
-		case 'parmotbro':
-			return I18N::translateContext('parent’s mother’s brother', 'great-uncle');
-		case 'parmotfat':
-			return I18N::translateContext('parent’s mother’s father', 'great-grandfather');
-		case 'parmotmot':
-			return I18N::translateContext('parent’s mother’s mother', 'great-grandmother');
-		case 'parmotpar':
-			return I18N::translateContext('parent’s mother’s parent', 'great-grandparent');
-		case 'parmotsib':
-			return I18N::translateContext('parent’s mother’s sibling', 'great-aunt/uncle');
-		case 'parmotsis':
-			return I18N::translateContext('parent’s mother’s sister', 'great-aunt');
-		case 'parparbro':
-			return I18N::translateContext('parent’s parent’s brother', 'great-uncle');
-		case 'parparfat':
-			return I18N::translateContext('parent’s parent’s father', 'great-grandfather');
-		case 'parparmot':
-			return I18N::translateContext('parent’s parent’s mother', 'great-grandmother');
-		case 'parparpar':
-			return I18N::translateContext('parent’s parent’s parent', 'great-grandparent');
-		case 'parparsib':
-			return I18N::translateContext('parent’s parent’s sibling', 'great-aunt/uncle');
-		case 'parparsis':
-			return I18N::translateContext('parent’s parent’s sister', 'great-aunt');
-		case 'parsishus':
-			return I18N::translateContext('parent’s sister’s husband', 'uncle');
-		case 'parspochi':
-			return I18N::translateContext('parent’s spouse’s child', 'step-sibling');
-		case 'parspodau':
-			return I18N::translateContext('parent’s spouse’s daughter', 'step-sister');
-		case 'parsposon':
-			return I18N::translateContext('parent’s spouse’s son', 'step-brother');
-		case 'sibchichi':
-			return I18N::translateContext('sibling’s child’s child', 'great-nephew/niece');
-		case 'sibchidau':
-			return I18N::translateContext('sibling’s child’s daughter', 'great-niece');
-		case 'sibchison':
-			return I18N::translateContext('sibling’s child’s son', 'great-nephew');
-		case 'sibdauchi':
-			return I18N::translateContext('sibling’s daughter’s child', 'great-nephew/niece');
-		case 'sibdaudau':
-			return I18N::translateContext('sibling’s daughter’s daughter', 'great-niece');
-		case 'sibdauhus':
-			return I18N::translateContext('sibling’s daughter’s husband', 'nephew-in-law');
-		case 'sibdauson':
-			return I18N::translateContext('sibling’s daughter’s son', 'great-nephew');
-		case 'sibsonchi':
-			return I18N::translateContext('sibling’s son’s child', 'great-nephew/niece');
-		case 'sibsondau':
-			return I18N::translateContext('sibling’s son’s daughter', 'great-niece');
-		case 'sibsonson':
-			return I18N::translateContext('sibling’s son’s son', 'great-nephew');
-		case 'sibsonwif':
-			return I18N::translateContext('sibling’s son’s wife', 'niece-in-law');
-		case 'sischichi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s child’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s child’s child', 'great-nephew/niece');
-			}
-		case 'sischidau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s child’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s child’s daughter', 'great-niece');
-			}
-		case 'sischison':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s child’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s child’s son', 'great-nephew');
-			}
-		case 'sisdauchi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s daughter’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s daughter’s child', 'great-nephew/niece');
-			}
-		case 'sisdaudau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s daughter’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s daughter’s daughter', 'great-niece');
-			}
-		case 'sisdauhus':
-			return I18N::translateContext('sisters’s daughter’s husband', 'nephew-in-law');
-		case 'sisdauson':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s daughter’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s daughter’s son', 'great-nephew');
-			}
-		case 'sishusbro':
-			return I18N::translateContext('sister’s husband’s brother', 'brother-in-law');
-		case 'sishussib':
-			return I18N::translateContext('sister’s husband’s sibling', 'brother/sister-in-law');
-		case 'sishussis':
-			return I18N::translateContext('sister’s husband’s sister', 'sister-in-law');
-		case 'sissonchi':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s son’s child', 'great-nephew/niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s son’s child', 'great-nephew/niece');
-			}
-		case 'sissondau':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s son’s daughter', 'great-niece');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s son’s daughter', 'great-niece');
-			}
-		case 'sissonson':
-			if ($sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s son’s son', 'great-nephew');
-			} else {
-				return I18N::translateContext('(a woman’s) sister’s son’s son', 'great-nephew');
-			}
-		case 'sissonwif':
-			return I18N::translateContext('sisters’s son’s wife', 'niece-in-law');
-		case 'sonchichi':
-			return I18N::translateContext('son’s child’s child', 'great-grandchild');
-		case 'sonchidau':
-			return I18N::translateContext('son’s child’s daughter', 'great-granddaughter');
-		case 'sonchison':
-			return I18N::translateContext('son’s child’s son', 'great-grandson');
-		case 'sondauchi':
-			return I18N::translateContext('son’s daughter’s child', 'great-grandchild');
-		case 'sondaudau':
-			return I18N::translateContext('son’s daughter’s daughter', 'great-granddaughter');
-		case 'sondauhus':
-			return I18N::translateContext('son’s daughter’s husband', 'granddaughter’s husband');
-		case 'sondauson':
-			return I18N::translateContext('son’s daughter’s son', 'great-grandson');
-		case 'sonsonchi':
-			return I18N::translateContext('son’s son’s child', 'great-grandchild');
-		case 'sonsondau':
-			return I18N::translateContext('son’s son’s daughter', 'great-granddaughter');
-		case 'sonsonson':
-			return I18N::translateContext('son’s son’s son', 'great-grandson');
-		case 'sonsonwif':
-			return I18N::translateContext('son’s son’s wife', 'grandson’s wife');
-		case 'sonwiffat':
-			return I18N::translateContext('son’s wife’s father', 'daughter-in-law’s father');
-		case 'sonwifmot':
-			return I18N::translateContext('son’s wife’s mother', 'daughter-in-law’s mother');
-		case 'sonwifpar':
-			return I18N::translateContext('son’s wife’s parent', 'daughter-in-law’s parent');
-		case 'wifbrowif':
-			return I18N::translateContext('wife’s brother’s wife', 'sister-in-law');
-		case 'wifsishus':
-			return I18N::translateContext('wife’s sister’s husband', 'brother-in-law');
+		    // Level Three relationships
+		    // I have commented out some of the unknown-sex relationships that are unlikely to to occur.
+		    // Feel free to add them in, if you think they might be needed
+		    case 'brochichi':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) brother’s child’s child', 'great-nephew/niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) brother’s child’s child', 'great-nephew/niece');
+			    }
+		    case 'brochidau':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) brother’s child’s daughter', 'great-niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) brother’s child’s daughter', 'great-niece');
+			    }
+		    case 'brochison':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) brother’s child’s son', 'great-nephew');
+			    } else {
+				    return I18N::translateContext('(a woman’s) brother’s child’s son', 'great-nephew');
+			    }
+		    case 'brodauchi':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) brother’s daughter’s child', 'great-nephew/niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) brother’s daughter’s child', 'great-nephew/niece');
+			    }
+		    case 'brodaudau':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) brother’s daughter’s daughter', 'great-niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) brother’s daughter’s daughter', 'great-niece');
+			    }
+		    case 'brodauhus':
+			    return I18N::translateContext('brother’s daughter’s husband', 'nephew-in-law');
+		    case 'brodauson':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) brother’s daughter’s son', 'great-nephew');
+			    } else {
+				    return I18N::translateContext('(a woman’s) brother’s daughter’s son', 'great-nephew');
+			    }
+		    case 'brosonchi':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) brother’s son’s child', 'great-nephew/niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) brother’s son’s child', 'great-nephew/niece');
+			    }
+		    case 'brosondau':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) brother’s son’s daughter', 'great-niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) brother’s son’s daughter', 'great-niece');
+			    }
+		    case 'brosonson':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) brother’s son’s son', 'great-nephew');
+			    } else {
+				    return I18N::translateContext('(a woman’s) brother’s son’s son', 'great-nephew');
+			    }
+		    case 'brosonwif':
+			    return I18N::translateContext('brother’s son’s wife', 'niece-in-law');
+		    case 'browifbro':
+			    return I18N::translateContext('brother’s wife’s brother', 'brother-in-law');
+		    case 'browifsib':
+			    return I18N::translateContext('brother’s wife’s sibling', 'brother/sister-in-law');
+		    case 'browifsis':
+			    return I18N::translateContext('brother’s wife’s sister', 'sister-in-law');
+		    case 'chichichi':
+			    return I18N::translateContext('child’s child’s child', 'great-grandchild');
+		    case 'chichidau':
+			    return I18N::translateContext('child’s child’s daughter', 'great-granddaughter');
+		    case 'chichison':
+			    return I18N::translateContext('child’s child’s son', 'great-grandson');
+		    case 'chidauchi':
+			    return I18N::translateContext('child’s daughter’s child', 'great-grandchild');
+		    case 'chidaudau':
+			    return I18N::translateContext('child’s daughter’s daughter', 'great-granddaughter');
+		    case 'chidauhus':
+			    return I18N::translateContext('child’s daughter’s husband', 'granddaughter’s husband');
+		    case 'chidauson':
+			    return I18N::translateContext('child’s daughter’s son', 'great-grandson');
+		    case 'chisonchi':
+			    return I18N::translateContext('child’s son’s child', 'great-grandchild');
+		    case 'chisondau':
+			    return I18N::translateContext('child’s son’s daughter', 'great-granddaughter');
+		    case 'chisonson':
+			    return I18N::translateContext('child’s son’s son', 'great-grandson');
+		    case 'chisonwif':
+			    return I18N::translateContext('child’s son’s wife', 'grandson’s wife');
+		    case 'dauchichi':
+			    return I18N::translateContext('daughter’s child’s child', 'great-grandchild');
+		    case 'dauchidau':
+			    return I18N::translateContext('daughter’s child’s daughter', 'great-granddaughter');
+		    case 'dauchison':
+			    return I18N::translateContext('daughter’s child’s son', 'great-grandson');
+		    case 'daudauchi':
+			    return I18N::translateContext('daughter’s daughter’s child', 'great-grandchild');
+		    case 'daudaudau':
+			    return I18N::translateContext('daughter’s daughter’s daughter', 'great-granddaughter');
+		    case 'daudauhus':
+			    return I18N::translateContext('daughter’s daughter’s husband', 'granddaughter’s husband');
+		    case 'daudauson':
+			    return I18N::translateContext('daughter’s daughter’s son', 'great-grandson');
+		    case 'dauhusfat':
+			    return I18N::translateContext('daughter’s husband’s father', 'son-in-law’s father');
+		    case 'dauhusmot':
+			    return I18N::translateContext('daughter’s husband’s mother', 'son-in-law’s mother');
+		    case 'dauhuspar':
+			    return I18N::translateContext('daughter’s husband’s parent', 'son-in-law’s parent');
+		    case 'dausonchi':
+			    return I18N::translateContext('daughter’s son’s child', 'great-grandchild');
+		    case 'dausondau':
+			    return I18N::translateContext('daughter’s son’s daughter', 'great-granddaughter');
+		    case 'dausonson':
+			    return I18N::translateContext('daughter’s son’s son', 'great-grandson');
+		    case 'dausonwif':
+			    return I18N::translateContext('daughter’s son’s wife', 'grandson’s wife');
+		    case 'fatbrochi':
+			    return I18N::translateContext('father’s brother’s child', 'first cousin');
+		    case 'fatbrodau':
+			    return I18N::translateContext('father’s brother’s daughter', 'first cousin');
+		    case 'fatbroson':
+			    return I18N::translateContext('father’s brother’s son', 'first cousin');
+		    case 'fatbrowif':
+			    return I18N::translateContext('father’s brother’s wife', 'aunt');
+		    case 'fatfatbro':
+			    return I18N::translateContext('father’s father’s brother', 'great-uncle');
+		    case 'fatfatfat':
+			    return I18N::translateContext('father’s father’s father', 'great-grandfather');
+		    case 'fatfatmot':
+			    return I18N::translateContext('father’s father’s mother', 'great-grandmother');
+		    case 'fatfatpar':
+			    return I18N::translateContext('father’s father’s parent', 'great-grandparent');
+		    case 'fatfatsib':
+			    return I18N::translateContext('father’s father’s sibling', 'great-aunt/uncle');
+		    case 'fatfatsis':
+			    return I18N::translateContext('father’s father’s sister', 'great-aunt');
+		    case 'fatmotbro':
+			    return I18N::translateContext('father’s mother’s brother', 'great-uncle');
+		    case 'fatmotfat':
+			    return I18N::translateContext('father’s mother’s father', 'great-grandfather');
+		    case 'fatmotmot':
+			    return I18N::translateContext('father’s mother’s mother', 'great-grandmother');
+		    case 'fatmotpar':
+			    return I18N::translateContext('father’s mother’s parent', 'great-grandparent');
+		    case 'fatmotsib':
+			    return I18N::translateContext('father’s mother’s sibling', 'great-aunt/uncle');
+		    case 'fatmotsis':
+			    return I18N::translateContext('father’s mother’s sister', 'great-aunt');
+		    case 'fatparbro':
+			    return I18N::translateContext('father’s parent’s brother', 'great-uncle');
+		    case 'fatparfat':
+			    return I18N::translateContext('father’s parent’s father', 'great-grandfather');
+		    case 'fatparmot':
+			    return I18N::translateContext('father’s parent’s mother', 'great-grandmother');
+		    case 'fatparpar':
+			    return I18N::translateContext('father’s parent’s parent', 'great-grandparent');
+		    case 'fatparsib':
+			    return I18N::translateContext('father’s parent’s sibling', 'great-aunt/uncle');
+		    case 'fatparsis':
+			    return I18N::translateContext('father’s parent’s sister', 'great-aunt');
+		    case 'fatsischi':
+			    return I18N::translateContext('father’s sister’s child', 'first cousin');
+		    case 'fatsisdau':
+			    return I18N::translateContext('father’s sister’s daughter', 'first cousin');
+		    case 'fatsishus':
+			    return I18N::translateContext('father’s sister’s husband', 'uncle');
+		    case 'fatsisson':
+			    return I18N::translateContext('father’s sister’s son', 'first cousin');
+		    case 'fatwifchi':
+			    return I18N::translateContext('father’s wife’s child', 'step-sibling');
+		    case 'fatwifdau':
+			    return I18N::translateContext('father’s wife’s daughter', 'step-sister');
+		    case 'fatwifson':
+			    return I18N::translateContext('father’s wife’s son', 'step-brother');
+		    case 'husbrowif':
+			    return I18N::translateContext('husband’s brother’s wife', 'sister-in-law');
+		    case 'hussishus':
+			    return I18N::translateContext('husband’s sister’s husband', 'brother-in-law');
+		    case 'motbrochi':
+			    return I18N::translateContext('mother’s brother’s child', 'first cousin');
+		    case 'motbrodau':
+			    return I18N::translateContext('mother’s brother’s daughter', 'first cousin');
+		    case 'motbroson':
+			    return I18N::translateContext('mother’s brother’s son', 'first cousin');
+		    case 'motbrowif':
+			    return I18N::translateContext('mother’s brother’s wife', 'aunt');
+		    case 'motfatbro':
+			    return I18N::translateContext('mother’s father’s brother', 'great-uncle');
+		    case 'motfatfat':
+			    return I18N::translateContext('mother’s father’s father', 'great-grandfather');
+		    case 'motfatmot':
+			    return I18N::translateContext('mother’s father’s mother', 'great-grandmother');
+		    case 'motfatpar':
+			    return I18N::translateContext('mother’s father’s parent', 'great-grandparent');
+		    case 'motfatsib':
+			    return I18N::translateContext('mother’s father’s sibling', 'great-aunt/uncle');
+		    case 'motfatsis':
+			    return I18N::translateContext('mother’s father’s sister', 'great-aunt');
+		    case 'mothuschi':
+			    return I18N::translateContext('mother’s husband’s child', 'step-sibling');
+		    case 'mothusdau':
+			    return I18N::translateContext('mother’s husband’s daughter', 'step-sister');
+		    case 'mothusson':
+			    return I18N::translateContext('mother’s husband’s son', 'step-brother');
+		    case 'motmotbro':
+			    return I18N::translateContext('mother’s mother’s brother', 'great-uncle');
+		    case 'motmotfat':
+			    return I18N::translateContext('mother’s mother’s father', 'great-grandfather');
+		    case 'motmotmot':
+			    return I18N::translateContext('mother’s mother’s mother', 'great-grandmother');
+		    case 'motmotpar':
+			    return I18N::translateContext('mother’s mother’s parent', 'great-grandparent');
+		    case 'motmotsib':
+			    return I18N::translateContext('mother’s mother’s sibling', 'great-aunt/uncle');
+		    case 'motmotsis':
+			    return I18N::translateContext('mother’s mother’s sister', 'great-aunt');
+		    case 'motparbro':
+			    return I18N::translateContext('mother’s parent’s brother', 'great-uncle');
+		    case 'motparfat':
+			    return I18N::translateContext('mother’s parent’s father', 'great-grandfather');
+		    case 'motparmot':
+			    return I18N::translateContext('mother’s parent’s mother', 'great-grandmother');
+		    case 'motparpar':
+			    return I18N::translateContext('mother’s parent’s parent', 'great-grandparent');
+		    case 'motparsib':
+			    return I18N::translateContext('mother’s parent’s sibling', 'great-aunt/uncle');
+		    case 'motparsis':
+			    return I18N::translateContext('mother’s parent’s sister', 'great-aunt');
+		    case 'motsischi':
+			    return I18N::translateContext('mother’s sister’s child', 'first cousin');
+		    case 'motsisdau':
+			    return I18N::translateContext('mother’s sister’s daughter', 'first cousin');
+		    case 'motsishus':
+			    return I18N::translateContext('mother’s sister’s husband', 'uncle');
+		    case 'motsisson':
+			    return I18N::translateContext('mother’s sister’s son', 'first cousin');
+		    case 'parbrowif':
+			    return I18N::translateContext('parent’s brother’s wife', 'aunt');
+		    case 'parfatbro':
+			    return I18N::translateContext('parent’s father’s brother', 'great-uncle');
+		    case 'parfatfat':
+			    return I18N::translateContext('parent’s father’s father', 'great-grandfather');
+		    case 'parfatmot':
+			    return I18N::translateContext('parent’s father’s mother', 'great-grandmother');
+		    case 'parfatpar':
+			    return I18N::translateContext('parent’s father’s parent', 'great-grandparent');
+		    case 'parfatsib':
+			    return I18N::translateContext('parent’s father’s sibling', 'great-aunt/uncle');
+		    case 'parfatsis':
+			    return I18N::translateContext('parent’s father’s sister', 'great-aunt');
+		    case 'parmotbro':
+			    return I18N::translateContext('parent’s mother’s brother', 'great-uncle');
+		    case 'parmotfat':
+			    return I18N::translateContext('parent’s mother’s father', 'great-grandfather');
+		    case 'parmotmot':
+			    return I18N::translateContext('parent’s mother’s mother', 'great-grandmother');
+		    case 'parmotpar':
+			    return I18N::translateContext('parent’s mother’s parent', 'great-grandparent');
+		    case 'parmotsib':
+			    return I18N::translateContext('parent’s mother’s sibling', 'great-aunt/uncle');
+		    case 'parmotsis':
+			    return I18N::translateContext('parent’s mother’s sister', 'great-aunt');
+		    case 'parparbro':
+			    return I18N::translateContext('parent’s parent’s brother', 'great-uncle');
+		    case 'parparfat':
+			    return I18N::translateContext('parent’s parent’s father', 'great-grandfather');
+		    case 'parparmot':
+			    return I18N::translateContext('parent’s parent’s mother', 'great-grandmother');
+		    case 'parparpar':
+			    return I18N::translateContext('parent’s parent’s parent', 'great-grandparent');
+		    case 'parparsib':
+			    return I18N::translateContext('parent’s parent’s sibling', 'great-aunt/uncle');
+		    case 'parparsis':
+			    return I18N::translateContext('parent’s parent’s sister', 'great-aunt');
+		    case 'parsishus':
+			    return I18N::translateContext('parent’s sister’s husband', 'uncle');
+		    case 'parspochi':
+			    return I18N::translateContext('parent’s spouse’s child', 'step-sibling');
+		    case 'parspodau':
+			    return I18N::translateContext('parent’s spouse’s daughter', 'step-sister');
+		    case 'parsposon':
+			    return I18N::translateContext('parent’s spouse’s son', 'step-brother');
+		    case 'sibchichi':
+			    return I18N::translateContext('sibling’s child’s child', 'great-nephew/niece');
+		    case 'sibchidau':
+			    return I18N::translateContext('sibling’s child’s daughter', 'great-niece');
+		    case 'sibchison':
+			    return I18N::translateContext('sibling’s child’s son', 'great-nephew');
+		    case 'sibdauchi':
+			    return I18N::translateContext('sibling’s daughter’s child', 'great-nephew/niece');
+		    case 'sibdaudau':
+			    return I18N::translateContext('sibling’s daughter’s daughter', 'great-niece');
+		    case 'sibdauhus':
+			    return I18N::translateContext('sibling’s daughter’s husband', 'nephew-in-law');
+		    case 'sibdauson':
+			    return I18N::translateContext('sibling’s daughter’s son', 'great-nephew');
+		    case 'sibsonchi':
+			    return I18N::translateContext('sibling’s son’s child', 'great-nephew/niece');
+		    case 'sibsondau':
+			    return I18N::translateContext('sibling’s son’s daughter', 'great-niece');
+		    case 'sibsonson':
+			    return I18N::translateContext('sibling’s son’s son', 'great-nephew');
+		    case 'sibsonwif':
+			    return I18N::translateContext('sibling’s son’s wife', 'niece-in-law');
+		    case 'sischichi':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) sister’s child’s child', 'great-nephew/niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) sister’s child’s child', 'great-nephew/niece');
+			    }
+		    case 'sischidau':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) sister’s child’s daughter', 'great-niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) sister’s child’s daughter', 'great-niece');
+			    }
+		    case 'sischison':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) sister’s child’s son', 'great-nephew');
+			    } else {
+				    return I18N::translateContext('(a woman’s) sister’s child’s son', 'great-nephew');
+			    }
+		    case 'sisdauchi':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) sister’s daughter’s child', 'great-nephew/niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) sister’s daughter’s child', 'great-nephew/niece');
+			    }
+		    case 'sisdaudau':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) sister’s daughter’s daughter', 'great-niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) sister’s daughter’s daughter', 'great-niece');
+			    }
+		    case 'sisdauhus':
+			    return I18N::translateContext('sisters’s daughter’s husband', 'nephew-in-law');
+		    case 'sisdauson':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) sister’s daughter’s son', 'great-nephew');
+			    } else {
+				    return I18N::translateContext('(a woman’s) sister’s daughter’s son', 'great-nephew');
+			    }
+		    case 'sishusbro':
+			    return I18N::translateContext('sister’s husband’s brother', 'brother-in-law');
+		    case 'sishussib':
+			    return I18N::translateContext('sister’s husband’s sibling', 'brother/sister-in-law');
+		    case 'sishussis':
+			    return I18N::translateContext('sister’s husband’s sister', 'sister-in-law');
+		    case 'sissonchi':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) sister’s son’s child', 'great-nephew/niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) sister’s son’s child', 'great-nephew/niece');
+			    }
+		    case 'sissondau':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) sister’s son’s daughter', 'great-niece');
+			    } else {
+				    return I18N::translateContext('(a woman’s) sister’s son’s daughter', 'great-niece');
+			    }
+		    case 'sissonson':
+			    if ($sex1 === 'M') {
+				    return I18N::translateContext('(a man’s) sister’s son’s son', 'great-nephew');
+			    } else {
+				    return I18N::translateContext('(a woman’s) sister’s son’s son', 'great-nephew');
+			    }
+		    case 'sissonwif':
+			    return I18N::translateContext('sisters’s son’s wife', 'niece-in-law');
+		    case 'sonchichi':
+			    return I18N::translateContext('son’s child’s child', 'great-grandchild');
+		    case 'sonchidau':
+			    return I18N::translateContext('son’s child’s daughter', 'great-granddaughter');
+		    case 'sonchison':
+			    return I18N::translateContext('son’s child’s son', 'great-grandson');
+		    case 'sondauchi':
+			    return I18N::translateContext('son’s daughter’s child', 'great-grandchild');
+		    case 'sondaudau':
+			    return I18N::translateContext('son’s daughter’s daughter', 'great-granddaughter');
+		    case 'sondauhus':
+			    return I18N::translateContext('son’s daughter’s husband', 'granddaughter’s husband');
+		    case 'sondauson':
+			    return I18N::translateContext('son’s daughter’s son', 'great-grandson');
+		    case 'sonsonchi':
+			    return I18N::translateContext('son’s son’s child', 'great-grandchild');
+		    case 'sonsondau':
+			    return I18N::translateContext('son’s son’s daughter', 'great-granddaughter');
+		    case 'sonsonson':
+			    return I18N::translateContext('son’s son’s son', 'great-grandson');
+		    case 'sonsonwif':
+			    return I18N::translateContext('son’s son’s wife', 'grandson’s wife');
+		    case 'sonwiffat':
+			    return I18N::translateContext('son’s wife’s father', 'daughter-in-law’s father');
+		    case 'sonwifmot':
+			    return I18N::translateContext('son’s wife’s mother', 'daughter-in-law’s mother');
+		    case 'sonwifpar':
+			    return I18N::translateContext('son’s wife’s parent', 'daughter-in-law’s parent');
+		    case 'wifbrowif':
+			    return I18N::translateContext('wife’s brother’s wife', 'sister-in-law');
+		    case 'wifsishus':
+			    return I18N::translateContext('wife’s sister’s husband', 'brother-in-law');
 
-		// Some “special case” level four relationships that have specific names in certain languages
-		case 'fatfatbrowif':
-			return I18N::translateContext('father’s father’s brother’s wife', 'great-aunt');
-		case 'fatfatsibspo':
-			return I18N::translateContext('father’s father’s sibling’s spouse', 'great-aunt/uncle');
-		case 'fatfatsishus':
-			return I18N::translateContext('father’s father’s sister’s husband', 'great-uncle');
-		case 'fatmotbrowif':
-			return I18N::translateContext('father’s mother’s brother’s wife', 'great-aunt');
-		case 'fatmotsibspo':
-			return I18N::translateContext('father’s mother’s sibling’s spouse', 'great-aunt/uncle');
-		case 'fatmotsishus':
-			return I18N::translateContext('father’s mother’s sister’s husband', 'great-uncle');
-		case 'fatparbrowif':
-			return I18N::translateContext('father’s parent’s brother’s wife', 'great-aunt');
-		case 'fatparsibspo':
-			return I18N::translateContext('father’s parent’s sibling’s spouse', 'great-aunt/uncle');
-		case 'fatparsishus':
-			return I18N::translateContext('father’s parent’s sister’s husband', 'great-uncle');
-		case 'motfatbrowif':
-			return I18N::translateContext('mother’s father’s brother’s wife', 'great-aunt');
-		case 'motfatsibspo':
-			return I18N::translateContext('mother’s father’s sibling’s spouse', 'great-aunt/uncle');
-		case 'motfatsishus':
-			return I18N::translateContext('mother’s father’s sister’s husband', 'great-uncle');
-		case 'motmotbrowif':
-			return I18N::translateContext('mother’s mother’s brother’s wife', 'great-aunt');
-		case 'motmotsibspo':
-			return I18N::translateContext('mother’s mother’s sibling’s spouse', 'great-aunt/uncle');
-		case 'motmotsishus':
-			return I18N::translateContext('mother’s mother’s sister’s husband', 'great-uncle');
-		case 'motparbrowif':
-			return I18N::translateContext('mother’s parent’s brother’s wife', 'great-aunt');
-		case 'motparsibspo':
-			return I18N::translateContext('mother’s parent’s sibling’s spouse', 'great-aunt/uncle');
-		case 'motparsishus':
-			return I18N::translateContext('mother’s parent’s sister’s husband', 'great-uncle');
-		case 'parfatbrowif':
-			return I18N::translateContext('parent’s father’s brother’s wife', 'great-aunt');
-		case 'parfatsibspo':
-			return I18N::translateContext('parent’s father’s sibling’s spouse', 'great-aunt/uncle');
-		case 'parfatsishus':
-			return I18N::translateContext('parent’s father’s sister’s husband', 'great-uncle');
-		case 'parmotbrowif':
-			return I18N::translateContext('parent’s mother’s brother’s wife', 'great-aunt');
-		case 'parmotsibspo':
-			return I18N::translateContext('parent’s mother’s sibling’s spouse', 'great-aunt/uncle');
-		case 'parmotsishus':
-			return I18N::translateContext('parent’s mother’s sister’s husband', 'great-uncle');
-		case 'parparbrowif':
-			return I18N::translateContext('parent’s parent’s brother’s wife', 'great-aunt');
-		case 'parparsibspo':
-			return I18N::translateContext('parent’s parent’s sibling’s spouse', 'great-aunt/uncle');
-		case 'parparsishus':
-			return I18N::translateContext('parent’s parent’s sister’s husband', 'great-uncle');
-		case 'fatfatbrodau':
-			return I18N::translateContext('father’s father’s brother’s daughter', 'first cousin once removed ascending');
-		case 'fatfatbroson':
-			return I18N::translateContext('father’s father’s brother’s son', 'first cousin once removed ascending');
-		case 'fatfatbrochi':
-			return I18N::translateContext('father’s father’s brother’s child', 'first cousin once removed ascending');
-		case 'fatfatsisdau':
-			return I18N::translateContext('father’s father’s sister’s daughter', 'first cousin once removed ascending');
-		case 'fatfatsisson':
-			return I18N::translateContext('father’s father’s sister’s son', 'first cousin once removed ascending');
-		case 'fatfatsischi':
-			return I18N::translateContext('father’s father’s sister’s child', 'first cousin once removed ascending');
-		case 'fatmotbrodau':
-			return I18N::translateContext('father’s mother’s brother’s daughter', 'first cousin once removed ascending');
-		case 'fatmotbroson':
-			return I18N::translateContext('father’s mother’s brother’s son', 'first cousin once removed ascending');
-		case 'fatmotbrochi':
-			return I18N::translateContext('father’s mother’s brother’s child', 'first cousin once removed ascending');
-		case 'fatmotsisdau':
-			return I18N::translateContext('father’s mother’s sister’s daughter', 'first cousin once removed ascending');
-		case 'fatmotsisson':
-			return I18N::translateContext('father’s mother’s sister’s son', 'first cousin once removed ascending');
-		case 'fatmotsischi':
-			return I18N::translateContext('father’s mother’s sister’s child', 'first cousin once removed ascending');
-		case 'motfatbrodau':
-			return I18N::translateContext('mother’s father’s brother’s daughter', 'first cousin once removed ascending');
-		case 'motfatbroson':
-			return I18N::translateContext('mother’s father’s brother’s son', 'first cousin once removed ascending');
-		case 'motfatbrochi':
-			return I18N::translateContext('mother’s father’s brother’s child', 'first cousin once removed ascending');
-		case 'motfatsisdau':
-			return I18N::translateContext('mother’s father’s sister’s daughter', 'first cousin once removed ascending');
-		case 'motfatsisson':
-			return I18N::translateContext('mother’s father’s sister’s son', 'first cousin once removed ascending');
-		case 'motfatsischi':
-			return I18N::translateContext('mother’s father’s sister’s child', 'first cousin once removed ascending');
-		case 'motmotbrodau':
-			return I18N::translateContext('mother’s mother’s brother’s daughter', 'first cousin once removed ascending');
-		case 'motmotbroson':
-			return I18N::translateContext('mother’s mother’s brother’s son', 'first cousin once removed ascending');
-		case 'motmotbrochi':
-			return I18N::translateContext('mother’s mother’s brother’s child', 'first cousin once removed ascending');
-		case 'motmotsisdau':
-			return I18N::translateContext('mother’s mother’s sister’s daughter', 'first cousin once removed ascending');
-		case 'motmotsisson':
-			return I18N::translateContext('mother’s mother’s sister’s son', 'first cousin once removed ascending');
-		case 'motmotsischi':
-			return I18N::translateContext('mother’s mother’s sister’s child', 'first cousin once removed ascending');
+		    // Some “special case” level four relationships that have specific names in certain languages
+		    case 'fatfatbrowif':
+			    return I18N::translateContext('father’s father’s brother’s wife', 'great-aunt');
+		    case 'fatfatsibspo':
+			    return I18N::translateContext('father’s father’s sibling’s spouse', 'great-aunt/uncle');
+		    case 'fatfatsishus':
+			    return I18N::translateContext('father’s father’s sister’s husband', 'great-uncle');
+		    case 'fatmotbrowif':
+			    return I18N::translateContext('father’s mother’s brother’s wife', 'great-aunt');
+		    case 'fatmotsibspo':
+			    return I18N::translateContext('father’s mother’s sibling’s spouse', 'great-aunt/uncle');
+		    case 'fatmotsishus':
+			    return I18N::translateContext('father’s mother’s sister’s husband', 'great-uncle');
+		    case 'fatparbrowif':
+			    return I18N::translateContext('father’s parent’s brother’s wife', 'great-aunt');
+		    case 'fatparsibspo':
+			    return I18N::translateContext('father’s parent’s sibling’s spouse', 'great-aunt/uncle');
+		    case 'fatparsishus':
+			    return I18N::translateContext('father’s parent’s sister’s husband', 'great-uncle');
+		    case 'motfatbrowif':
+			    return I18N::translateContext('mother’s father’s brother’s wife', 'great-aunt');
+		    case 'motfatsibspo':
+			    return I18N::translateContext('mother’s father’s sibling’s spouse', 'great-aunt/uncle');
+		    case 'motfatsishus':
+			    return I18N::translateContext('mother’s father’s sister’s husband', 'great-uncle');
+		    case 'motmotbrowif':
+			    return I18N::translateContext('mother’s mother’s brother’s wife', 'great-aunt');
+		    case 'motmotsibspo':
+			    return I18N::translateContext('mother’s mother’s sibling’s spouse', 'great-aunt/uncle');
+		    case 'motmotsishus':
+			    return I18N::translateContext('mother’s mother’s sister’s husband', 'great-uncle');
+		    case 'motparbrowif':
+			    return I18N::translateContext('mother’s parent’s brother’s wife', 'great-aunt');
+		    case 'motparsibspo':
+			    return I18N::translateContext('mother’s parent’s sibling’s spouse', 'great-aunt/uncle');
+		    case 'motparsishus':
+			    return I18N::translateContext('mother’s parent’s sister’s husband', 'great-uncle');
+		    case 'parfatbrowif':
+			    return I18N::translateContext('parent’s father’s brother’s wife', 'great-aunt');
+		    case 'parfatsibspo':
+			    return I18N::translateContext('parent’s father’s sibling’s spouse', 'great-aunt/uncle');
+		    case 'parfatsishus':
+			    return I18N::translateContext('parent’s father’s sister’s husband', 'great-uncle');
+		    case 'parmotbrowif':
+			    return I18N::translateContext('parent’s mother’s brother’s wife', 'great-aunt');
+		    case 'parmotsibspo':
+			    return I18N::translateContext('parent’s mother’s sibling’s spouse', 'great-aunt/uncle');
+		    case 'parmotsishus':
+			    return I18N::translateContext('parent’s mother’s sister’s husband', 'great-uncle');
+		    case 'parparbrowif':
+			    return I18N::translateContext('parent’s parent’s brother’s wife', 'great-aunt');
+		    case 'parparsibspo':
+			    return I18N::translateContext('parent’s parent’s sibling’s spouse', 'great-aunt/uncle');
+		    case 'parparsishus':
+			    return I18N::translateContext('parent’s parent’s sister’s husband', 'great-uncle');
+		    case 'fatfatbrodau':
+			    return I18N::translateContext('father’s father’s brother’s daughter', 'first cousin once removed ascending');
+		    case 'fatfatbroson':
+			    return I18N::translateContext('father’s father’s brother’s son', 'first cousin once removed ascending');
+		    case 'fatfatbrochi':
+			    return I18N::translateContext('father’s father’s brother’s child', 'first cousin once removed ascending');
+		    case 'fatfatsisdau':
+			    return I18N::translateContext('father’s father’s sister’s daughter', 'first cousin once removed ascending');
+		    case 'fatfatsisson':
+			    return I18N::translateContext('father’s father’s sister’s son', 'first cousin once removed ascending');
+		    case 'fatfatsischi':
+			    return I18N::translateContext('father’s father’s sister’s child', 'first cousin once removed ascending');
+		    case 'fatmotbrodau':
+			    return I18N::translateContext('father’s mother’s brother’s daughter', 'first cousin once removed ascending');
+		    case 'fatmotbroson':
+			    return I18N::translateContext('father’s mother’s brother’s son', 'first cousin once removed ascending');
+		    case 'fatmotbrochi':
+			    return I18N::translateContext('father’s mother’s brother’s child', 'first cousin once removed ascending');
+		    case 'fatmotsisdau':
+			    return I18N::translateContext('father’s mother’s sister’s daughter', 'first cousin once removed ascending');
+		    case 'fatmotsisson':
+			    return I18N::translateContext('father’s mother’s sister’s son', 'first cousin once removed ascending');
+		    case 'fatmotsischi':
+			    return I18N::translateContext('father’s mother’s sister’s child', 'first cousin once removed ascending');
+		    case 'motfatbrodau':
+			    return I18N::translateContext('mother’s father’s brother’s daughter', 'first cousin once removed ascending');
+		    case 'motfatbroson':
+			    return I18N::translateContext('mother’s father’s brother’s son', 'first cousin once removed ascending');
+		    case 'motfatbrochi':
+			    return I18N::translateContext('mother’s father’s brother’s child', 'first cousin once removed ascending');
+		    case 'motfatsisdau':
+			    return I18N::translateContext('mother’s father’s sister’s daughter', 'first cousin once removed ascending');
+		    case 'motfatsisson':
+			    return I18N::translateContext('mother’s father’s sister’s son', 'first cousin once removed ascending');
+		    case 'motfatsischi':
+			    return I18N::translateContext('mother’s father’s sister’s child', 'first cousin once removed ascending');
+		    case 'motmotbrodau':
+			    return I18N::translateContext('mother’s mother’s brother’s daughter', 'first cousin once removed ascending');
+		    case 'motmotbroson':
+			    return I18N::translateContext('mother’s mother’s brother’s son', 'first cousin once removed ascending');
+		    case 'motmotbrochi':
+			    return I18N::translateContext('mother’s mother’s brother’s child', 'first cousin once removed ascending');
+		    case 'motmotsisdau':
+			    return I18N::translateContext('mother’s mother’s sister’s daughter', 'first cousin once removed ascending');
+		    case 'motmotsisson':
+			    return I18N::translateContext('mother’s mother’s sister’s son', 'first cousin once removed ascending');
+		    case 'motmotsischi':
+			    return I18N::translateContext('mother’s mother’s sister’s child', 'first cousin once removed ascending');
 		}
 
 		// Some “special case” level five relationships that have specific names in certain languages
@@ -1535,125 +1535,125 @@ 
 			$up       = strlen($match[1]) / 3;
 			$bef_last = substr($path, -6, 3);
 			switch ($up) {
-			case 3:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great-grandfather’s brother', 'great-great-uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great-grandmother’s brother', 'great-great-uncle');
-				} else {
-				return I18N::translateContext('great-grandparent’s brother', 'great-great-uncle');
-				}
-				case 'F':
-				return I18N::translate('great-great-aunt');
-				default:
-				return I18N::translate('great-great-aunt/uncle');
-				}
-			case 4:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great-great-grandfather’s brother', 'great-great-great-uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great-great-grandmother’s brother', 'great-great-great-uncle');
-				} else {
-				return I18N::translateContext('great-great-grandparent’s brother', 'great-great-great-uncle');
-				}
-				case 'F':
-				return I18N::translate('great-great-great-aunt');
-				default:
-				return I18N::translate('great-great-great-aunt/uncle');
-				}
-			case 5:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great-great-great-grandfather’s brother', 'great ×4 uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great-great-great-grandmother’s brother', 'great ×4 uncle');
-				} else {
-				return I18N::translateContext('great-great-great-grandparent’s brother', 'great ×4 uncle');
-				}
-				case 'F':
-				return I18N::translate('great ×4 aunt');
-				default:
-				return I18N::translate('great ×4 aunt/uncle');
-				}
-			case 6:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great ×4 grandfather’s brother', 'great ×5 uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great ×4 grandmother’s brother', 'great ×5 uncle');
-				} else {
-				return I18N::translateContext('great ×4 grandparent’s brother', 'great ×5 uncle');
-				}
-				case 'F':
-				return I18N::translate('great ×5 aunt');
-				default:
-				return I18N::translate('great ×5 aunt/uncle');
-				}
-			case 7:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great ×5 grandfather’s brother', 'great ×6 uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great ×5 grandmother’s brother', 'great ×6 uncle');
-				} else {
-				return I18N::translateContext('great ×5 grandparent’s brother', 'great ×6 uncle');
-				}
-				case 'F':
-				return I18N::translate('great ×6 aunt');
-				default:
-				return I18N::translate('great ×6 aunt/uncle');
-				}
-			case 8:
-				switch ($sex2) {
-				case 'M':
-				if ($bef_last === 'fat') {
-				return I18N::translateContext('great ×6 grandfather’s brother', 'great ×7 uncle');
-				} elseif ($bef_last === 'mot') {
-				return I18N::translateContext('great ×6 grandmother’s brother', 'great ×7 uncle');
-				} else {
-				return I18N::translateContext('great ×6 grandparent’s brother', 'great ×7 uncle');
-				}
-				case 'F':
-				return I18N::translate('great ×7 aunt');
-				default:
-				return I18N::translate('great ×7 aunt/uncle');
-				}
-			default:
-				// Different languages have different rules for naming generations.
-				// An English great ×12 uncle is a Danish great ×10 uncle.
-				//
-				// Need to find out which languages use which rules.
-				switch (WT_LOCALE) {
-				case 'da':
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×%s uncle', I18N::number($up - 4));
-				case 'F':
-				return I18N::translate('great ×%s aunt', I18N::number($up - 4));
-				default:
-				return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 4));
-				}
+			    case 3:
+				    switch ($sex2) {
+				        case 'M':
+				        if ($bef_last === 'fat') {
+				        return I18N::translateContext('great-grandfather’s brother', 'great-great-uncle');
+				        } elseif ($bef_last === 'mot') {
+				        return I18N::translateContext('great-grandmother’s brother', 'great-great-uncle');
+				        } else {
+				        return I18N::translateContext('great-grandparent’s brother', 'great-great-uncle');
+				        }
+				        case 'F':
+				        return I18N::translate('great-great-aunt');
+				        default:
+				        return I18N::translate('great-great-aunt/uncle');
+				    }
+			    case 4:
+				    switch ($sex2) {
+				        case 'M':
+				        if ($bef_last === 'fat') {
+				        return I18N::translateContext('great-great-grandfather’s brother', 'great-great-great-uncle');
+				        } elseif ($bef_last === 'mot') {
+				        return I18N::translateContext('great-great-grandmother’s brother', 'great-great-great-uncle');
+				        } else {
+				        return I18N::translateContext('great-great-grandparent’s brother', 'great-great-great-uncle');
+				        }
+				        case 'F':
+				        return I18N::translate('great-great-great-aunt');
+				        default:
+				        return I18N::translate('great-great-great-aunt/uncle');
+				    }
+			    case 5:
+				    switch ($sex2) {
+				        case 'M':
+				        if ($bef_last === 'fat') {
+				        return I18N::translateContext('great-great-great-grandfather’s brother', 'great ×4 uncle');
+				        } elseif ($bef_last === 'mot') {
+				        return I18N::translateContext('great-great-great-grandmother’s brother', 'great ×4 uncle');
+				        } else {
+				        return I18N::translateContext('great-great-great-grandparent’s brother', 'great ×4 uncle');
+				        }
+				        case 'F':
+				        return I18N::translate('great ×4 aunt');
+				        default:
+				        return I18N::translate('great ×4 aunt/uncle');
+				    }
+			    case 6:
+				    switch ($sex2) {
+				        case 'M':
+				        if ($bef_last === 'fat') {
+				        return I18N::translateContext('great ×4 grandfather’s brother', 'great ×5 uncle');
+				        } elseif ($bef_last === 'mot') {
+				        return I18N::translateContext('great ×4 grandmother’s brother', 'great ×5 uncle');
+				        } else {
+				        return I18N::translateContext('great ×4 grandparent’s brother', 'great ×5 uncle');
+				        }
+				        case 'F':
+				        return I18N::translate('great ×5 aunt');
+				        default:
+				        return I18N::translate('great ×5 aunt/uncle');
+				    }
+			    case 7:
+				    switch ($sex2) {
+				        case 'M':
+				        if ($bef_last === 'fat') {
+				        return I18N::translateContext('great ×5 grandfather’s brother', 'great ×6 uncle');
+				        } elseif ($bef_last === 'mot') {
+				        return I18N::translateContext('great ×5 grandmother’s brother', 'great ×6 uncle');
+				        } else {
+				        return I18N::translateContext('great ×5 grandparent’s brother', 'great ×6 uncle');
+				        }
+				        case 'F':
+				        return I18N::translate('great ×6 aunt');
+				        default:
+				        return I18N::translate('great ×6 aunt/uncle');
+				    }
+			    case 8:
+				    switch ($sex2) {
+				        case 'M':
+				        if ($bef_last === 'fat') {
+				        return I18N::translateContext('great ×6 grandfather’s brother', 'great ×7 uncle');
+				        } elseif ($bef_last === 'mot') {
+				        return I18N::translateContext('great ×6 grandmother’s brother', 'great ×7 uncle');
+				        } else {
+				        return I18N::translateContext('great ×6 grandparent’s brother', 'great ×7 uncle');
+				        }
+				        case 'F':
+				        return I18N::translate('great ×7 aunt');
+				        default:
+				        return I18N::translate('great ×7 aunt/uncle');
+				    }
+			    default:
+				    // Different languages have different rules for naming generations.
+				    // An English great ×12 uncle is a Danish great ×10 uncle.
+				    //
+				    // Need to find out which languages use which rules.
+				    switch (WT_LOCALE) {
+				        case 'da':
+				        switch ($sex2) {
+				            case 'M':
+				            return I18N::translate('great ×%s uncle', I18N::number($up - 4));
+				            case 'F':
+				            return I18N::translate('great ×%s aunt', I18N::number($up - 4));
+				            default:
+				            return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 4));
+				        }
 				case 'pl':
 					switch ($sex2) {
-					case 'M':
-					if ($bef_last === 'fat') {
-					return I18N::translateContext('great ×(%s-1) grandfather’s brother', 'great ×%s uncle', I18N::number($up - 2));
-					} elseif ($bef_last === 'mot') {
-					return I18N::translateContext('great ×(%s-1) grandmother’s brother', 'great ×%s uncle', I18N::number($up - 2));
-					} else {
-					return I18N::translateContext('great ×(%s-1) grandparent’s brother', 'great ×%s uncle', I18N::number($up - 2));
-					}
-					case 'F':
-					return I18N::translate('great ×%s aunt', I18N::number($up - 2));
-					default:
-					return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 2));
+					    case 'M':
+					    if ($bef_last === 'fat') {
+					    return I18N::translateContext('great ×(%s-1) grandfather’s brother', 'great ×%s uncle', I18N::number($up - 2));
+					    } elseif ($bef_last === 'mot') {
+					    return I18N::translateContext('great ×(%s-1) grandmother’s brother', 'great ×%s uncle', I18N::number($up - 2));
+					    } else {
+					    return I18N::translateContext('great ×(%s-1) grandparent’s brother', 'great ×%s uncle', I18N::number($up - 2));
+					    }
+					    case 'F':
+					    return I18N::translate('great ×%s aunt', I18N::number($up - 2));
+					    default:
+					    return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 2));
 					}
 				case 'it': // Source: Michele Locati
 				case 'en_AU':
@@ -1661,12 +1661,12 @@ 
 				case 'en_US':
 				default:
 					switch ($sex2) {
-					case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
-					return I18N::translate('great ×%s uncle', I18N::number($up - 1));
-					case 'F':
-					return I18N::translate('great ×%s aunt', I18N::number($up - 1));
-					default:
-					return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 1));
+					    case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
+					    return I18N::translate('great ×%s uncle', I18N::number($up - 1));
+					    case 'F':
+					    return I18N::translate('great ×%s aunt', I18N::number($up - 1));
+					    default:
+					    return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 1));
 					}
 					}
 			}
@@ -1676,155 +1676,155 @@ 
 			$down  = strlen($match[1]) / 3 + 1; // Add one, as we count generations from the common ancestor
 			$first = substr($path, 0, 3);
 			switch ($down) {
-			case 4:
-				switch ($sex2) {
-				case 'M':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-grandson', 'great-great-nephew');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-grandson', 'great-great-nephew');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-nephew', 'great-great-nephew');
-				}
-				case 'F':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-granddaughter', 'great-great-niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-granddaughter', 'great-great-niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-niece', 'great-great-niece');
-				}
-				default:
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-grandchild', 'great-great-nephew/niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-grandchild', 'great-great-nephew/niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-nephew/niece', 'great-great-nephew/niece');
-				}
-				}
-			case 5:
-				switch ($sex2) {
-				case 'M':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-grandson', 'great-great-great-nephew');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-grandson', 'great-great-great-nephew');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-great-nephew', 'great-great-great-nephew');
-				}
-				case 'F':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-granddaughter', 'great-great-great-niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-granddaughter', 'great-great-great-niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-great-niece', 'great-great-great-niece');
-				}
-				default:
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-grandchild', 'great-great-great-nephew/niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-grandchild', 'great-great-great-nephew/niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great-great-great-nephew/niece', 'great-great-great-nephew/niece');
-				}
-				}
-			case 6:
-				switch ($sex2) {
-				case 'M':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-great-grandson', 'great ×4 nephew');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-great-grandson', 'great ×4 nephew');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×4 nephew', 'great ×4 nephew');
-				}
-				case 'F':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-great-granddaughter', 'great ×4 niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-great-granddaughter', 'great ×4 niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×4 niece', 'great ×4 niece');
-				}
-				default:
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great-great-great-grandchild', 'great ×4 nephew/niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great-great-great-grandchild', 'great ×4 nephew/niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×4 nephew/niece', 'great ×4 nephew/niece');
-				}
-				}
-			case 7:
-				switch ($sex2) {
-				case 'M':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×4 grandson', 'great ×5 nephew');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×4 grandson', 'great ×5 nephew');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×5 nephew', 'great ×5 nephew');
-				}
-				case 'F':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×4 granddaughter', 'great ×5 niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×4 granddaughter', 'great ×5 niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×5 niece', 'great ×5 niece');
-				}
-				default:
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×4 grandchild', 'great ×5 nephew/niece');
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×4 grandchild', 'great ×5 nephew/niece');
-				} else {
-				return I18N::translateContext('(a woman’s) great ×5 nephew/niece', 'great ×5 nephew/niece');
-				}
-				}
-			default:
-				// Different languages have different rules for naming generations.
-				// An English great ×12 nephew is a Polish great ×11 nephew.
-				//
-				// Need to find out which languages use which rules.
-				switch (WT_LOCALE) {
-				case 'pl': // Source: Lukasz Wilenski
-				switch ($sex2) {
-				case 'M':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 3));
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 3));
-				} else {
-				return I18N::translateContext('(a woman’s) great ×%s nephew', 'great ×%s nephew', I18N::number($down - 3));
-				}
-				case 'F':
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×(%s-1) granddaughter', 'great ×%s niece', I18N::number($down - 3));
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×(%s-1) granddaughter', 'great ×%s niece', I18N::number($down - 3));
-				} else {
-				return I18N::translateContext('(a woman’s) great ×%s niece', 'great ×%s niece', I18N::number($down - 3));
-				}
-				default:
-				if ($first === 'bro' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandchild', 'great ×%s nephew/niece', I18N::number($down - 3));
-				} elseif ($first === 'sis' && $sex1 === 'M') {
-				return I18N::translateContext('(a man’s) sister’s great ×(%s-1) grandchild', 'great ×%s nephew/niece', I18N::number($down - 3));
-				} else {
-				return I18N::translateContext('(a woman’s) great ×%s nephew/niece', 'great ×%s nephew/niece', I18N::number($down - 3));
-				}
-				}
+			    case 4:
+				    switch ($sex2) {
+				        case 'M':
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great-grandson', 'great-great-nephew');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great-grandson', 'great-great-nephew');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great-great-nephew', 'great-great-nephew');
+				        }
+				        case 'F':
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great-granddaughter', 'great-great-niece');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great-granddaughter', 'great-great-niece');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great-great-niece', 'great-great-niece');
+				        }
+				        default:
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great-grandchild', 'great-great-nephew/niece');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great-grandchild', 'great-great-nephew/niece');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great-great-nephew/niece', 'great-great-nephew/niece');
+				        }
+				    }
+			    case 5:
+				    switch ($sex2) {
+				        case 'M':
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great-great-grandson', 'great-great-great-nephew');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great-great-grandson', 'great-great-great-nephew');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great-great-great-nephew', 'great-great-great-nephew');
+				        }
+				        case 'F':
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great-great-granddaughter', 'great-great-great-niece');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great-great-granddaughter', 'great-great-great-niece');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great-great-great-niece', 'great-great-great-niece');
+				        }
+				        default:
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great-great-grandchild', 'great-great-great-nephew/niece');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great-great-grandchild', 'great-great-great-nephew/niece');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great-great-great-nephew/niece', 'great-great-great-nephew/niece');
+				        }
+				    }
+			    case 6:
+				    switch ($sex2) {
+				        case 'M':
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great-great-great-grandson', 'great ×4 nephew');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great-great-great-grandson', 'great ×4 nephew');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great ×4 nephew', 'great ×4 nephew');
+				        }
+				        case 'F':
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great-great-great-granddaughter', 'great ×4 niece');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great-great-great-granddaughter', 'great ×4 niece');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great ×4 niece', 'great ×4 niece');
+				        }
+				        default:
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great-great-great-grandchild', 'great ×4 nephew/niece');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great-great-great-grandchild', 'great ×4 nephew/niece');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great ×4 nephew/niece', 'great ×4 nephew/niece');
+				        }
+				    }
+			    case 7:
+				    switch ($sex2) {
+				        case 'M':
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great ×4 grandson', 'great ×5 nephew');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great ×4 grandson', 'great ×5 nephew');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great ×5 nephew', 'great ×5 nephew');
+				        }
+				        case 'F':
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great ×4 granddaughter', 'great ×5 niece');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great ×4 granddaughter', 'great ×5 niece');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great ×5 niece', 'great ×5 niece');
+				        }
+				        default:
+				        if ($first === 'bro' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) brother’s great ×4 grandchild', 'great ×5 nephew/niece');
+				        } elseif ($first === 'sis' && $sex1 === 'M') {
+				        return I18N::translateContext('(a man’s) sister’s great ×4 grandchild', 'great ×5 nephew/niece');
+				        } else {
+				        return I18N::translateContext('(a woman’s) great ×5 nephew/niece', 'great ×5 nephew/niece');
+				        }
+				    }
+			    default:
+				    // Different languages have different rules for naming generations.
+				    // An English great ×12 nephew is a Polish great ×11 nephew.
+				    //
+				    // Need to find out which languages use which rules.
+				    switch (WT_LOCALE) {
+				        case 'pl': // Source: Lukasz Wilenski
+				        switch ($sex2) {
+				            case 'M':
+				            if ($first === 'bro' && $sex1 === 'M') {
+				            return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 3));
+				            } elseif ($first === 'sis' && $sex1 === 'M') {
+				            return I18N::translateContext('(a man’s) sister’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 3));
+				            } else {
+				            return I18N::translateContext('(a woman’s) great ×%s nephew', 'great ×%s nephew', I18N::number($down - 3));
+				            }
+				            case 'F':
+				            if ($first === 'bro' && $sex1 === 'M') {
+				            return I18N::translateContext('(a man’s) brother’s great ×(%s-1) granddaughter', 'great ×%s niece', I18N::number($down - 3));
+				            } elseif ($first === 'sis' && $sex1 === 'M') {
+				            return I18N::translateContext('(a man’s) sister’s great ×(%s-1) granddaughter', 'great ×%s niece', I18N::number($down - 3));
+				            } else {
+				            return I18N::translateContext('(a woman’s) great ×%s niece', 'great ×%s niece', I18N::number($down - 3));
+				            }
+				            default:
+				            if ($first === 'bro' && $sex1 === 'M') {
+				            return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandchild', 'great ×%s nephew/niece', I18N::number($down - 3));
+				            } elseif ($first === 'sis' && $sex1 === 'M') {
+				            return I18N::translateContext('(a man’s) sister’s great ×(%s-1) grandchild', 'great ×%s nephew/niece', I18N::number($down - 3));
+				            } else {
+				            return I18N::translateContext('(a woman’s) great ×%s nephew/niece', 'great ×%s nephew/niece', I18N::number($down - 3));
+				            }
+				        }
 				case 'he': // Source: Meliza Amity
 					switch ($sex2) {
-					case 'M':
-					return I18N::translate('great ×%s nephew', I18N::number($down - 1));
-					case 'F':
-					return I18N::translate('great ×%s niece', I18N::number($down - 1));
-					default:
-					return I18N::translate('great ×%s nephew/niece', I18N::number($down - 1));
+					    case 'M':
+					    return I18N::translate('great ×%s nephew', I18N::number($down - 1));
+					    case 'F':
+					    return I18N::translate('great ×%s niece', I18N::number($down - 1));
+					    default:
+					    return I18N::translate('great ×%s nephew/niece', I18N::number($down - 1));
 					}
 				case 'it': // Source: Michele Locati.
 				case 'en_AU':
@@ -1832,12 +1832,12 @@ 
 				case 'en_US':
 				default:
 					switch ($sex2) {
-					case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
-					return I18N::translate('great ×%s nephew', I18N::number($down - 2));
-					case 'F':
-					return I18N::translate('great ×%s niece', I18N::number($down - 2));
-					default:
-					return I18N::translate('great ×%s nephew/niece', I18N::number($down - 2));
+					    case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
+					    return I18N::translate('great ×%s nephew', I18N::number($down - 2));
+					    case 'F':
+					    return I18N::translate('great ×%s niece', I18N::number($down - 2));
+					    default:
+					    return I18N::translate('great ×%s nephew/niece', I18N::number($down - 2));
 					}
 					}
 			}
@@ -1846,116 +1846,116 @@ 
 			// direct ancestors
 			$up = strlen($match[1]) / 3;
 			switch ($up) {
-			case 4:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great-great-grandfather');
-				case 'F':
-				return I18N::translate('great-great-grandmother');
-				default:
-				return I18N::translate('great-great-grandparent');
-				}
-			case 5:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great-great-great-grandfather');
-				case 'F':
-				return I18N::translate('great-great-great-grandmother');
-				default:
-				return I18N::translate('great-great-great-grandparent');
-				}
-			case 6:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×4 grandfather');
-				case 'F':
-				return I18N::translate('great ×4 grandmother');
-				default:
-				return I18N::translate('great ×4 grandparent');
-				}
-			case 7:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×5 grandfather');
-				case 'F':
-				return I18N::translate('great ×5 grandmother');
-				default:
-				return I18N::translate('great ×5 grandparent');
-				}
-			case 8:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×6 grandfather');
-				case 'F':
-				return I18N::translate('great ×6 grandmother');
-				default:
-				return I18N::translate('great ×6 grandparent');
-				}
-			case 9:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×7 grandfather');
-				case 'F':
-				return I18N::translate('great ×7 grandmother');
-				default:
-				return I18N::translate('great ×7 grandparent');
-				}
-			default:
-				// Different languages have different rules for naming generations.
-				// An English great ×12 grandfather is a Danish great ×11 grandfather.
-				//
-				// Need to find out which languages use which rules.
-				switch (WT_LOCALE) {
-				case 'da': // Source: Patrick Sorensen
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×%s grandfather', I18N::number($up - 3));
-				case 'F':
-				return I18N::translate('great ×%s grandmother', I18N::number($up - 3));
-				default:
-				return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
-				}
+			    case 4:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great-great-grandfather');
+				        case 'F':
+				        return I18N::translate('great-great-grandmother');
+				        default:
+				        return I18N::translate('great-great-grandparent');
+				    }
+			    case 5:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great-great-great-grandfather');
+				        case 'F':
+				        return I18N::translate('great-great-great-grandmother');
+				        default:
+				        return I18N::translate('great-great-great-grandparent');
+				    }
+			    case 6:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great ×4 grandfather');
+				        case 'F':
+				        return I18N::translate('great ×4 grandmother');
+				        default:
+				        return I18N::translate('great ×4 grandparent');
+				    }
+			    case 7:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great ×5 grandfather');
+				        case 'F':
+				        return I18N::translate('great ×5 grandmother');
+				        default:
+				        return I18N::translate('great ×5 grandparent');
+				    }
+			    case 8:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great ×6 grandfather');
+				        case 'F':
+				        return I18N::translate('great ×6 grandmother');
+				        default:
+				        return I18N::translate('great ×6 grandparent');
+				    }
+			    case 9:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great ×7 grandfather');
+				        case 'F':
+				        return I18N::translate('great ×7 grandmother');
+				        default:
+				        return I18N::translate('great ×7 grandparent');
+				    }
+			    default:
+				    // Different languages have different rules for naming generations.
+				    // An English great ×12 grandfather is a Danish great ×11 grandfather.
+				    //
+				    // Need to find out which languages use which rules.
+				    switch (WT_LOCALE) {
+				        case 'da': // Source: Patrick Sorensen
+				        switch ($sex2) {
+				            case 'M':
+				            return I18N::translate('great ×%s grandfather', I18N::number($up - 3));
+				            case 'F':
+				            return I18N::translate('great ×%s grandmother', I18N::number($up - 3));
+				            default:
+				            return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
+				        }
 				case 'it': // Source: Michele Locati
 				case 'es': // Source: Wes Groleau
 					switch ($sex2) {
-					case 'M':
-					return I18N::translate('great ×%s grandfather', I18N::number($up));
-					case 'F':
-					return I18N::translate('great ×%s grandmother', I18N::number($up));
-					default:
-					return I18N::translate('great ×%s grandparent', I18N::number($up));
+					    case 'M':
+					    return I18N::translate('great ×%s grandfather', I18N::number($up));
+					    case 'F':
+					    return I18N::translate('great ×%s grandmother', I18N::number($up));
+					    default:
+					    return I18N::translate('great ×%s grandparent', I18N::number($up));
 					}
 				case 'fr': // Source: Jacqueline Tetreault
 				case 'fr_CA':
 					switch ($sex2) {
-					case 'M':
-					return I18N::translate('great ×%s grandfather', I18N::number($up - 1));
-					case 'F':
-					return I18N::translate('great ×%s grandmother', I18N::number($up - 1));
-					default:
-					return I18N::translate('great ×%s grandparent', I18N::number($up - 1));
+					    case 'M':
+					    return I18N::translate('great ×%s grandfather', I18N::number($up - 1));
+					    case 'F':
+					    return I18N::translate('great ×%s grandmother', I18N::number($up - 1));
+					    default:
+					    return I18N::translate('great ×%s grandparent', I18N::number($up - 1));
 					}
 				case 'nn': // Source: Hogne Røed Nilsen (https://bugs.launchpad.net/webtrees/+bug/1168553)
 				case 'nb':
 					switch ($sex2) {
-					case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
-					return I18N::translate('great ×%s grandfather', I18N::number($up - 3));
-					case 'F':
-					return I18N::translate('great ×%s grandmother', I18N::number($up - 3));
-					default:
-					return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
+					    case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
+					    return I18N::translate('great ×%s grandfather', I18N::number($up - 3));
+					    case 'F':
+					    return I18N::translate('great ×%s grandmother', I18N::number($up - 3));
+					    default:
+					    return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
 					}
 				case 'en_AU':
 				case 'en_GB':
 				case 'en_US':
 				default:
 					switch ($sex2) {
-					case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
-					return I18N::translate('great ×%s grandfather', I18N::number($up - 2));
-					case 'F':
-					return I18N::translate('great ×%s grandmother', I18N::number($up - 2));
-					default:
-					return I18N::translate('great ×%s grandparent', I18N::number($up - 2));
+					    case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
+					    return I18N::translate('great ×%s grandfather', I18N::number($up - 2));
+					    case 'F':
+					    return I18N::translate('great ×%s grandmother', I18N::number($up - 2));
+					    default:
+					    return I18N::translate('great ×%s grandparent', I18N::number($up - 2));
 					}
 					}
 			}
@@ -1964,83 +1964,83 @@ 
 			// direct descendants
 			$up = strlen($match[1]) / 3;
 			switch ($up) {
-			case 4:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great-great-grandson');
-				case 'F':
-				return I18N::translate('great-great-granddaughter');
-				default:
-				return I18N::translate('great-great-grandchild');
-				}
+			    case 4:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great-great-grandson');
+				        case 'F':
+				        return I18N::translate('great-great-granddaughter');
+				        default:
+				        return I18N::translate('great-great-grandchild');
+				    }
 
-			case 5:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great-great-great-grandson');
-				case 'F':
-				return I18N::translate('great-great-great-granddaughter');
-				default:
-				return I18N::translate('great-great-great-grandchild');
-				}
+			    case 5:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great-great-great-grandson');
+				        case 'F':
+				        return I18N::translate('great-great-great-granddaughter');
+				        default:
+				        return I18N::translate('great-great-great-grandchild');
+				    }
 
-			case 6:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×4 grandson');
-				case 'F':
-				return I18N::translate('great ×4 granddaughter');
-				default:
-				return I18N::translate('great ×4 grandchild');
-				}
+			    case 6:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great ×4 grandson');
+				        case 'F':
+				        return I18N::translate('great ×4 granddaughter');
+				        default:
+				        return I18N::translate('great ×4 grandchild');
+				    }
 
-			case 7:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×5 grandson');
-				case 'F':
-				return I18N::translate('great ×5 granddaughter');
-				default:
-				return I18N::translate('great ×5 grandchild');
-				}
+			    case 7:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great ×5 grandson');
+				        case 'F':
+				        return I18N::translate('great ×5 granddaughter');
+				        default:
+				        return I18N::translate('great ×5 grandchild');
+				    }
 
-			case 8:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×6 grandson');
-				case 'F':
-				return I18N::translate('great ×6 granddaughter');
-				default:
-				return I18N::translate('great ×6 grandchild');
-				}
+			    case 8:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great ×6 grandson');
+				        case 'F':
+				        return I18N::translate('great ×6 granddaughter');
+				        default:
+				        return I18N::translate('great ×6 grandchild');
+				    }
 
-			case 9:
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×7 grandson');
-				case 'F':
-				return I18N::translate('great ×7 granddaughter');
-				default:
-				return I18N::translate('great ×7 grandchild');
-				}
+			    case 9:
+				    switch ($sex2) {
+				        case 'M':
+				        return I18N::translate('great ×7 grandson');
+				        case 'F':
+				        return I18N::translate('great ×7 granddaughter');
+				        default:
+				        return I18N::translate('great ×7 grandchild');
+				    }
 
-			default:
-				// Different languages have different rules for naming generations.
-				// An English great ×12 grandson is a Danish great ×11 grandson.
-				//
-				// Need to find out which languages use which rules.
-				switch (WT_LOCALE) {
-				case 'nn': // Source: Hogne Røed Nilsen
-				case 'nb':
-				case 'da': // Source: Patrick Sorensen
-				switch ($sex2) {
-				case 'M':
-				return I18N::translate('great ×%s grandson', I18N::number($up - 3));
-				case 'F':
-				return I18N::translate('great ×%s granddaughter', I18N::number($up - 3));
-				default:
-				return I18N::translate('great ×%s grandchild', I18N::number($up - 3));
-				}
+			    default:
+				    // Different languages have different rules for naming generations.
+				    // An English great ×12 grandson is a Danish great ×11 grandson.
+				    //
+				    // Need to find out which languages use which rules.
+				    switch (WT_LOCALE) {
+				        case 'nn': // Source: Hogne Røed Nilsen
+				        case 'nb':
+				        case 'da': // Source: Patrick Sorensen
+				        switch ($sex2) {
+				            case 'M':
+				            return I18N::translate('great ×%s grandson', I18N::number($up - 3));
+				            case 'F':
+				            return I18N::translate('great ×%s granddaughter', I18N::number($up - 3));
+				            default:
+				            return I18N::translate('great ×%s grandchild', I18N::number($up - 3));
+				        }
 				case 'it': // Source: Michele Locati
 				case 'es': // Source: Wes Groleau (adding doesn’t change behavior, but needs to be better researched)
 				case 'en_AU':
@@ -2049,12 +2049,12 @@ 
 				default:
 					switch ($sex2) {
 
-					case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
-					return I18N::translate('great ×%s grandson', I18N::number($up - 2));
-					case 'F':
-					return I18N::translate('great ×%s granddaughter', I18N::number($up - 2));
-					default:
-					return I18N::translate('great ×%s grandchild', I18N::number($up - 2));
+					    case 'M': // I18N: if you need a different number for %s, contact the developers, as a code-change is required
+					    return I18N::translate('great ×%s grandson', I18N::number($up - 2));
+					    case 'F':
+					    return I18N::translate('great ×%s granddaughter', I18N::number($up - 2));
+					    default:
+					    return I18N::translate('great ×%s grandchild', I18N::number($up - 2));
 					}
 					}
 			}
@@ -2073,68 +2073,68 @@ 
 			//
 			// Need to find out which languages use which rules.
 			switch (WT_LOCALE) {
-			case 'pl': // Source: Lukasz Wilenski
-				return self::cousinName($up + $down + 2, $sex2);
-			case 'it':
-				// Source: Michele Locati. See italian_cousins_names.zip
-				// https://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
-				if ($down == $up) {
-					return self::cousinName($cousin, $sex2);
-				} elseif ($down < $up) {
-					return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sib' . $descent, null, null));
-				} else {
-					switch ($sex2) {
-					case 'M':
-					return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('bro' . $descent, null, null));
-					case 'F':
-					return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sis' . $descent, null, null));
-					default:
-					return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sib' . $descent, null, null));
+			    case 'pl': // Source: Lukasz Wilenski
+				    return self::cousinName($up + $down + 2, $sex2);
+			    case 'it':
+				    // Source: Michele Locati. See italian_cousins_names.zip
+				    // https://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
+				    if ($down == $up) {
+					    return self::cousinName($cousin, $sex2);
+				    } elseif ($down < $up) {
+					    return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sib' . $descent, null, null));
+				    } else {
+					    switch ($sex2) {
+					        case 'M':
+					        return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('bro' . $descent, null, null));
+					        case 'F':
+					        return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sis' . $descent, null, null));
+					        default:
+					        return self::cousinName2($cousin + 1, $sex2, self::getRelationshipNameFromPath('sib' . $descent, null, null));
+					    }
 					}
-					}
-			case 'en_AU': // See: http://en.wikipedia.org/wiki/File:CousinTree.svg
-			case 'en_GB':
-			case 'en_US':
-			default:
-				switch ($removed) {
-				case 0:
-				return self::cousinName($cousin, $sex2);
-				case 1:
-				if ($up > $down) {
-				/* I18N: %s=“fifth cousin”, etc. http://www.ancestry.com/learn/library/article.aspx?article=2856 */
-				return I18N::translate('%s once removed ascending', self::cousinName($cousin, $sex2));
-				} else {
-				/* I18N: %s=“fifth cousin”, etc. http://www.ancestry.com/learn/library/article.aspx?article=2856 */
-				return I18N::translate('%s once removed descending', self::cousinName($cousin, $sex2));
-				}
-				case 2:
-				if ($up > $down) {
-				/* I18N: %s=“fifth cousin”, etc. */
-				return I18N::translate('%s twice removed ascending', self::cousinName($cousin, $sex2));
-				} else {
-				/* I18N: %s=“fifth cousin”, etc. */
-				return I18N::translate('%s twice removed descending', self::cousinName($cousin, $sex2));
-				}
-				case 3:
-				if ($up > $down) {
-				/* I18N: %s=“fifth cousin”, etc. */
-				return I18N::translate('%s three times removed ascending', self::cousinName($cousin, $sex2));
-				} else {
-				/* I18N: %s=“fifth cousin”, etc. */
-				return I18N::translate('%s three times removed descending', self::cousinName($cousin, $sex2));
-				}
-				default:
-				if ($up > $down) {
-				/* I18N: %1$s=“fifth cousin”, etc., %2$s>=4 */
-				return I18N::translate('%1$s %2$s times removed ascending', self::cousinName($cousin, $sex2), I18N::number($removed));
-				} else {
-				/* I18N: %1$s=“fifth cousin”, etc., %2$s>=4 */
-				return I18N::translate('%1$s %2$s times removed descending', self::cousinName($cousin, $sex2), I18N::number($removed));
-				}
-				}
+			    case 'en_AU': // See: http://en.wikipedia.org/wiki/File:CousinTree.svg
+			    case 'en_GB':
+			    case 'en_US':
+			    default:
+				    switch ($removed) {
+				        case 0:
+				        return self::cousinName($cousin, $sex2);
+				        case 1:
+				        if ($up > $down) {
+				        /* I18N: %s=“fifth cousin”, etc. http://www.ancestry.com/learn/library/article.aspx?article=2856 */
+				        return I18N::translate('%s once removed ascending', self::cousinName($cousin, $sex2));
+				        } else {
+				        /* I18N: %s=“fifth cousin”, etc. http://www.ancestry.com/learn/library/article.aspx?article=2856 */
+				        return I18N::translate('%s once removed descending', self::cousinName($cousin, $sex2));
+				        }
+				        case 2:
+				        if ($up > $down) {
+				        /* I18N: %s=“fifth cousin”, etc. */
+				        return I18N::translate('%s twice removed ascending', self::cousinName($cousin, $sex2));
+				        } else {
+				        /* I18N: %s=“fifth cousin”, etc. */
+				        return I18N::translate('%s twice removed descending', self::cousinName($cousin, $sex2));
+				        }
+				        case 3:
+				        if ($up > $down) {
+				        /* I18N: %s=“fifth cousin”, etc. */
+				        return I18N::translate('%s three times removed ascending', self::cousinName($cousin, $sex2));
+				        } else {
+				        /* I18N: %s=“fifth cousin”, etc. */
+				        return I18N::translate('%s three times removed descending', self::cousinName($cousin, $sex2));
+				        }
+				        default:
+				        if ($up > $down) {
+				        /* I18N: %1$s=“fifth cousin”, etc., %2$s>=4 */
+				        return I18N::translate('%1$s %2$s times removed ascending', self::cousinName($cousin, $sex2), I18N::number($removed));
+				        } else {
+				        /* I18N: %1$s=“fifth cousin”, etc., %2$s>=4 */
+				        return I18N::translate('%1$s %2$s times removed descending', self::cousinName($cousin, $sex2), I18N::number($removed));
+				        }
+				    }
 			}
 		}
 

Braces +32 added lines, -16 removed lines

@@ -26,7 +26,8 @@ 
 /**
  * Class Functions - common functions
  */
-class Functions {
+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.
@@ -36,7 +37,8 @@ 
 	 *
 	 * @return null|string
 	 */
-	public static function fetchLatestVersion() {
+	public static function fetchLatestVersion()
+	{
 		$last_update_timestamp = Site::getPreference('LATEST_WT_VERSION_TIMESTAMP');
 		if ($last_update_timestamp < WT_TIMESTAMP - 24 * 60 * 60) {
 			$row                = Database::prepare("SHOW VARIABLES LIKE 'version'")->fetchOneRow();
@@ -63,7 +65,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function fileUploadErrorText($error_code) {
+	public static function fileUploadErrorText($error_code)
+	{
 		switch ($error_code) {
 		case UPLOAD_ERR_OK:
 			return I18N::translate('File successfully uploaded');
@@ -113,7 +116,8 @@ 
 	 *
 	 * @return string the subrecord that was found or an empty string "" if not found.
 	 */
-	public static function getSubRecord($level, $tag, $gedrec, $num = 1) {
+	public static function getSubRecord($level, $tag, $gedrec, $num = 1)
+	{
 		if (empty($gedrec)) {
 			return '';
 		}
@@ -154,7 +158,8 @@ 
 	 *
 	 * @return string a string with all CONT lines merged
 	 */
-	public static function getCont($nlevel, $nrec) {
+	public static function getCont($nlevel, $nrec)
+	{
 		$text = '';
 
 		$subrecords = explode("\n", $nrec);
@@ -180,7 +185,8 @@ 
 	 *
 	 * @param Fact[] $arr
 	 */
-	public static function sortFacts(&$arr) {
+	public static function sortFacts(&$arr)
+	{
 		$dated    = array();
 		$nondated = array();
 		//-- split the array into dated and non-dated arrays
@@ -236,7 +242,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getCloseRelationshipName(Individual $individual1, Individual $individual2) {
+	public static function getCloseRelationshipName(Individual $individual1, Individual $individual2)
+	{
 		if ($individual1 === $individual2) {
 			$label = '<i class="icon-selected"></i> ' . self::reflexivePronoun($individual1);
 		} else {
@@ -254,7 +261,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getAssociateRelationshipName(Individual $individual1, Individual $individual2) {
+	public static function getAssociateRelationshipName(Individual $individual1, Individual $individual2)
+	{
 		if ($individual1 === $individual2) {
 			$label = self::reflexivePronoun($individual1);
 		} else {
@@ -271,7 +279,8 @@ 
 	 *
 	 * @return string
 	 */
-	private static function reflexivePronoun(Individual $individual) {
+	private static function reflexivePronoun(Individual $individual)
+	{
 		switch ($individual->getSex()) {
 		case 'M':
 			return /* I18N: reflexive pronoun */ I18N::translate('himself');
@@ -291,7 +300,8 @@ 
 	 *
 	 * @return array|bool An array of nodes on the relationship path, or false if no path found
 	 */
-	public static function getRelationship(Individual $person1, Individual $person2, $maxlength = 4) {
+	public static function getRelationship(Individual $person1, Individual $person2, $maxlength = 4)
+	{
 		if ($person1 === $person2) {
 			return false;
 		}
@@ -423,7 +433,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getRelationshipName($nodes) {
+	public static function getRelationshipName($nodes)
+	{
 		if (!is_array($nodes)) {
 			return '';
 		}
@@ -461,7 +472,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function cousinName($n, $sex) {
+	public static function cousinName($n, $sex)
+	{
 		switch ($sex) {
 		case 'M':
 			switch ($n) {
@@ -597,7 +609,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function cousinName2($n, $sex, $relation) {
+	public static function cousinName2($n, $sex, $relation)
+	{
 		switch ($sex) {
 		case 'M':
 			switch ($n) {
@@ -659,7 +672,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getRelationshipNameFromPath($path, Individual $person1 = null, Individual $person2 = null) {
+	public static function getRelationshipNameFromPath($path, Individual $person1 = null, Individual $person2 = null)
+	{
 		if (!preg_match('/^(mot|fat|par|hus|wif|spo|son|dau|chi|bro|sis|sib)*$/', $path)) {
 			// TODO: Update all the “3 RELA ” values in class_person
 			return '<span class="error">' . $path . '</span>';
@@ -2176,7 +2190,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getQueryUrl($overwrite = null, $separator = '&') {
+	public static function getQueryUrl($overwrite = null, $separator = '&')
+	{
 		if (empty($_GET)) {
 			$get = array();
 		} else {
@@ -2213,7 +2228,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function isFileExternal($file) {
+	public static function isFileExternal($file)
+	{
 		return strpos($file, '://') !== false;
 	}
 }

app/Functions/FunctionsDate.php

Indentation +99 added lines, -99 removed lines

@@ -22,106 +22,106 @@
  * Class FunctionsDate - common functions
  */
 class FunctionsDate {
-	/**
-	 * Convert a GEDCOM age string to localized text.
-	 *
-	 * @param string $age_string
-	 *
-	 * @return string
-	 */
-	public static function getAgeAtEvent($age_string) {
-		switch (strtoupper($age_string)) {
-		case 'CHILD':
-			return I18N::translate('Child');
-		case 'INFANT':
-			return I18N::translate('Infant');
-		case 'STILLBORN':
-			return I18N::translate('Stillborn');
-		default:
-			return preg_replace_callback(
-				array(
-					'/(\d+)([ymwd])/',
-				),
-				function ($match) {
-					switch ($match[2]) {
-					case 'y':
-						return I18N::plural('%s year', '%s years', $match[1], I18N::digits($match[1]));
-					case 'm':
-						return I18N::plural('%s month', '%s months', $match[1], I18N::digits($match[1]));
-					case 'w':
-						return I18N::plural('%s week', '%s weeks', $match[1], I18N::digits($match[1]));
-					case 'd':
-						return I18N::plural('%s day', '%s days', $match[1], I18N::digits($match[1]));
-					}
-				},
-				$age_string
-			);
-		}
-	}
+    /**
+     * Convert a GEDCOM age string to localized text.
+     *
+     * @param string $age_string
+     *
+     * @return string
+     */
+    public static function getAgeAtEvent($age_string) {
+        switch (strtoupper($age_string)) {
+        case 'CHILD':
+            return I18N::translate('Child');
+        case 'INFANT':
+            return I18N::translate('Infant');
+        case 'STILLBORN':
+            return I18N::translate('Stillborn');
+        default:
+            return preg_replace_callback(
+                array(
+                    '/(\d+)([ymwd])/',
+                ),
+                function ($match) {
+                    switch ($match[2]) {
+                    case 'y':
+                        return I18N::plural('%s year', '%s years', $match[1], I18N::digits($match[1]));
+                    case 'm':
+                        return I18N::plural('%s month', '%s months', $match[1], I18N::digits($match[1]));
+                    case 'w':
+                        return I18N::plural('%s week', '%s weeks', $match[1], I18N::digits($match[1]));
+                    case 'd':
+                        return I18N::plural('%s day', '%s days', $match[1], I18N::digits($match[1]));
+                    }
+                },
+                $age_string
+            );
+        }
+    }
 
-	/**
-	 * Convert a unix timestamp into a formatted date-time value, for logs, etc.
-	 * Don't attempt to convert into other calendars, as not all days start at
-	 * midnight, and we can only get it wrong.
-	 *
-	 * @param int $time
-	 *
-	 * @return string
-	 */
-	public static function formatTimestamp($time) {
-		$time_fmt = I18N::timeFormat();
-		// PHP::date() doesn't do I18N. Do it ourselves....
-		preg_match_all('/%[^%]/', $time_fmt, $matches);
-		foreach ($matches[0] as $match) {
-			switch ($match) {
-			case '%a':
-				$t = gmdate('His', $time);
-				if ($t == '000000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 00:00:00 */
-						I18N::translate('midnight'), $time_fmt);
-				} elseif ($t < '120000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%a” - between 00:00:01 and 11:59:59 */
-						I18N::translate('a.m.'), $time_fmt);
-				} elseif ($t == '120000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 12:00:00 */
-						I18N::translate('noon'), $time_fmt);
-				} else {
-					$time_fmt = str_replace($match, /* I18N: time format “%a” - between 12:00:01 and 23:59:59 */
-						I18N::translate('p.m.'), $time_fmt);
-				}
-				break;
-			case '%A':
-				$t = gmdate('His', $time);
-				if ($t == '000000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 00:00:00 */
-						I18N::translate('Midnight'), $time_fmt);
-				} elseif ($t < '120000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%A” - between 00:00:01 and 11:59:59 */
-						I18N::translate('A.M.'), $time_fmt);
-				} elseif ($t == '120000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 12:00:00 */
-						I18N::translate('Noon'), $time_fmt);
-				} else {
-					$time_fmt = str_replace($match, /* I18N: time format “%A” - between 12:00:01 and 23:59:59 */
-						I18N::translate('P.M.'), $time_fmt);
-				}
-				break;
-			default:
-				$time_fmt = str_replace($match, I18N::digits(gmdate(substr($match, -1), $time)), $time_fmt);
-			}
-		}
+    /**
+     * Convert a unix timestamp into a formatted date-time value, for logs, etc.
+     * Don't attempt to convert into other calendars, as not all days start at
+     * midnight, and we can only get it wrong.
+     *
+     * @param int $time
+     *
+     * @return string
+     */
+    public static function formatTimestamp($time) {
+        $time_fmt = I18N::timeFormat();
+        // PHP::date() doesn't do I18N. Do it ourselves....
+        preg_match_all('/%[^%]/', $time_fmt, $matches);
+        foreach ($matches[0] as $match) {
+            switch ($match) {
+            case '%a':
+                $t = gmdate('His', $time);
+                if ($t == '000000') {
+                    $time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 00:00:00 */
+                        I18N::translate('midnight'), $time_fmt);
+                } elseif ($t < '120000') {
+                    $time_fmt = str_replace($match, /* I18N: time format “%a” - between 00:00:01 and 11:59:59 */
+                        I18N::translate('a.m.'), $time_fmt);
+                } elseif ($t == '120000') {
+                    $time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 12:00:00 */
+                        I18N::translate('noon'), $time_fmt);
+                } else {
+                    $time_fmt = str_replace($match, /* I18N: time format “%a” - between 12:00:01 and 23:59:59 */
+                        I18N::translate('p.m.'), $time_fmt);
+                }
+                break;
+            case '%A':
+                $t = gmdate('His', $time);
+                if ($t == '000000') {
+                    $time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 00:00:00 */
+                        I18N::translate('Midnight'), $time_fmt);
+                } elseif ($t < '120000') {
+                    $time_fmt = str_replace($match, /* I18N: time format “%A” - between 00:00:01 and 11:59:59 */
+                        I18N::translate('A.M.'), $time_fmt);
+                } elseif ($t == '120000') {
+                    $time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 12:00:00 */
+                        I18N::translate('Noon'), $time_fmt);
+                } else {
+                    $time_fmt = str_replace($match, /* I18N: time format “%A” - between 12:00:01 and 23:59:59 */
+                        I18N::translate('P.M.'), $time_fmt);
+                }
+                break;
+            default:
+                $time_fmt = str_replace($match, I18N::digits(gmdate(substr($match, -1), $time)), $time_fmt);
+            }
+        }
 
-		return self::timestampToGedcomDate($time)->display() . '<span class="date"> - ' . $time_fmt . '</span>';
-	}
+        return self::timestampToGedcomDate($time)->display() . '<span class="date"> - ' . $time_fmt . '</span>';
+    }
 
-	/**
-	 * Convert a unix-style timestamp into a Date object
-	 *
-	 * @param int $time
-	 *
-	 * @return Date
-	 */
-	public static function timestampToGedcomDate($time) {
-		return new Date(strtoupper(gmdate('j M Y', $time)));
-	}
+    /**
+     * Convert a unix-style timestamp into a Date object
+     *
+     * @param int $time
+     *
+     * @return Date
+     */
+    public static function timestampToGedcomDate($time) {
+        return new Date(strtoupper(gmdate('j M Y', $time)));
+    }
 }

Switch Indentation +56 added lines, -56 removed lines

@@ -31,28 +31,28 @@ 
 	 */
 	public static function getAgeAtEvent($age_string) {
 		switch (strtoupper($age_string)) {
-		case 'CHILD':
-			return I18N::translate('Child');
-		case 'INFANT':
-			return I18N::translate('Infant');
-		case 'STILLBORN':
-			return I18N::translate('Stillborn');
-		default:
-			return preg_replace_callback(
-				array(
-					'/(\d+)([ymwd])/',
-				),
-				function ($match) {
-					switch ($match[2]) {
-					case 'y':
-						return I18N::plural('%s year', '%s years', $match[1], I18N::digits($match[1]));
-					case 'm':
-						return I18N::plural('%s month', '%s months', $match[1], I18N::digits($match[1]));
-					case 'w':
-						return I18N::plural('%s week', '%s weeks', $match[1], I18N::digits($match[1]));
-					case 'd':
-						return I18N::plural('%s day', '%s days', $match[1], I18N::digits($match[1]));
-					}
+		    case 'CHILD':
+			    return I18N::translate('Child');
+		    case 'INFANT':
+			    return I18N::translate('Infant');
+		    case 'STILLBORN':
+			    return I18N::translate('Stillborn');
+		    default:
+			    return preg_replace_callback(
+				    array(
+					    '/(\d+)([ymwd])/',
+				    ),
+				    function ($match) {
+					    switch ($match[2]) {
+					        case 'y':
+						        return I18N::plural('%s year', '%s years', $match[1], I18N::digits($match[1]));
+					        case 'm':
+						        return I18N::plural('%s month', '%s months', $match[1], I18N::digits($match[1]));
+					        case 'w':
+						        return I18N::plural('%s week', '%s weeks', $match[1], I18N::digits($match[1]));
+					        case 'd':
+						        return I18N::plural('%s day', '%s days', $match[1], I18N::digits($match[1]));
+					    }
 				},
 				$age_string
 			);
@@ -74,40 +74,40 @@ 
 		preg_match_all('/%[^%]/', $time_fmt, $matches);
 		foreach ($matches[0] as $match) {
 			switch ($match) {
-			case '%a':
-				$t = gmdate('His', $time);
-				if ($t == '000000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 00:00:00 */
-						I18N::translate('midnight'), $time_fmt);
-				} elseif ($t < '120000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%a” - between 00:00:01 and 11:59:59 */
-						I18N::translate('a.m.'), $time_fmt);
-				} elseif ($t == '120000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 12:00:00 */
-						I18N::translate('noon'), $time_fmt);
-				} else {
-					$time_fmt = str_replace($match, /* I18N: time format “%a” - between 12:00:01 and 23:59:59 */
-						I18N::translate('p.m.'), $time_fmt);
-				}
-				break;
-			case '%A':
-				$t = gmdate('His', $time);
-				if ($t == '000000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 00:00:00 */
-						I18N::translate('Midnight'), $time_fmt);
-				} elseif ($t < '120000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%A” - between 00:00:01 and 11:59:59 */
-						I18N::translate('A.M.'), $time_fmt);
-				} elseif ($t == '120000') {
-					$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 12:00:00 */
-						I18N::translate('Noon'), $time_fmt);
-				} else {
-					$time_fmt = str_replace($match, /* I18N: time format “%A” - between 12:00:01 and 23:59:59 */
-						I18N::translate('P.M.'), $time_fmt);
-				}
-				break;
-			default:
-				$time_fmt = str_replace($match, I18N::digits(gmdate(substr($match, -1), $time)), $time_fmt);
+			    case '%a':
+				    $t = gmdate('His', $time);
+				    if ($t == '000000') {
+					    $time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 00:00:00 */
+						    I18N::translate('midnight'), $time_fmt);
+				    } elseif ($t < '120000') {
+					    $time_fmt = str_replace($match, /* I18N: time format “%a” - between 00:00:01 and 11:59:59 */
+						    I18N::translate('a.m.'), $time_fmt);
+				    } elseif ($t == '120000') {
+					    $time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 12:00:00 */
+						    I18N::translate('noon'), $time_fmt);
+				    } else {
+					    $time_fmt = str_replace($match, /* I18N: time format “%a” - between 12:00:01 and 23:59:59 */
+						    I18N::translate('p.m.'), $time_fmt);
+				    }
+				    break;
+			    case '%A':
+				    $t = gmdate('His', $time);
+				    if ($t == '000000') {
+					    $time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 00:00:00 */
+						    I18N::translate('Midnight'), $time_fmt);
+				    } elseif ($t < '120000') {
+					    $time_fmt = str_replace($match, /* I18N: time format “%A” - between 00:00:01 and 11:59:59 */
+						    I18N::translate('A.M.'), $time_fmt);
+				    } elseif ($t == '120000') {
+					    $time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 12:00:00 */
+						    I18N::translate('Noon'), $time_fmt);
+				    } else {
+					    $time_fmt = str_replace($match, /* I18N: time format “%A” - between 12:00:01 and 23:59:59 */
+						    I18N::translate('P.M.'), $time_fmt);
+				    }
+				    break;
+			    default:
+				    $time_fmt = str_replace($match, I18N::digits(gmdate(substr($match, -1), $time)), $time_fmt);
 			}
 		}
 

Braces +8 added lines, -4 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * Class FunctionsDate - common functions
  */
-class FunctionsDate {
+class FunctionsDate
+{
 	/**
 	 * Convert a GEDCOM age string to localized text.
 	 *
@@ -29,7 +30,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getAgeAtEvent($age_string) {
+	public static function getAgeAtEvent($age_string)
+	{
 		switch (strtoupper($age_string)) {
 		case 'CHILD':
 			return I18N::translate('Child');
@@ -68,7 +70,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function formatTimestamp($time) {
+	public static function formatTimestamp($time)
+	{
 		$time_fmt = I18N::timeFormat();
 		// PHP::date() doesn't do I18N. Do it ourselves....
 		preg_match_all('/%[^%]/', $time_fmt, $matches);
@@ -121,7 +124,8 @@ 
 	 *
 	 * @return Date
 	 */
-	public static function timestampToGedcomDate($time) {
+	public static function timestampToGedcomDate($time)
+	{
 		return new Date(strtoupper(gmdate('j M Y', $time)));
 	}
 }

app/Functions/FunctionsDb.php

Indentation +1008 added lines, -1008 removed lines

@@ -39,1012 +39,1012 @@
  * Class FunctionsDb - common functions
  */
 class FunctionsDb {
-	/**
-	 * Fetch all records linked to a record - when deleting an object, we must
-	 * also delete all links to it.
-	 *
-	 * @param string $xref
-	 * @param int $gedcom_id
-	 *
-	 * @return string[]
-	 */
-	public static function fetchAllLinks($xref, $gedcom_id) {
-		return
-			Database::prepare(
-				"SELECT l_from FROM `##link` WHERE l_file = ? AND l_to = ?" .
-				" UNION " .
-				"SELECT xref FROM `##change` WHERE status = 'pending' AND gedcom_id = ? AND new_gedcom LIKE" .
-				" CONCAT('%@', ?, '@%') AND new_gedcom NOT LIKE CONCAT('0 @', ?, '@%')"
-			)->execute(array(
-				$gedcom_id,
-				$xref,
-				$gedcom_id,
-				$xref,
-				$xref,
-			))->fetchOneColumn();
-	}
-
-	/**
-	 * Get a list of all the sources.
-	 *
-	 * @param Tree $tree
-	 *
-	 * @return Source[] array
-	 */
-	public static function getSourceList(Tree $tree) {
-		$rows = Database::prepare(
-			"SELECT s_id AS xref, s_gedcom AS gedcom FROM `##sources` WHERE s_file = :tree_id"
-		)->execute(array(
-			'tree_id' => $tree->getTreeId(),
-		))->fetchAll();
-
-		$list = array();
-		foreach ($rows as $row) {
-			$list[] = Source::getInstance($row->xref, $tree, $row->gedcom);
-		}
-		$list = array_filter($list, function (Source $x) { return $x->canShowName(); });
-		usort($list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-
-		return $list;
-	}
-
-	/**
-	 * Get a list of all the repositories.
-	 *
-	 * @param Tree $tree
-	 *
-	 * @return Repository[] array
-	 */
-	public static function getRepositoryList(Tree $tree) {
-		$rows = Database::prepare(
-			"SELECT o_id AS xref, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'REPO' AND o_file = ?"
-		)->execute(array(
-			$tree->getTreeId(),
-		))->fetchAll();
-
-		$list = array();
-		foreach ($rows as $row) {
-			$list[] = Repository::getInstance($row->xref, $tree, $row->gedcom);
-		}
-		$list = array_filter($list, function (Repository $x) { return $x->canShowName(); });
-		usort($list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-
-		return $list;
-	}
-
-	/**
-	 * Get a list of all the shared notes.
-	 *
-	 * @param Tree $tree
-	 *
-	 * @return Note[] array
-	 */
-	public static function getNoteList(Tree $tree) {
-		$rows = Database::prepare(
-			"SELECT o_id AS xref, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'NOTE' AND o_file = :tree_id"
-		)->execute(array(
-			'tree_id' => $tree->getTreeId(),
-		))->fetchAll();
-
-		$list = array();
-		foreach ($rows as $row) {
-			$list[] = Note::getInstance($row->xref, $tree, $row->gedcom);
-		}
-		$list = array_filter($list, function (Note $x) { return $x->canShowName(); });
-		usort($list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-
-		return $list;
-	}
-
-	/**
-	 * Search all individuals
-	 *
-	 * @param string[] $query Search terms
-	 * @param Tree[] $trees The trees to search
-	 *
-	 * @return Individual[]
-	 */
-	public static function searchIndividuals(array $query, array $trees) {
-		// Convert the query into a regular expression
-		$queryregex = array();
-
-		$sql  = "SELECT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom FROM `##individuals` WHERE 1";
-		$args = array();
-
-		foreach ($query as $n => $q) {
-			$queryregex[] = preg_quote(I18N::strtoupper($q), '/');
-			$sql .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
-			$args['collate_' . $n] = I18N::collation();
-			$args['query_' . $n]   = Filter::escapeLike($q);
-		}
-
-		$sql .= " AND i_file IN (";
-		foreach ($trees as $n => $tree) {
-			$sql .= $n ? ", " : "";
-			$sql .= ":tree_id_" . $n;
-			$args['tree_id_' . $n] = $tree->getTreeId();
-		}
-		$sql .= ")";
-
-		$list = array();
-		$rows = Database::prepare($sql)->execute($args)->fetchAll();
-		foreach ($rows as $row) {
-			// SQL may have matched on private data or gedcom tags, so check again against privatized data.
-			$record = Individual::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-			// Ignore non-genealogy data
-			$gedrec = preg_replace('/\n\d (_UID|_WT_USER|FILE|FORM|TYPE|CHAN|RESN) .*/', '', $record->getGedcom());
-			// Ignore links and tags
-			$gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . '( @' . WT_REGEX_XREF . '@)?/', '', $gedrec);
-			// Re-apply the filtering
-			$gedrec = I18N::strtoupper($gedrec);
-			foreach ($queryregex as $regex) {
-				if (!preg_match('/' . $regex . '/', $gedrec)) {
-					continue 2;
-				}
-			}
-			$list[] = $record;
-		}
-		$list = array_filter($list, function (Individual $x) { return $x->canShowName(); });
-
-		return $list;
-	}
-
-	/**
-	 * Search the names of individuals
-	 *
-	 * @param string[] $query Search terms
-	 * @param Tree[] $trees The trees to search
-	 *
-	 * @return Individual[]
-	 */
-	public static function searchIndividualNames(array $query, array $trees) {
-		$sql  = "SELECT DISTINCT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom, n_full FROM `##individuals` JOIN `##name` ON i_id=n_id AND i_file=n_file WHERE 1";
-		$args = array();
-
-		// Convert the query into a SQL expression
-		foreach ($query as $n => $q) {
-			$sql .= " AND n_full COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
-			$args['collate_' . $n] = I18N::collation();
-			$args['query_' . $n]   = Filter::escapeLike($q);
-		}
-
-		$sql .= " AND i_file IN (";
-		foreach ($trees as $n => $tree) {
-			$sql .= $n ? ", " : "";
-			$sql .= ":tree_id_" . $n;
-			$args['tree_id_' . $n] = $tree->getTreeId();
-		}
-		$sql .= ")";
-		$list = array();
-		$rows = Database::prepare($sql)->execute($args)->fetchAll();
-		foreach ($rows as $row) {
-			$indi = Individual::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-			foreach ($indi->getAllNames() as $num => $name) {
-				if ($name['fullNN'] === $row->n_full) {
-					$indi->setPrimaryName($num);
-					// We need to clone $indi, as we may have multiple references to the
-					// same person in this list, and the "primary name" would otherwise
-					// be shared amongst all of them.
-					$list[] = clone $indi;
-					// Only need to match an individual on one name
-					break;
-				}
-			}
-		}
-		$list = array_filter($list, function (Individual $x) { return $x->canShowName(); });
-
-		return $list;
-	}
-
-	/**
-	 * Search for individuals names/places using phonetic matching
-	 *
-	 * @param string $soundex
-	 * @param string $lastname
-	 * @param string $firstname
-	 * @param string $place
-	 * @param Tree[] $trees
-	 *
-	 * @return Individual[]
-	 */
-	public static function searchIndividualsPhonetic($soundex, $lastname, $firstname, $place, array $trees) {
-		switch ($soundex) {
-		case 'Russell':
-			$givn_sdx = Soundex::russell($firstname);
-			$surn_sdx = Soundex::russell($lastname);
-			$plac_sdx = Soundex::russell($place);
-			break;
-		case 'DaitchM':
-			$givn_sdx = Soundex::daitchMokotoff($firstname);
-			$surn_sdx = Soundex::daitchMokotoff($lastname);
-			$plac_sdx = Soundex::daitchMokotoff($place);
-			break;
-		default:
-			throw new \DomainException('soundex: ' . $soundex);
-		}
-
-		// Nothing to search for? Return nothing.
-		if (!$givn_sdx && !$surn_sdx && !$plac_sdx) {
-			return array();
-		}
-
-		$sql  = "SELECT DISTINCT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom FROM `##individuals`";
-		$args = array();
-
-		if ($place) {
-			$sql .= " JOIN `##placelinks` ON pl_file = i_file AND pl_gid = i_id";
-			$sql .= " JOIN `##places` ON p_file = pl_file AND pl_p_id = p_id";
-		}
-		if ($firstname || $lastname) {
-			$sql .= " JOIN `##name` ON i_file=n_file AND i_id=n_id";
-		}
-		$sql .= " AND i_file IN (";
-		foreach ($trees as $n => $tree) {
-			$sql .= $n ? ", " : "";
-			$sql .= ":tree_id_" . $n;
-			$args['tree_id_' . $n] = $tree->getTreeId();
-		}
-		$sql .= ")";
-
-		if ($firstname && $givn_sdx) {
-			$sql .= " AND (";
-			$givn_sdx = explode(':', $givn_sdx);
-			foreach ($givn_sdx as $n => $sdx) {
-				$sql .= $n ? " OR " : "";
-				switch ($soundex) {
-				case 'Russell':
-					$sql .= "n_soundex_givn_std LIKE CONCAT('%', :given_name_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "n_soundex_givn_dm LIKE CONCAT('%', :given_name_" . $n . ", '%')";
-					break;
-				}
-				$args['given_name_' . $n] = $sdx;
-			}
-			$sql .= ")";
-		}
-
-		if ($lastname && $surn_sdx) {
-			$sql .= " AND (";
-			$surn_sdx = explode(':', $surn_sdx);
-			foreach ($surn_sdx as $n => $sdx) {
-				$sql .= $n ? " OR " : "";
-				switch ($soundex) {
-				case 'Russell':
-					$sql .= "n_soundex_surn_std LIKE CONCAT('%', :surname_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "n_soundex_surn_dm LIKE CONCAT('%', :surname_" . $n . ", '%')";
-					break;
-				}
-				$args['surname_' . $n] = $sdx;
-			}
-			$sql .= ")";
-		}
-
-		if ($place && $plac_sdx) {
-			$sql .= " AND (";
-			$plac_sdx = explode(':', $plac_sdx);
-			foreach ($plac_sdx as $n => $sdx) {
-				$sql .= $n ? " OR " : "";
-				switch ($soundex) {
-				case 'Russell':
-					$sql .= "p_std_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "p_dm_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
-					break;
-				}
-				$args['place_' . $n] = $sdx;
-			}
-			$sql .= ")";
-		}
-
-		$list = array();
-		$rows = Database::prepare($sql)->execute($args)->fetchAll();
-		foreach ($rows as $row) {
-			$list[] = Individual::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-		}
-		$list = array_filter($list, function (Individual $x) { return $x->canShowName(); });
-
-		return $list;
-	}
-
-	/**
-	 * Search family records
-	 *
-	 * @param string[] $query Search terms
-	 * @param Tree[] $trees The trees to search
-	 *
-	 * @return Family[]
-	 */
-	public static function searchFamilies(array $query, array $trees) {
-		// Convert the query into a regular expression
-		$queryregex = array();
-
-		$sql  = "SELECT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom FROM `##families` WHERE 1";
-		$args = array();
-
-		foreach ($query as $n => $q) {
-			$queryregex[] = preg_quote(I18N::strtoupper($q), '/');
-			$sql .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
-			$args['collate_' . $n] = I18N::collation();
-			$args['query_' . $n]   = Filter::escapeLike($q);
-		}
-
-		$sql .= " AND f_file IN (";
-		foreach ($trees as $n => $tree) {
-			$sql .= $n ? ", " : "";
-			$sql .= ":tree_id_" . $n;
-			$args['tree_id_' . $n] = $tree->getTreeId();
-		}
-		$sql .= ")";
-
-		$list = array();
-		$rows = Database::prepare($sql)->execute($args)->fetchAll();
-		foreach ($rows as $row) {
-			// SQL may have matched on private data or gedcom tags, so check again against privatized data.
-			$record = Family::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-			// Ignore non-genealogy data
-			$gedrec = preg_replace('/\n\d (_UID|_WT_USER|FILE|FORM|TYPE|CHAN|RESN) .*/', '', $record->getGedcom());
-			// Ignore links and tags
-			$gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . '( @' . WT_REGEX_XREF . '@)?/', '', $gedrec);
-			// Ignore tags
-			$gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . ' ?/', '', $gedrec);
-			// Re-apply the filtering
-			$gedrec = I18N::strtoupper($gedrec);
-			foreach ($queryregex as $regex) {
-				if (!preg_match('/' . $regex . '/', $gedrec)) {
-					continue 2;
-				}
-			}
-			$list[] = $record;
-		}
-		$list = array_filter($list, function (Family $x) { return $x->canShowName(); });
-
-		return $list;
-	}
-
-	/**
-	 * Search the names of the husb/wife in a family
-	 *
-	 * @param string[] $query Search terms
-	 * @param Tree[] $trees The trees to search
-	 *
-	 * @return Family[]
-	 */
-	public static function searchFamilyNames(array $query, array $trees) {
-		// No query => no results
-		if (!$query) {
-			return array();
-		}
-
-		$sql =
-			"SELECT DISTINCT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom" .
-			" FROM `##families`" .
-			" LEFT JOIN `##name` husb ON f_husb = husb.n_id AND f_file = husb.n_file" .
-			" LEFT JOIN `##name` wife ON f_wife = wife.n_id AND f_file = wife.n_file" .
-			" WHERE 1";
-		$args = array();
-
-		foreach ($query as $n => $q) {
-			$sql .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
-			$args['husb_collate_' . $n] = I18N::collation();
-			$args['husb_query_' . $n]   = Filter::escapeLike($q);
-			$args['wife_collate_' . $n] = I18N::collation();
-			$args['wife_query_' . $n]   = Filter::escapeLike($q);
-		}
-
-		$sql .= " AND f_file IN (";
-		foreach ($trees as $n => $tree) {
-			$sql .= $n ? ", " : "";
-			$sql .= ":tree_id_" . $n;
-			$args['tree_id_' . $n] = $tree->getTreeId();
-		}
-		$sql .= ")";
-
-		$list = array();
-		$rows = Database::prepare($sql)->execute($args)->fetchAll();
-		foreach ($rows as $row) {
-			$list[] = Family::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-		}
-
-		$list = array_filter($list, function (Family $x) use ($query) {
-			$name = I18N::strtolower(strip_tags($x->getFullName()));
-			foreach ($query as $q) {
-				if (stripos($name, I18N::strtolower($q)) === false) {
-					return false;
-				}
-			}
-
-			return true;
-		});
-
-		return $list;
-	}
-
-	/**
-	 * Search the sources
-	 *
-	 * @param string[] $query Search terms
-	 * @param Tree[] $trees The tree to search
-	 *
-	 * @return Source[]
-	 */
-	public static function searchSources($query, $trees) {
-		// Convert the query into a regular expression
-		$queryregex = array();
-
-		$sql  = "SELECT s_id AS xref, s_file AS gedcom_id, s_gedcom AS gedcom FROM `##sources` WHERE 1";
-		$args = array();
-
-		foreach ($query as $n => $q) {
-			$queryregex[] = preg_quote(I18N::strtoupper($q), '/');
-			$sql .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
-			$args['collate_' . $n] = I18N::collation();
-			$args['query_' . $n]   = Filter::escapeLike($q);
-		}
-
-		$sql .= " AND s_file IN (";
-		foreach ($trees as $n => $tree) {
-			$sql .= $n ? ", " : "";
-			$sql .= ":tree_id_" . $n;
-			$args['tree_id_' . $n] = $tree->getTreeId();
-		}
-		$sql .= ")";
-
-		$list = array();
-		$rows = Database::prepare($sql)->execute($args)->fetchAll();
-		foreach ($rows as $row) {
-			// SQL may have matched on private data or gedcom tags, so check again against privatized data.
-			$record = Source::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-			// Ignore non-genealogy data
-			$gedrec = preg_replace('/\n\d (_UID|_WT_USER|FILE|FORM|TYPE|CHAN|RESN) .*/', '', $record->getGedcom());
-			// Ignore links and tags
-			$gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . '( @' . WT_REGEX_XREF . '@)?/', '', $gedrec);
-			// Ignore tags
-			$gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . ' ?/', '', $gedrec);
-			// Re-apply the filtering
-			$gedrec = I18N::strtoupper($gedrec);
-			foreach ($queryregex as $regex) {
-				if (!preg_match('/' . $regex . '/', $gedrec)) {
-					continue 2;
-				}
-			}
-			$list[] = $record;
-		}
-		$list = array_filter($list, function (Source $x) { return $x->canShowName(); });
-
-		return $list;
-	}
-
-	/**
-	 * Search the shared notes
-	 *
-	 * @param string[] $query Search terms
-	 * @param Tree[] $trees The tree to search
-	 *
-	 * @return Note[]
-	 */
-	public static function searchNotes(array $query, array $trees) {
-		// Convert the query into a regular expression
-		$queryregex = array();
-
-		$sql  = "SELECT o_id AS xref, o_file AS gedcom_id, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'NOTE'";
-		$args = array();
-
-		foreach ($query as $n => $q) {
-			$queryregex[] = preg_quote(I18N::strtoupper($q), '/');
-			$sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
-			$args['collate_' . $n] = I18N::collation();
-			$args['query_' . $n]   = Filter::escapeLike($q);
-		}
-
-		$sql .= " AND o_file IN (";
-		foreach ($trees as $n => $tree) {
-			$sql .= $n ? ", " : "";
-			$sql .= ":tree_id_" . $n;
-			$args['tree_id_' . $n] = $tree->getTreeId();
-		}
-		$sql .= ")";
-
-		$list = array();
-		$rows = Database::prepare($sql)->execute($args)->fetchAll();
-		foreach ($rows as $row) {
-			// SQL may have matched on private data or gedcom tags, so check again against privatized data.
-			$record = Note::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-			// Ignore non-genealogy data
-			$gedrec = preg_replace('/\n\d (_UID|_WT_USER|FILE|FORM|TYPE|CHAN|RESN) .*/', '', $record->getGedcom());
-			// Ignore links and tags
-			$gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . '( @' . WT_REGEX_XREF . '@)?/', '', $gedrec);
-			// Ignore tags
-			$gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . ' ?/', '', $gedrec);
-			// Re-apply the filtering
-			$gedrec = I18N::strtoupper($gedrec);
-			foreach ($queryregex as $regex) {
-				if (!preg_match('/' . $regex . '/', $gedrec)) {
-					continue 2;
-				}
-			}
-			$list[] = $record;
-		}
-		$list = array_filter($list, function (Note $x) { return $x->canShowName(); });
-
-		return $list;
-	}
-
-	/**
-	 * Search the repositories
-	 *
-	 * @param string[] $query Search terms
-	 * @param Tree[] $trees The trees to search
-	 *
-	 * @return Repository[]
-	 */
-	public static function searchRepositories(array $query, array $trees) {
-		// Convert the query into a regular expression
-		$queryregex = array();
-
-		$sql  = "SELECT o_id AS xref, o_file AS gedcom_id, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'REPO'";
-		$args = array();
-
-		foreach ($query as $n => $q) {
-			$queryregex[] = preg_quote(I18N::strtoupper($q), '/');
-			$sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
-			$args['collate_' . $n] = I18N::collation();
-			$args['query_' . $n]   = Filter::escapeLike($q);
-		}
-
-		$sql .= " AND o_file IN (";
-		foreach ($trees as $n => $tree) {
-			$sql .= $n ? ", " : "";
-			$sql .= ":tree_id_" . $n;
-			$args['tree_id_' . $n] = $tree->getTreeId();
-		}
-		$sql .= ")";
-
-		$list = array();
-		$rows = Database::prepare($sql)->execute($args)->fetchAll();
-		foreach ($rows as $row) {
-			// SQL may have matched on private data or gedcom tags, so check again against privatized data.
-			$record = Repository::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-			// Ignore non-genealogy data
-			$gedrec = preg_replace('/\n\d (_UID|_WT_USER|FILE|FORM|TYPE|CHAN|RESN) .*/', '', $record->getGedcom());
-			// Ignore links and tags
-			$gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . '( @' . WT_REGEX_XREF . '@)?/', '', $gedrec);
-			// Ignore tags
-			$gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . ' ?/', '', $gedrec);
-			// Re-apply the filtering
-			$gedrec = I18N::strtoupper($gedrec);
-			foreach ($queryregex as $regex) {
-				if (!preg_match('/' . $regex . '/', $gedrec)) {
-					continue 2;
-				}
-			}
-			$list[] = $record;
-		}
-		$list = array_filter($list, function (Repository $x) { return $x->canShowName(); });
-
-		return $list;
-	}
-
-	/**
-	 * Find the record for the given rin.
-	 *
-	 * @param string $rin
-	 *
-	 * @return string
-	 */
-	public static function findRin($rin) {
-		global $WT_TREE;
-
-		$xref =
-			Database::prepare("SELECT i_id FROM `##individuals` WHERE i_rin=? AND i_file=?")
-				->execute(array($rin, $WT_TREE->getTreeId()))
-				->fetchOne();
-
-		return $xref ? $xref : $rin;
-	}
-
-	/**
-	 * Get array of common surnames
-	 *
-	 * This function returns a simple array of the most common surnames
-	 * found in the individuals list.
-	 *
-	 * @deprecated
-	 *
-	 * @param int $min The number of times a surname must occur before it is added to the array
-	 * @param Tree $tree
-	 *
-	 * @return int[]
-	 */
-	public static function getCommonSurnames($min, Tree $tree) {
-		return self::getTopSurnames($tree->getTreeId(), $min, 0);
-	}
-
-	/**
-	 * get the top surnames
-	 *
-	 * @param int $ged_id fetch surnames from this gedcom
-	 * @param int $min only fetch surnames occuring this many times
-	 * @param int $max only fetch this number of surnames (0=all)
-	 *
-	 * @return int[]
-	 */
-	public static function getTopSurnames($ged_id, $min, $max) {
-		// Use n_surn, rather than n_surname, as it is used to generate URLs for
-		// the indi-list, etc.
-		$max = (int) $max;
-		if ($max == 0) {
-			return
-				Database::prepare(
-					"SELECT n_surn, COUNT(n_surn) FROM `##name`" .
-					" WHERE n_file = :tree_id AND n_type != '_MARNM' AND n_surn NOT IN ('@N.N.', '')" .
-					" GROUP BY n_surn HAVING COUNT(n_surn) >= :min" .
-					" ORDER BY 2 DESC"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'min'     => $min,
-				))->fetchAssoc();
-		} else {
-			return
-				Database::prepare(
-					"SELECT n_surn, COUNT(n_surn) FROM `##name`" .
-					" WHERE n_file = :tree_id AND n_type != '_MARNM' AND n_surn NOT IN ('@N.N.', '')" .
-					" GROUP BY n_surn HAVING COUNT(n_surn) >= :min" .
-					" ORDER BY 2 DESC" .
-					" LIMIT :limit"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'min'     => $min,
-					'limit'   => $max,
-				))->fetchAssoc();
-		}
-	}
-
-	/**
-	 * Get a list of events whose anniversary occured on a given julian day.
-	 * Used on the on-this-day/upcoming blocks and the day/month calendar views.
-	 *
-	 * @param int $jd the julian day
-	 * @param string $facts restrict the search to just these facts or leave blank for all
-	 * @param Tree $tree the tree to search
-	 *
-	 * @return Fact[]
-	 */
-	public static function getAnniversaryEvents($jd, $facts, Tree $tree) {
-		$found_facts = array();
-		foreach (array(
-			new GregorianDate($jd),
-			new JulianDate($jd),
-			new FrenchDate($jd),
-			new JewishDate($jd),
-			new HijriDate($jd),
-			new JalaliDate($jd),
-		 ) as $anniv) {
-			// Build a SQL where clause to match anniversaries in the appropriate calendar.
-			$ind_sql =
-				"SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" .
-				" FROM `##dates` JOIN `##individuals` ON d_gid = i_id AND d_file = i_file" .
-				" WHERE d_type = :type AND d_file = :tree_id";
-			$fam_sql =
-				"SELECT DISTINCT f_id AS xref, f_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" .
-				" FROM `##dates` JOIN `##families` ON d_gid = f_id AND d_file = f_file" .
-				" WHERE d_type = :type AND d_file = :tree_id";
-			$args = array(
-				'type'    => $anniv->format('%@'),
-				'tree_id' => $tree->getTreeId(),
-			);
-
-			$where = "";
-			// SIMPLE CASES:
-			// a) Non-hebrew anniversaries
-			// b) Hebrew months TVT, SHV, IYR, SVN, TMZ, AAV, ELL
-			if (!$anniv instanceof JewishDate || in_array($anniv->m, array(1, 5, 6, 9, 10, 11, 12, 13))) {
-				// Dates without days go on the first day of the month
-				// Dates with invalid days go on the last day of the month
-				if ($anniv->d === 1) {
-					$where .= " AND d_day <= 1";
-				} elseif ($anniv->d === $anniv->daysInMonth()) {
-					$where .= " AND d_day >= :day";
-					$args['day'] = $anniv->d;
-				} else {
-					$where .= " AND d_day = :day";
-					$args['day'] = $anniv->d;
-				}
-				$where .= " AND d_mon = :month";
-				$args['month'] = $anniv->m;
-			} else {
-				// SPECIAL CASES:
-				switch ($anniv->m) {
-				case 2:
-					// 29 CSH does not include 30 CSH (but would include an invalid 31 CSH if there were no 30 CSH)
-					if ($anniv->d === 1) {
-						$where .= " AND d_day <= 1 AND d_mon = 2";
-					} elseif ($anniv->d === 30) {
-						$where .= " AND d_day >= 30 AND d_mon = 2";
-					} elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
-						$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 2";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 3:
-					// 1 KSL includes 30 CSH (if this year didn’t have 30 CSH)
-					// 29 KSL does not include 30 KSL (but would include an invalid 31 KSL if there were no 30 KSL)
-					if ($anniv->d === 1) {
-						$tmp = new JewishDate(array($anniv->y, 'CSH', 1));
-						if ($tmp->daysInMonth() === 29) {
-							$where .= " AND (d_day <= 1 AND d_mon = 3 OR d_day = 30 AND d_mon = 2)";
-						} else {
-							$where .= " AND d_day <= 1 AND d_mon = 3";
-						}
-					} elseif ($anniv->d === 30) {
-						$where .= " AND d_day >= 30 AND d_mon = 3";
-					} elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
-						$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 3";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 4:
-					// 1 TVT includes 30 KSL (if this year didn’t have 30 KSL)
-					if ($anniv->d === 1) {
-						$tmp = new JewishDate(array($anniv->y, 'KSL', 1));
-						if ($tmp->daysInMonth() === 29) {
-							$where .= " AND (d_day <=1 AND d_mon = 4 OR d_day = 30 AND d_mon = 3)";
-						} else {
-							$where .= " AND d_day <= 1 AND d_mon = 4";
-						}
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day AND d_mon=4";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day AND d_mon=4";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 7: // ADS includes ADR (non-leap)
-					if ($anniv->d === 1) {
-						$where .= " AND d_day <= 1";
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day";
-						$args['day'] = $anniv->d;
-					}
-					$where .= " AND (d_mon = 6 AND MOD(7 * d_year + 1, 19) >= 7 OR d_mon = 7)";
-					break;
-				case 8: // 1 NSN includes 30 ADR, if this year is non-leap
-					if ($anniv->d === 1) {
-						if ($anniv->isLeapYear()) {
-							$where .= " AND d_day <= 1 AND d_mon = 8";
-						} else {
-							$where .= " AND (d_day <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
-						}
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day AND d_mon = 8";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 8";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				}
-			}
-			// Only events in the past (includes dates without a year)
-			$where .= " AND d_year <= :year";
-			$args['year'] = $anniv->y;
-
-			if ($facts) {
-				// Restrict to certain types of fact
-				$where .= " AND d_fact IN (";
-				preg_match_all('/([_A-Z]+)/', $facts, $matches);
-				foreach ($matches[1] as $n => $fact) {
-					$where .= $n ? ", " : "";
-					$where .= ":fact_" . $n;
-					$args['fact_' . $n] = $fact;
-				}
-				$where .= ")";
-			} else {
-				// If no facts specified, get all except these
-				$where .= " AND d_fact NOT IN ('CHAN', 'BAPL', 'SLGC', 'SLGS', 'ENDL', 'CENS', 'RESI', '_TODO')";
-			}
-
-			$order_by = " ORDER BY d_day, d_year DESC";
-
-			// Now fetch these anniversaries
-			foreach (array('INDI' => $ind_sql . $where . $order_by, 'FAM' => $fam_sql . $where . $order_by) as $type => $sql) {
-				$rows = Database::prepare($sql)->execute($args)->fetchAll();
-				foreach ($rows as $row) {
-					if ($type === 'INDI') {
-						$record = Individual::getInstance($row->xref, $tree, $row->gedcom);
-					} else {
-						$record = Family::getInstance($row->xref, $tree, $row->gedcom);
-					}
-					$anniv_date = new Date($row->d_type . ' ' . $row->d_day . ' ' . $row->d_month . ' ' . $row->d_year);
-					foreach ($record->getFacts() as $fact) {
-						if (($fact->getDate()->minimumDate() == $anniv_date->minimumDate() || $fact->getDate()->maximumDate() == $anniv_date->minimumDate()) && $fact->getTag() === $row->d_fact) {
-							$fact->anniv   = $row->d_year === '0' ? 0 : $anniv->y - $row->d_year;
-							$found_facts[] = $fact;
-						}
-					}
-				}
-			}
-		}
-
-		return $found_facts;
-	}
-
-	/**
-	 * Get a list of events which occured during a given date range.
-	 *
-	 * @param int $jd1 the start range of julian day
-	 * @param int $jd2 the end range of julian day
-	 * @param string $facts restrict the search to just these facts or leave blank for all
-	 * @param Tree $tree the tree to search
-	 *
-	 * @return Fact[]
-	 */
-	public static function getCalendarEvents($jd1, $jd2, $facts, Tree $tree) {
-		// If no facts specified, get all except these
-		$skipfacts = "CHAN,BAPL,SLGC,SLGS,ENDL,CENS,RESI,NOTE,ADDR,OBJE,SOUR,PAGE,DATA,TEXT";
-
-		$found_facts = array();
-
-		// Events that start or end during the period
-		$where = "WHERE (d_julianday1>={$jd1} AND d_julianday1<={$jd2} OR d_julianday2>={$jd1} AND d_julianday2<={$jd2})";
-
-		// Restrict to certain types of fact
-		if (empty($facts)) {
-			$excl_facts = "'" . preg_replace('/\W+/', "','", $skipfacts) . "'";
-			$where .= " AND d_fact NOT IN ({$excl_facts})";
-		} else {
-			$incl_facts = "'" . preg_replace('/\W+/', "','", $facts) . "'";
-			$where .= " AND d_fact IN ({$incl_facts})";
-		}
-		// Only get events from the current gedcom
-		$where .= " AND d_file=" . $tree->getTreeId();
-
-		// Now fetch these events
-		$ind_sql = "SELECT d_gid AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##individuals` {$where} AND d_gid=i_id AND d_file=i_file ORDER BY d_julianday1";
-		$fam_sql = "SELECT d_gid AS xref, f_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##families`    {$where} AND d_gid=f_id AND d_file=f_file ORDER BY d_julianday1";
-		foreach (array('INDI' => $ind_sql, 'FAM' => $fam_sql) as $type => $sql) {
-			$rows = Database::prepare($sql)->fetchAll();
-			foreach ($rows as $row) {
-				if ($type === 'INDI') {
-					$record = Individual::getInstance($row->xref, $tree, $row->gedcom);
-				} else {
-					$record = Family::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				$anniv_date = new Date($row->d_type . ' ' . $row->d_day . ' ' . $row->d_month . ' ' . $row->d_year);
-				foreach ($record->getFacts() as $fact) {
-					if (($fact->getDate()->minimumDate() == $anniv_date->minimumDate() || $fact->getDate()->maximumDate() == $anniv_date->minimumDate()) && $fact->getTag() === $row->d_fact) {
-						$fact->anniv   = 0;
-						$found_facts[] = $fact;
-					}
-				}
-			}
-		}
-
-		return $found_facts;
-	}
-
-	/**
-	 * Get the list of current and upcoming events, sorted by anniversary date
-	 *
-	 * @param int $jd1
-	 * @param int $jd2
-	 * @param string $events
-	 * @param Tree $tree
-	 *
-	 * @return Fact[]
-	 */
-	public static function getEventsList($jd1, $jd2, $events, Tree $tree) {
-		$found_facts = array();
-		for ($jd = $jd1; $jd <= $jd2; ++$jd) {
-			$found_facts = array_merge($found_facts, self::getAnniversaryEvents($jd, $events, $tree));
-		}
-
-		return $found_facts;
-	}
-
-	/**
-	 * Check if a media file is shared (i.e. used by another gedcom)
-	 *
-	 * @param string $file_name
-	 * @param int $ged_id
-	 *
-	 * @return bool
-	 */
-	public static function isMediaUsedInOtherTree($file_name, $ged_id) {
-		return
-			(bool) Database::prepare("SELECT COUNT(*) FROM `##media` WHERE m_filename LIKE ? AND m_file<>?")
-				->execute(array("%{$file_name}", $ged_id))
-				->fetchOne();
-	}
-
-	/**
-	 * Get the blocks for a specified user.
-	 *
-	 * @param int $user_id
-	 *
-	 * @return string[][]
-	 */
-	public static function getUserBlocks($user_id) {
-		global $WT_TREE;
-
-		$blocks = array('main' => array(), 'side' => array());
-		$rows   = Database::prepare(
-			"SELECT location, block_id, module_name" .
-			" FROM  `##block`" .
-			" JOIN  `##module` USING (module_name)" .
-			" JOIN  `##module_privacy` USING (module_name)" .
-			" WHERE user_id=?" .
-			" AND   status='enabled'" .
-			" AND   `##module_privacy`.gedcom_id=?" .
-			" AND   access_level>=?" .
-			" ORDER BY location, block_order"
-		)->execute(array($user_id, $WT_TREE->getTreeId(), Auth::accessLevel($WT_TREE)))->fetchAll();
-		foreach ($rows as $row) {
-			$blocks[$row->location][$row->block_id] = $row->module_name;
-		}
-
-		return $blocks;
-	}
-
-	/**
-	 * Get the blocks for the specified tree
-	 *
-	 * @param int $gedcom_id
-	 *
-	 * @return string[][]
-	 */
-	public static function getTreeBlocks($gedcom_id) {
-		if ($gedcom_id < 0) {
-			$access_level = Auth::PRIV_NONE;
-		} else {
-			$access_level = Auth::accessLevel(Tree::findById($gedcom_id));
-		}
-
-		$blocks = array('main' => array(), 'side' => array());
-		$rows   = Database::prepare(
-			"SELECT location, block_id, module_name" .
-			" FROM  `##block`" .
-			" JOIN  `##module` USING (module_name)" .
-			" JOIN  `##module_privacy` USING (module_name, gedcom_id)" .
-			" WHERE gedcom_id = :tree_id" .
-			" AND   status='enabled'" .
-			" AND   access_level >= :access_level" .
-			" ORDER BY location, block_order"
-		)->execute(array(
-			'tree_id'      => $gedcom_id,
-			'access_level' => $access_level,
-		))->fetchAll();
-		foreach ($rows as $row) {
-			$blocks[$row->location][$row->block_id] = $row->module_name;
-		}
-
-		return $blocks;
-	}
-
-	/**
-	 * Update favorites after merging records.
-	 *
-	 * @param string $xref_from
-	 * @param string $xref_to
-	 * @param Tree $tree
-	 *
-	 * @return int
-	 */
-	public static function updateFavorites($xref_from, $xref_to, Tree $tree) {
-		return
-			Database::prepare("UPDATE `##favorite` SET xref=? WHERE xref=? AND gedcom_id=?")
-				->execute(array($xref_to, $xref_from, $tree->getTreeId()))
-				->rowCount();
-	}
+    /**
+     * Fetch all records linked to a record - when deleting an object, we must
+     * also delete all links to it.
+     *
+     * @param string $xref
+     * @param int $gedcom_id
+     *
+     * @return string[]
+     */
+    public static function fetchAllLinks($xref, $gedcom_id) {
+        return
+            Database::prepare(
+                "SELECT l_from FROM `##link` WHERE l_file = ? AND l_to = ?" .
+                " UNION " .
+                "SELECT xref FROM `##change` WHERE status = 'pending' AND gedcom_id = ? AND new_gedcom LIKE" .
+                " CONCAT('%@', ?, '@%') AND new_gedcom NOT LIKE CONCAT('0 @', ?, '@%')"
+            )->execute(array(
+                $gedcom_id,
+                $xref,
+                $gedcom_id,
+                $xref,
+                $xref,
+            ))->fetchOneColumn();
+    }
+
+    /**
+     * Get a list of all the sources.
+     *
+     * @param Tree $tree
+     *
+     * @return Source[] array
+     */
+    public static function getSourceList(Tree $tree) {
+        $rows = Database::prepare(
+            "SELECT s_id AS xref, s_gedcom AS gedcom FROM `##sources` WHERE s_file = :tree_id"
+        )->execute(array(
+            'tree_id' => $tree->getTreeId(),
+        ))->fetchAll();
+
+        $list = array();
+        foreach ($rows as $row) {
+            $list[] = Source::getInstance($row->xref, $tree, $row->gedcom);
+        }
+        $list = array_filter($list, function (Source $x) { return $x->canShowName(); });
+        usort($list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+
+        return $list;
+    }
+
+    /**
+     * Get a list of all the repositories.
+     *
+     * @param Tree $tree
+     *
+     * @return Repository[] array
+     */
+    public static function getRepositoryList(Tree $tree) {
+        $rows = Database::prepare(
+            "SELECT o_id AS xref, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'REPO' AND o_file = ?"
+        )->execute(array(
+            $tree->getTreeId(),
+        ))->fetchAll();
+
+        $list = array();
+        foreach ($rows as $row) {
+            $list[] = Repository::getInstance($row->xref, $tree, $row->gedcom);
+        }
+        $list = array_filter($list, function (Repository $x) { return $x->canShowName(); });
+        usort($list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+
+        return $list;
+    }
+
+    /**
+     * Get a list of all the shared notes.
+     *
+     * @param Tree $tree
+     *
+     * @return Note[] array
+     */
+    public static function getNoteList(Tree $tree) {
+        $rows = Database::prepare(
+            "SELECT o_id AS xref, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'NOTE' AND o_file = :tree_id"
+        )->execute(array(
+            'tree_id' => $tree->getTreeId(),
+        ))->fetchAll();
+
+        $list = array();
+        foreach ($rows as $row) {
+            $list[] = Note::getInstance($row->xref, $tree, $row->gedcom);
+        }
+        $list = array_filter($list, function (Note $x) { return $x->canShowName(); });
+        usort($list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+
+        return $list;
+    }
+
+    /**
+     * Search all individuals
+     *
+     * @param string[] $query Search terms
+     * @param Tree[] $trees The trees to search
+     *
+     * @return Individual[]
+     */
+    public static function searchIndividuals(array $query, array $trees) {
+        // Convert the query into a regular expression
+        $queryregex = array();
+
+        $sql  = "SELECT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom FROM `##individuals` WHERE 1";
+        $args = array();
+
+        foreach ($query as $n => $q) {
+            $queryregex[] = preg_quote(I18N::strtoupper($q), '/');
+            $sql .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $args['collate_' . $n] = I18N::collation();
+            $args['query_' . $n]   = Filter::escapeLike($q);
+        }
+
+        $sql .= " AND i_file IN (";
+        foreach ($trees as $n => $tree) {
+            $sql .= $n ? ", " : "";
+            $sql .= ":tree_id_" . $n;
+            $args['tree_id_' . $n] = $tree->getTreeId();
+        }
+        $sql .= ")";
+
+        $list = array();
+        $rows = Database::prepare($sql)->execute($args)->fetchAll();
+        foreach ($rows as $row) {
+            // SQL may have matched on private data or gedcom tags, so check again against privatized data.
+            $record = Individual::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+            // Ignore non-genealogy data
+            $gedrec = preg_replace('/\n\d (_UID|_WT_USER|FILE|FORM|TYPE|CHAN|RESN) .*/', '', $record->getGedcom());
+            // Ignore links and tags
+            $gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . '( @' . WT_REGEX_XREF . '@)?/', '', $gedrec);
+            // Re-apply the filtering
+            $gedrec = I18N::strtoupper($gedrec);
+            foreach ($queryregex as $regex) {
+                if (!preg_match('/' . $regex . '/', $gedrec)) {
+                    continue 2;
+                }
+            }
+            $list[] = $record;
+        }
+        $list = array_filter($list, function (Individual $x) { return $x->canShowName(); });
+
+        return $list;
+    }
+
+    /**
+     * Search the names of individuals
+     *
+     * @param string[] $query Search terms
+     * @param Tree[] $trees The trees to search
+     *
+     * @return Individual[]
+     */
+    public static function searchIndividualNames(array $query, array $trees) {
+        $sql  = "SELECT DISTINCT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom, n_full FROM `##individuals` JOIN `##name` ON i_id=n_id AND i_file=n_file WHERE 1";
+        $args = array();
+
+        // Convert the query into a SQL expression
+        foreach ($query as $n => $q) {
+            $sql .= " AND n_full COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $args['collate_' . $n] = I18N::collation();
+            $args['query_' . $n]   = Filter::escapeLike($q);
+        }
+
+        $sql .= " AND i_file IN (";
+        foreach ($trees as $n => $tree) {
+            $sql .= $n ? ", " : "";
+            $sql .= ":tree_id_" . $n;
+            $args['tree_id_' . $n] = $tree->getTreeId();
+        }
+        $sql .= ")";
+        $list = array();
+        $rows = Database::prepare($sql)->execute($args)->fetchAll();
+        foreach ($rows as $row) {
+            $indi = Individual::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+            foreach ($indi->getAllNames() as $num => $name) {
+                if ($name['fullNN'] === $row->n_full) {
+                    $indi->setPrimaryName($num);
+                    // We need to clone $indi, as we may have multiple references to the
+                    // same person in this list, and the "primary name" would otherwise
+                    // be shared amongst all of them.
+                    $list[] = clone $indi;
+                    // Only need to match an individual on one name
+                    break;
+                }
+            }
+        }
+        $list = array_filter($list, function (Individual $x) { return $x->canShowName(); });
+
+        return $list;
+    }
+
+    /**
+     * Search for individuals names/places using phonetic matching
+     *
+     * @param string $soundex
+     * @param string $lastname
+     * @param string $firstname
+     * @param string $place
+     * @param Tree[] $trees
+     *
+     * @return Individual[]
+     */
+    public static function searchIndividualsPhonetic($soundex, $lastname, $firstname, $place, array $trees) {
+        switch ($soundex) {
+        case 'Russell':
+            $givn_sdx = Soundex::russell($firstname);
+            $surn_sdx = Soundex::russell($lastname);
+            $plac_sdx = Soundex::russell($place);
+            break;
+        case 'DaitchM':
+            $givn_sdx = Soundex::daitchMokotoff($firstname);
+            $surn_sdx = Soundex::daitchMokotoff($lastname);
+            $plac_sdx = Soundex::daitchMokotoff($place);
+            break;
+        default:
+            throw new \DomainException('soundex: ' . $soundex);
+        }
+
+        // Nothing to search for? Return nothing.
+        if (!$givn_sdx && !$surn_sdx && !$plac_sdx) {
+            return array();
+        }
+
+        $sql  = "SELECT DISTINCT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom FROM `##individuals`";
+        $args = array();
+
+        if ($place) {
+            $sql .= " JOIN `##placelinks` ON pl_file = i_file AND pl_gid = i_id";
+            $sql .= " JOIN `##places` ON p_file = pl_file AND pl_p_id = p_id";
+        }
+        if ($firstname || $lastname) {
+            $sql .= " JOIN `##name` ON i_file=n_file AND i_id=n_id";
+        }
+        $sql .= " AND i_file IN (";
+        foreach ($trees as $n => $tree) {
+            $sql .= $n ? ", " : "";
+            $sql .= ":tree_id_" . $n;
+            $args['tree_id_' . $n] = $tree->getTreeId();
+        }
+        $sql .= ")";
+
+        if ($firstname && $givn_sdx) {
+            $sql .= " AND (";
+            $givn_sdx = explode(':', $givn_sdx);
+            foreach ($givn_sdx as $n => $sdx) {
+                $sql .= $n ? " OR " : "";
+                switch ($soundex) {
+                case 'Russell':
+                    $sql .= "n_soundex_givn_std LIKE CONCAT('%', :given_name_" . $n . ", '%')";
+                    break;
+                case 'DaitchM':
+                    $sql .= "n_soundex_givn_dm LIKE CONCAT('%', :given_name_" . $n . ", '%')";
+                    break;
+                }
+                $args['given_name_' . $n] = $sdx;
+            }
+            $sql .= ")";
+        }
+
+        if ($lastname && $surn_sdx) {
+            $sql .= " AND (";
+            $surn_sdx = explode(':', $surn_sdx);
+            foreach ($surn_sdx as $n => $sdx) {
+                $sql .= $n ? " OR " : "";
+                switch ($soundex) {
+                case 'Russell':
+                    $sql .= "n_soundex_surn_std LIKE CONCAT('%', :surname_" . $n . ", '%')";
+                    break;
+                case 'DaitchM':
+                    $sql .= "n_soundex_surn_dm LIKE CONCAT('%', :surname_" . $n . ", '%')";
+                    break;
+                }
+                $args['surname_' . $n] = $sdx;
+            }
+            $sql .= ")";
+        }
+
+        if ($place && $plac_sdx) {
+            $sql .= " AND (";
+            $plac_sdx = explode(':', $plac_sdx);
+            foreach ($plac_sdx as $n => $sdx) {
+                $sql .= $n ? " OR " : "";
+                switch ($soundex) {
+                case 'Russell':
+                    $sql .= "p_std_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
+                    break;
+                case 'DaitchM':
+                    $sql .= "p_dm_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
+                    break;
+                }
+                $args['place_' . $n] = $sdx;
+            }
+            $sql .= ")";
+        }
+
+        $list = array();
+        $rows = Database::prepare($sql)->execute($args)->fetchAll();
+        foreach ($rows as $row) {
+            $list[] = Individual::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+        }
+        $list = array_filter($list, function (Individual $x) { return $x->canShowName(); });
+
+        return $list;
+    }
+
+    /**
+     * Search family records
+     *
+     * @param string[] $query Search terms
+     * @param Tree[] $trees The trees to search
+     *
+     * @return Family[]
+     */
+    public static function searchFamilies(array $query, array $trees) {
+        // Convert the query into a regular expression
+        $queryregex = array();
+
+        $sql  = "SELECT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom FROM `##families` WHERE 1";
+        $args = array();
+
+        foreach ($query as $n => $q) {
+            $queryregex[] = preg_quote(I18N::strtoupper($q), '/');
+            $sql .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $args['collate_' . $n] = I18N::collation();
+            $args['query_' . $n]   = Filter::escapeLike($q);
+        }
+
+        $sql .= " AND f_file IN (";
+        foreach ($trees as $n => $tree) {
+            $sql .= $n ? ", " : "";
+            $sql .= ":tree_id_" . $n;
+            $args['tree_id_' . $n] = $tree->getTreeId();
+        }
+        $sql .= ")";
+
+        $list = array();
+        $rows = Database::prepare($sql)->execute($args)->fetchAll();
+        foreach ($rows as $row) {
+            // SQL may have matched on private data or gedcom tags, so check again against privatized data.
+            $record = Family::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+            // Ignore non-genealogy data
+            $gedrec = preg_replace('/\n\d (_UID|_WT_USER|FILE|FORM|TYPE|CHAN|RESN) .*/', '', $record->getGedcom());
+            // Ignore links and tags
+            $gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . '( @' . WT_REGEX_XREF . '@)?/', '', $gedrec);
+            // Ignore tags
+            $gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . ' ?/', '', $gedrec);
+            // Re-apply the filtering
+            $gedrec = I18N::strtoupper($gedrec);
+            foreach ($queryregex as $regex) {
+                if (!preg_match('/' . $regex . '/', $gedrec)) {
+                    continue 2;
+                }
+            }
+            $list[] = $record;
+        }
+        $list = array_filter($list, function (Family $x) { return $x->canShowName(); });
+
+        return $list;
+    }
+
+    /**
+     * Search the names of the husb/wife in a family
+     *
+     * @param string[] $query Search terms
+     * @param Tree[] $trees The trees to search
+     *
+     * @return Family[]
+     */
+    public static function searchFamilyNames(array $query, array $trees) {
+        // No query => no results
+        if (!$query) {
+            return array();
+        }
+
+        $sql =
+            "SELECT DISTINCT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom" .
+            " FROM `##families`" .
+            " LEFT JOIN `##name` husb ON f_husb = husb.n_id AND f_file = husb.n_file" .
+            " LEFT JOIN `##name` wife ON f_wife = wife.n_id AND f_file = wife.n_file" .
+            " WHERE 1";
+        $args = array();
+
+        foreach ($query as $n => $q) {
+            $sql .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
+            $args['husb_collate_' . $n] = I18N::collation();
+            $args['husb_query_' . $n]   = Filter::escapeLike($q);
+            $args['wife_collate_' . $n] = I18N::collation();
+            $args['wife_query_' . $n]   = Filter::escapeLike($q);
+        }
+
+        $sql .= " AND f_file IN (";
+        foreach ($trees as $n => $tree) {
+            $sql .= $n ? ", " : "";
+            $sql .= ":tree_id_" . $n;
+            $args['tree_id_' . $n] = $tree->getTreeId();
+        }
+        $sql .= ")";
+
+        $list = array();
+        $rows = Database::prepare($sql)->execute($args)->fetchAll();
+        foreach ($rows as $row) {
+            $list[] = Family::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+        }
+
+        $list = array_filter($list, function (Family $x) use ($query) {
+            $name = I18N::strtolower(strip_tags($x->getFullName()));
+            foreach ($query as $q) {
+                if (stripos($name, I18N::strtolower($q)) === false) {
+                    return false;
+                }
+            }
+
+            return true;
+        });
+
+        return $list;
+    }
+
+    /**
+     * Search the sources
+     *
+     * @param string[] $query Search terms
+     * @param Tree[] $trees The tree to search
+     *
+     * @return Source[]
+     */
+    public static function searchSources($query, $trees) {
+        // Convert the query into a regular expression
+        $queryregex = array();
+
+        $sql  = "SELECT s_id AS xref, s_file AS gedcom_id, s_gedcom AS gedcom FROM `##sources` WHERE 1";
+        $args = array();
+
+        foreach ($query as $n => $q) {
+            $queryregex[] = preg_quote(I18N::strtoupper($q), '/');
+            $sql .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $args['collate_' . $n] = I18N::collation();
+            $args['query_' . $n]   = Filter::escapeLike($q);
+        }
+
+        $sql .= " AND s_file IN (";
+        foreach ($trees as $n => $tree) {
+            $sql .= $n ? ", " : "";
+            $sql .= ":tree_id_" . $n;
+            $args['tree_id_' . $n] = $tree->getTreeId();
+        }
+        $sql .= ")";
+
+        $list = array();
+        $rows = Database::prepare($sql)->execute($args)->fetchAll();
+        foreach ($rows as $row) {
+            // SQL may have matched on private data or gedcom tags, so check again against privatized data.
+            $record = Source::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+            // Ignore non-genealogy data
+            $gedrec = preg_replace('/\n\d (_UID|_WT_USER|FILE|FORM|TYPE|CHAN|RESN) .*/', '', $record->getGedcom());
+            // Ignore links and tags
+            $gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . '( @' . WT_REGEX_XREF . '@)?/', '', $gedrec);
+            // Ignore tags
+            $gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . ' ?/', '', $gedrec);
+            // Re-apply the filtering
+            $gedrec = I18N::strtoupper($gedrec);
+            foreach ($queryregex as $regex) {
+                if (!preg_match('/' . $regex . '/', $gedrec)) {
+                    continue 2;
+                }
+            }
+            $list[] = $record;
+        }
+        $list = array_filter($list, function (Source $x) { return $x->canShowName(); });
+
+        return $list;
+    }
+
+    /**
+     * Search the shared notes
+     *
+     * @param string[] $query Search terms
+     * @param Tree[] $trees The tree to search
+     *
+     * @return Note[]
+     */
+    public static function searchNotes(array $query, array $trees) {
+        // Convert the query into a regular expression
+        $queryregex = array();
+
+        $sql  = "SELECT o_id AS xref, o_file AS gedcom_id, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'NOTE'";
+        $args = array();
+
+        foreach ($query as $n => $q) {
+            $queryregex[] = preg_quote(I18N::strtoupper($q), '/');
+            $sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $args['collate_' . $n] = I18N::collation();
+            $args['query_' . $n]   = Filter::escapeLike($q);
+        }
+
+        $sql .= " AND o_file IN (";
+        foreach ($trees as $n => $tree) {
+            $sql .= $n ? ", " : "";
+            $sql .= ":tree_id_" . $n;
+            $args['tree_id_' . $n] = $tree->getTreeId();
+        }
+        $sql .= ")";
+
+        $list = array();
+        $rows = Database::prepare($sql)->execute($args)->fetchAll();
+        foreach ($rows as $row) {
+            // SQL may have matched on private data or gedcom tags, so check again against privatized data.
+            $record = Note::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+            // Ignore non-genealogy data
+            $gedrec = preg_replace('/\n\d (_UID|_WT_USER|FILE|FORM|TYPE|CHAN|RESN) .*/', '', $record->getGedcom());
+            // Ignore links and tags
+            $gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . '( @' . WT_REGEX_XREF . '@)?/', '', $gedrec);
+            // Ignore tags
+            $gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . ' ?/', '', $gedrec);
+            // Re-apply the filtering
+            $gedrec = I18N::strtoupper($gedrec);
+            foreach ($queryregex as $regex) {
+                if (!preg_match('/' . $regex . '/', $gedrec)) {
+                    continue 2;
+                }
+            }
+            $list[] = $record;
+        }
+        $list = array_filter($list, function (Note $x) { return $x->canShowName(); });
+
+        return $list;
+    }
+
+    /**
+     * Search the repositories
+     *
+     * @param string[] $query Search terms
+     * @param Tree[] $trees The trees to search
+     *
+     * @return Repository[]
+     */
+    public static function searchRepositories(array $query, array $trees) {
+        // Convert the query into a regular expression
+        $queryregex = array();
+
+        $sql  = "SELECT o_id AS xref, o_file AS gedcom_id, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'REPO'";
+        $args = array();
+
+        foreach ($query as $n => $q) {
+            $queryregex[] = preg_quote(I18N::strtoupper($q), '/');
+            $sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $args['collate_' . $n] = I18N::collation();
+            $args['query_' . $n]   = Filter::escapeLike($q);
+        }
+
+        $sql .= " AND o_file IN (";
+        foreach ($trees as $n => $tree) {
+            $sql .= $n ? ", " : "";
+            $sql .= ":tree_id_" . $n;
+            $args['tree_id_' . $n] = $tree->getTreeId();
+        }
+        $sql .= ")";
+
+        $list = array();
+        $rows = Database::prepare($sql)->execute($args)->fetchAll();
+        foreach ($rows as $row) {
+            // SQL may have matched on private data or gedcom tags, so check again against privatized data.
+            $record = Repository::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+            // Ignore non-genealogy data
+            $gedrec = preg_replace('/\n\d (_UID|_WT_USER|FILE|FORM|TYPE|CHAN|RESN) .*/', '', $record->getGedcom());
+            // Ignore links and tags
+            $gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . '( @' . WT_REGEX_XREF . '@)?/', '', $gedrec);
+            // Ignore tags
+            $gedrec = preg_replace('/\n\d ' . WT_REGEX_TAG . ' ?/', '', $gedrec);
+            // Re-apply the filtering
+            $gedrec = I18N::strtoupper($gedrec);
+            foreach ($queryregex as $regex) {
+                if (!preg_match('/' . $regex . '/', $gedrec)) {
+                    continue 2;
+                }
+            }
+            $list[] = $record;
+        }
+        $list = array_filter($list, function (Repository $x) { return $x->canShowName(); });
+
+        return $list;
+    }
+
+    /**
+     * Find the record for the given rin.
+     *
+     * @param string $rin
+     *
+     * @return string
+     */
+    public static function findRin($rin) {
+        global $WT_TREE;
+
+        $xref =
+            Database::prepare("SELECT i_id FROM `##individuals` WHERE i_rin=? AND i_file=?")
+                ->execute(array($rin, $WT_TREE->getTreeId()))
+                ->fetchOne();
+
+        return $xref ? $xref : $rin;
+    }
+
+    /**
+     * Get array of common surnames
+     *
+     * This function returns a simple array of the most common surnames
+     * found in the individuals list.
+     *
+     * @deprecated
+     *
+     * @param int $min The number of times a surname must occur before it is added to the array
+     * @param Tree $tree
+     *
+     * @return int[]
+     */
+    public static function getCommonSurnames($min, Tree $tree) {
+        return self::getTopSurnames($tree->getTreeId(), $min, 0);
+    }
+
+    /**
+     * get the top surnames
+     *
+     * @param int $ged_id fetch surnames from this gedcom
+     * @param int $min only fetch surnames occuring this many times
+     * @param int $max only fetch this number of surnames (0=all)
+     *
+     * @return int[]
+     */
+    public static function getTopSurnames($ged_id, $min, $max) {
+        // Use n_surn, rather than n_surname, as it is used to generate URLs for
+        // the indi-list, etc.
+        $max = (int) $max;
+        if ($max == 0) {
+            return
+                Database::prepare(
+                    "SELECT n_surn, COUNT(n_surn) FROM `##name`" .
+                    " WHERE n_file = :tree_id AND n_type != '_MARNM' AND n_surn NOT IN ('@N.N.', '')" .
+                    " GROUP BY n_surn HAVING COUNT(n_surn) >= :min" .
+                    " ORDER BY 2 DESC"
+                )->execute(array(
+                    'tree_id' => $ged_id,
+                    'min'     => $min,
+                ))->fetchAssoc();
+        } else {
+            return
+                Database::prepare(
+                    "SELECT n_surn, COUNT(n_surn) FROM `##name`" .
+                    " WHERE n_file = :tree_id AND n_type != '_MARNM' AND n_surn NOT IN ('@N.N.', '')" .
+                    " GROUP BY n_surn HAVING COUNT(n_surn) >= :min" .
+                    " ORDER BY 2 DESC" .
+                    " LIMIT :limit"
+                )->execute(array(
+                    'tree_id' => $ged_id,
+                    'min'     => $min,
+                    'limit'   => $max,
+                ))->fetchAssoc();
+        }
+    }
+
+    /**
+     * Get a list of events whose anniversary occured on a given julian day.
+     * Used on the on-this-day/upcoming blocks and the day/month calendar views.
+     *
+     * @param int $jd the julian day
+     * @param string $facts restrict the search to just these facts or leave blank for all
+     * @param Tree $tree the tree to search
+     *
+     * @return Fact[]
+     */
+    public static function getAnniversaryEvents($jd, $facts, Tree $tree) {
+        $found_facts = array();
+        foreach (array(
+            new GregorianDate($jd),
+            new JulianDate($jd),
+            new FrenchDate($jd),
+            new JewishDate($jd),
+            new HijriDate($jd),
+            new JalaliDate($jd),
+            ) as $anniv) {
+            // Build a SQL where clause to match anniversaries in the appropriate calendar.
+            $ind_sql =
+                "SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" .
+                " FROM `##dates` JOIN `##individuals` ON d_gid = i_id AND d_file = i_file" .
+                " WHERE d_type = :type AND d_file = :tree_id";
+            $fam_sql =
+                "SELECT DISTINCT f_id AS xref, f_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" .
+                " FROM `##dates` JOIN `##families` ON d_gid = f_id AND d_file = f_file" .
+                " WHERE d_type = :type AND d_file = :tree_id";
+            $args = array(
+                'type'    => $anniv->format('%@'),
+                'tree_id' => $tree->getTreeId(),
+            );
+
+            $where = "";
+            // SIMPLE CASES:
+            // a) Non-hebrew anniversaries
+            // b) Hebrew months TVT, SHV, IYR, SVN, TMZ, AAV, ELL
+            if (!$anniv instanceof JewishDate || in_array($anniv->m, array(1, 5, 6, 9, 10, 11, 12, 13))) {
+                // Dates without days go on the first day of the month
+                // Dates with invalid days go on the last day of the month
+                if ($anniv->d === 1) {
+                    $where .= " AND d_day <= 1";
+                } elseif ($anniv->d === $anniv->daysInMonth()) {
+                    $where .= " AND d_day >= :day";
+                    $args['day'] = $anniv->d;
+                } else {
+                    $where .= " AND d_day = :day";
+                    $args['day'] = $anniv->d;
+                }
+                $where .= " AND d_mon = :month";
+                $args['month'] = $anniv->m;
+            } else {
+                // SPECIAL CASES:
+                switch ($anniv->m) {
+                case 2:
+                    // 29 CSH does not include 30 CSH (but would include an invalid 31 CSH if there were no 30 CSH)
+                    if ($anniv->d === 1) {
+                        $where .= " AND d_day <= 1 AND d_mon = 2";
+                    } elseif ($anniv->d === 30) {
+                        $where .= " AND d_day >= 30 AND d_mon = 2";
+                    } elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
+                        $where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
+                    } else {
+                        $where .= " AND d_day = :day AND d_mon = 2";
+                        $args['day'] = $anniv->d;
+                    }
+                    break;
+                case 3:
+                    // 1 KSL includes 30 CSH (if this year didn’t have 30 CSH)
+                    // 29 KSL does not include 30 KSL (but would include an invalid 31 KSL if there were no 30 KSL)
+                    if ($anniv->d === 1) {
+                        $tmp = new JewishDate(array($anniv->y, 'CSH', 1));
+                        if ($tmp->daysInMonth() === 29) {
+                            $where .= " AND (d_day <= 1 AND d_mon = 3 OR d_day = 30 AND d_mon = 2)";
+                        } else {
+                            $where .= " AND d_day <= 1 AND d_mon = 3";
+                        }
+                    } elseif ($anniv->d === 30) {
+                        $where .= " AND d_day >= 30 AND d_mon = 3";
+                    } elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
+                        $where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
+                    } else {
+                        $where .= " AND d_day = :day AND d_mon = 3";
+                        $args['day'] = $anniv->d;
+                    }
+                    break;
+                case 4:
+                    // 1 TVT includes 30 KSL (if this year didn’t have 30 KSL)
+                    if ($anniv->d === 1) {
+                        $tmp = new JewishDate(array($anniv->y, 'KSL', 1));
+                        if ($tmp->daysInMonth() === 29) {
+                            $where .= " AND (d_day <=1 AND d_mon = 4 OR d_day = 30 AND d_mon = 3)";
+                        } else {
+                            $where .= " AND d_day <= 1 AND d_mon = 4";
+                        }
+                    } elseif ($anniv->d === $anniv->daysInMonth()) {
+                        $where .= " AND d_day >= :day AND d_mon=4";
+                        $args['day'] = $anniv->d;
+                    } else {
+                        $where .= " AND d_day = :day AND d_mon=4";
+                        $args['day'] = $anniv->d;
+                    }
+                    break;
+                case 7: // ADS includes ADR (non-leap)
+                    if ($anniv->d === 1) {
+                        $where .= " AND d_day <= 1";
+                    } elseif ($anniv->d === $anniv->daysInMonth()) {
+                        $where .= " AND d_day >= :day";
+                        $args['day'] = $anniv->d;
+                    } else {
+                        $where .= " AND d_day = :day";
+                        $args['day'] = $anniv->d;
+                    }
+                    $where .= " AND (d_mon = 6 AND MOD(7 * d_year + 1, 19) >= 7 OR d_mon = 7)";
+                    break;
+                case 8: // 1 NSN includes 30 ADR, if this year is non-leap
+                    if ($anniv->d === 1) {
+                        if ($anniv->isLeapYear()) {
+                            $where .= " AND d_day <= 1 AND d_mon = 8";
+                        } else {
+                            $where .= " AND (d_day <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
+                        }
+                    } elseif ($anniv->d === $anniv->daysInMonth()) {
+                        $where .= " AND d_day >= :day AND d_mon = 8";
+                        $args['day'] = $anniv->d;
+                    } else {
+                        $where .= " AND d_day = :day AND d_mon = 8";
+                        $args['day'] = $anniv->d;
+                    }
+                    break;
+                }
+            }
+            // Only events in the past (includes dates without a year)
+            $where .= " AND d_year <= :year";
+            $args['year'] = $anniv->y;
+
+            if ($facts) {
+                // Restrict to certain types of fact
+                $where .= " AND d_fact IN (";
+                preg_match_all('/([_A-Z]+)/', $facts, $matches);
+                foreach ($matches[1] as $n => $fact) {
+                    $where .= $n ? ", " : "";
+                    $where .= ":fact_" . $n;
+                    $args['fact_' . $n] = $fact;
+                }
+                $where .= ")";
+            } else {
+                // If no facts specified, get all except these
+                $where .= " AND d_fact NOT IN ('CHAN', 'BAPL', 'SLGC', 'SLGS', 'ENDL', 'CENS', 'RESI', '_TODO')";
+            }
+
+            $order_by = " ORDER BY d_day, d_year DESC";
+
+            // Now fetch these anniversaries
+            foreach (array('INDI' => $ind_sql . $where . $order_by, 'FAM' => $fam_sql . $where . $order_by) as $type => $sql) {
+                $rows = Database::prepare($sql)->execute($args)->fetchAll();
+                foreach ($rows as $row) {
+                    if ($type === 'INDI') {
+                        $record = Individual::getInstance($row->xref, $tree, $row->gedcom);
+                    } else {
+                        $record = Family::getInstance($row->xref, $tree, $row->gedcom);
+                    }
+                    $anniv_date = new Date($row->d_type . ' ' . $row->d_day . ' ' . $row->d_month . ' ' . $row->d_year);
+                    foreach ($record->getFacts() as $fact) {
+                        if (($fact->getDate()->minimumDate() == $anniv_date->minimumDate() || $fact->getDate()->maximumDate() == $anniv_date->minimumDate()) && $fact->getTag() === $row->d_fact) {
+                            $fact->anniv   = $row->d_year === '0' ? 0 : $anniv->y - $row->d_year;
+                            $found_facts[] = $fact;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $found_facts;
+    }
+
+    /**
+     * Get a list of events which occured during a given date range.
+     *
+     * @param int $jd1 the start range of julian day
+     * @param int $jd2 the end range of julian day
+     * @param string $facts restrict the search to just these facts or leave blank for all
+     * @param Tree $tree the tree to search
+     *
+     * @return Fact[]
+     */
+    public static function getCalendarEvents($jd1, $jd2, $facts, Tree $tree) {
+        // If no facts specified, get all except these
+        $skipfacts = "CHAN,BAPL,SLGC,SLGS,ENDL,CENS,RESI,NOTE,ADDR,OBJE,SOUR,PAGE,DATA,TEXT";
+
+        $found_facts = array();
+
+        // Events that start or end during the period
+        $where = "WHERE (d_julianday1>={$jd1} AND d_julianday1<={$jd2} OR d_julianday2>={$jd1} AND d_julianday2<={$jd2})";
+
+        // Restrict to certain types of fact
+        if (empty($facts)) {
+            $excl_facts = "'" . preg_replace('/\W+/', "','", $skipfacts) . "'";
+            $where .= " AND d_fact NOT IN ({$excl_facts})";
+        } else {
+            $incl_facts = "'" . preg_replace('/\W+/', "','", $facts) . "'";
+            $where .= " AND d_fact IN ({$incl_facts})";
+        }
+        // Only get events from the current gedcom
+        $where .= " AND d_file=" . $tree->getTreeId();
+
+        // Now fetch these events
+        $ind_sql = "SELECT d_gid AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##individuals` {$where} AND d_gid=i_id AND d_file=i_file ORDER BY d_julianday1";
+        $fam_sql = "SELECT d_gid AS xref, f_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##families`    {$where} AND d_gid=f_id AND d_file=f_file ORDER BY d_julianday1";
+        foreach (array('INDI' => $ind_sql, 'FAM' => $fam_sql) as $type => $sql) {
+            $rows = Database::prepare($sql)->fetchAll();
+            foreach ($rows as $row) {
+                if ($type === 'INDI') {
+                    $record = Individual::getInstance($row->xref, $tree, $row->gedcom);
+                } else {
+                    $record = Family::getInstance($row->xref, $tree, $row->gedcom);
+                }
+                $anniv_date = new Date($row->d_type . ' ' . $row->d_day . ' ' . $row->d_month . ' ' . $row->d_year);
+                foreach ($record->getFacts() as $fact) {
+                    if (($fact->getDate()->minimumDate() == $anniv_date->minimumDate() || $fact->getDate()->maximumDate() == $anniv_date->minimumDate()) && $fact->getTag() === $row->d_fact) {
+                        $fact->anniv   = 0;
+                        $found_facts[] = $fact;
+                    }
+                }
+            }
+        }
+
+        return $found_facts;
+    }
+
+    /**
+     * Get the list of current and upcoming events, sorted by anniversary date
+     *
+     * @param int $jd1
+     * @param int $jd2
+     * @param string $events
+     * @param Tree $tree
+     *
+     * @return Fact[]
+     */
+    public static function getEventsList($jd1, $jd2, $events, Tree $tree) {
+        $found_facts = array();
+        for ($jd = $jd1; $jd <= $jd2; ++$jd) {
+            $found_facts = array_merge($found_facts, self::getAnniversaryEvents($jd, $events, $tree));
+        }
+
+        return $found_facts;
+    }
+
+    /**
+     * Check if a media file is shared (i.e. used by another gedcom)
+     *
+     * @param string $file_name
+     * @param int $ged_id
+     *
+     * @return bool
+     */
+    public static function isMediaUsedInOtherTree($file_name, $ged_id) {
+        return
+            (bool) Database::prepare("SELECT COUNT(*) FROM `##media` WHERE m_filename LIKE ? AND m_file<>?")
+                ->execute(array("%{$file_name}", $ged_id))
+                ->fetchOne();
+    }
+
+    /**
+     * Get the blocks for a specified user.
+     *
+     * @param int $user_id
+     *
+     * @return string[][]
+     */
+    public static function getUserBlocks($user_id) {
+        global $WT_TREE;
+
+        $blocks = array('main' => array(), 'side' => array());
+        $rows   = Database::prepare(
+            "SELECT location, block_id, module_name" .
+            " FROM  `##block`" .
+            " JOIN  `##module` USING (module_name)" .
+            " JOIN  `##module_privacy` USING (module_name)" .
+            " WHERE user_id=?" .
+            " AND   status='enabled'" .
+            " AND   `##module_privacy`.gedcom_id=?" .
+            " AND   access_level>=?" .
+            " ORDER BY location, block_order"
+        )->execute(array($user_id, $WT_TREE->getTreeId(), Auth::accessLevel($WT_TREE)))->fetchAll();
+        foreach ($rows as $row) {
+            $blocks[$row->location][$row->block_id] = $row->module_name;
+        }
+
+        return $blocks;
+    }
+
+    /**
+     * Get the blocks for the specified tree
+     *
+     * @param int $gedcom_id
+     *
+     * @return string[][]
+     */
+    public static function getTreeBlocks($gedcom_id) {
+        if ($gedcom_id < 0) {
+            $access_level = Auth::PRIV_NONE;
+        } else {
+            $access_level = Auth::accessLevel(Tree::findById($gedcom_id));
+        }
+
+        $blocks = array('main' => array(), 'side' => array());
+        $rows   = Database::prepare(
+            "SELECT location, block_id, module_name" .
+            " FROM  `##block`" .
+            " JOIN  `##module` USING (module_name)" .
+            " JOIN  `##module_privacy` USING (module_name, gedcom_id)" .
+            " WHERE gedcom_id = :tree_id" .
+            " AND   status='enabled'" .
+            " AND   access_level >= :access_level" .
+            " ORDER BY location, block_order"
+        )->execute(array(
+            'tree_id'      => $gedcom_id,
+            'access_level' => $access_level,
+        ))->fetchAll();
+        foreach ($rows as $row) {
+            $blocks[$row->location][$row->block_id] = $row->module_name;
+        }
+
+        return $blocks;
+    }
+
+    /**
+     * Update favorites after merging records.
+     *
+     * @param string $xref_from
+     * @param string $xref_to
+     * @param Tree $tree
+     *
+     * @return int
+     */
+    public static function updateFavorites($xref_from, $xref_to, Tree $tree) {
+        return
+            Database::prepare("UPDATE `##favorite` SET xref=? WHERE xref=? AND gedcom_id=?")
+                ->execute(array($xref_to, $xref_from, $tree->getTreeId()))
+                ->rowCount();
+    }
 }

Switch Indentation +106 added lines, -106 removed lines

@@ -249,18 +249,18 @@ 
 	 */
 	public static function searchIndividualsPhonetic($soundex, $lastname, $firstname, $place, array $trees) {
 		switch ($soundex) {
-		case 'Russell':
-			$givn_sdx = Soundex::russell($firstname);
-			$surn_sdx = Soundex::russell($lastname);
-			$plac_sdx = Soundex::russell($place);
-			break;
-		case 'DaitchM':
-			$givn_sdx = Soundex::daitchMokotoff($firstname);
-			$surn_sdx = Soundex::daitchMokotoff($lastname);
-			$plac_sdx = Soundex::daitchMokotoff($place);
-			break;
-		default:
-			throw new \DomainException('soundex: ' . $soundex);
+		    case 'Russell':
+			    $givn_sdx = Soundex::russell($firstname);
+			    $surn_sdx = Soundex::russell($lastname);
+			    $plac_sdx = Soundex::russell($place);
+			    break;
+		    case 'DaitchM':
+			    $givn_sdx = Soundex::daitchMokotoff($firstname);
+			    $surn_sdx = Soundex::daitchMokotoff($lastname);
+			    $plac_sdx = Soundex::daitchMokotoff($place);
+			    break;
+		    default:
+			    throw new \DomainException('soundex: ' . $soundex);
 		}
 
 		// Nothing to search for? Return nothing.
@@ -292,12 +292,12 @@ 
 			foreach ($givn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-				case 'Russell':
-					$sql .= "n_soundex_givn_std LIKE CONCAT('%', :given_name_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "n_soundex_givn_dm LIKE CONCAT('%', :given_name_" . $n . ", '%')";
-					break;
+				    case 'Russell':
+					    $sql .= "n_soundex_givn_std LIKE CONCAT('%', :given_name_" . $n . ", '%')";
+					    break;
+				    case 'DaitchM':
+					    $sql .= "n_soundex_givn_dm LIKE CONCAT('%', :given_name_" . $n . ", '%')";
+					    break;
 				}
 				$args['given_name_' . $n] = $sdx;
 			}
@@ -310,12 +310,12 @@ 
 			foreach ($surn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-				case 'Russell':
-					$sql .= "n_soundex_surn_std LIKE CONCAT('%', :surname_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "n_soundex_surn_dm LIKE CONCAT('%', :surname_" . $n . ", '%')";
-					break;
+				    case 'Russell':
+					    $sql .= "n_soundex_surn_std LIKE CONCAT('%', :surname_" . $n . ", '%')";
+					    break;
+				    case 'DaitchM':
+					    $sql .= "n_soundex_surn_dm LIKE CONCAT('%', :surname_" . $n . ", '%')";
+					    break;
 				}
 				$args['surname_' . $n] = $sdx;
 			}
@@ -328,12 +328,12 @@ 
 			foreach ($plac_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-				case 'Russell':
-					$sql .= "p_std_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "p_dm_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
-					break;
+				    case 'Russell':
+					    $sql .= "p_std_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
+					    break;
+				    case 'DaitchM':
+					    $sql .= "p_dm_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
+					    break;
 				}
 				$args['place_' . $n] = $sdx;
 			}
@@ -758,82 +758,82 @@ 
 			} else {
 				// SPECIAL CASES:
 				switch ($anniv->m) {
-				case 2:
-					// 29 CSH does not include 30 CSH (but would include an invalid 31 CSH if there were no 30 CSH)
-					if ($anniv->d === 1) {
-						$where .= " AND d_day <= 1 AND d_mon = 2";
-					} elseif ($anniv->d === 30) {
-						$where .= " AND d_day >= 30 AND d_mon = 2";
-					} elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
-						$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 2";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 3:
-					// 1 KSL includes 30 CSH (if this year didn’t have 30 CSH)
-					// 29 KSL does not include 30 KSL (but would include an invalid 31 KSL if there were no 30 KSL)
-					if ($anniv->d === 1) {
-						$tmp = new JewishDate(array($anniv->y, 'CSH', 1));
-						if ($tmp->daysInMonth() === 29) {
-							$where .= " AND (d_day <= 1 AND d_mon = 3 OR d_day = 30 AND d_mon = 2)";
-						} else {
-							$where .= " AND d_day <= 1 AND d_mon = 3";
-						}
-					} elseif ($anniv->d === 30) {
-						$where .= " AND d_day >= 30 AND d_mon = 3";
-					} elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
-						$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 3";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 4:
-					// 1 TVT includes 30 KSL (if this year didn’t have 30 KSL)
-					if ($anniv->d === 1) {
-						$tmp = new JewishDate(array($anniv->y, 'KSL', 1));
-						if ($tmp->daysInMonth() === 29) {
-							$where .= " AND (d_day <=1 AND d_mon = 4 OR d_day = 30 AND d_mon = 3)";
-						} else {
-							$where .= " AND d_day <= 1 AND d_mon = 4";
-						}
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day AND d_mon=4";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day AND d_mon=4";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 7: // ADS includes ADR (non-leap)
-					if ($anniv->d === 1) {
-						$where .= " AND d_day <= 1";
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day";
-						$args['day'] = $anniv->d;
-					}
-					$where .= " AND (d_mon = 6 AND MOD(7 * d_year + 1, 19) >= 7 OR d_mon = 7)";
-					break;
-				case 8: // 1 NSN includes 30 ADR, if this year is non-leap
-					if ($anniv->d === 1) {
-						if ($anniv->isLeapYear()) {
-							$where .= " AND d_day <= 1 AND d_mon = 8";
-						} else {
-							$where .= " AND (d_day <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
-						}
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day AND d_mon = 8";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 8";
-						$args['day'] = $anniv->d;
-					}
-					break;
+				    case 2:
+					    // 29 CSH does not include 30 CSH (but would include an invalid 31 CSH if there were no 30 CSH)
+					    if ($anniv->d === 1) {
+						    $where .= " AND d_day <= 1 AND d_mon = 2";
+					    } elseif ($anniv->d === 30) {
+						    $where .= " AND d_day >= 30 AND d_mon = 2";
+					    } elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
+						    $where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
+					    } else {
+						    $where .= " AND d_day = :day AND d_mon = 2";
+						    $args['day'] = $anniv->d;
+					    }
+					    break;
+				    case 3:
+					    // 1 KSL includes 30 CSH (if this year didn’t have 30 CSH)
+					    // 29 KSL does not include 30 KSL (but would include an invalid 31 KSL if there were no 30 KSL)
+					    if ($anniv->d === 1) {
+						    $tmp = new JewishDate(array($anniv->y, 'CSH', 1));
+						    if ($tmp->daysInMonth() === 29) {
+							    $where .= " AND (d_day <= 1 AND d_mon = 3 OR d_day = 30 AND d_mon = 2)";
+						    } else {
+							    $where .= " AND d_day <= 1 AND d_mon = 3";
+						    }
+					    } elseif ($anniv->d === 30) {
+						    $where .= " AND d_day >= 30 AND d_mon = 3";
+					    } elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
+						    $where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
+					    } else {
+						    $where .= " AND d_day = :day AND d_mon = 3";
+						    $args['day'] = $anniv->d;
+					    }
+					    break;
+				    case 4:
+					    // 1 TVT includes 30 KSL (if this year didn’t have 30 KSL)
+					    if ($anniv->d === 1) {
+						    $tmp = new JewishDate(array($anniv->y, 'KSL', 1));
+						    if ($tmp->daysInMonth() === 29) {
+							    $where .= " AND (d_day <=1 AND d_mon = 4 OR d_day = 30 AND d_mon = 3)";
+						    } else {
+							    $where .= " AND d_day <= 1 AND d_mon = 4";
+						    }
+					    } elseif ($anniv->d === $anniv->daysInMonth()) {
+						    $where .= " AND d_day >= :day AND d_mon=4";
+						    $args['day'] = $anniv->d;
+					    } else {
+						    $where .= " AND d_day = :day AND d_mon=4";
+						    $args['day'] = $anniv->d;
+					    }
+					    break;
+				    case 7: // ADS includes ADR (non-leap)
+					    if ($anniv->d === 1) {
+						    $where .= " AND d_day <= 1";
+					    } elseif ($anniv->d === $anniv->daysInMonth()) {
+						    $where .= " AND d_day >= :day";
+						    $args['day'] = $anniv->d;
+					    } else {
+						    $where .= " AND d_day = :day";
+						    $args['day'] = $anniv->d;
+					    }
+					    $where .= " AND (d_mon = 6 AND MOD(7 * d_year + 1, 19) >= 7 OR d_mon = 7)";
+					    break;
+				    case 8: // 1 NSN includes 30 ADR, if this year is non-leap
+					    if ($anniv->d === 1) {
+						    if ($anniv->isLeapYear()) {
+							    $where .= " AND d_day <= 1 AND d_mon = 8";
+						    } else {
+							    $where .= " AND (d_day <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
+						    }
+					    } elseif ($anniv->d === $anniv->daysInMonth()) {
+						    $where .= " AND d_day >= :day AND d_mon = 8";
+						    $args['day'] = $anniv->d;
+					    } else {
+						    $where .= " AND d_day = :day AND d_mon = 8";
+						    $args['day'] = $anniv->d;
+					    }
+					    break;
 				}
 			}
 			// Only events in the past (includes dates without a year)

Braces +46 added lines, -23 removed lines

@@ -38,7 +38,8 @@ 
 /**
  * Class FunctionsDb - common functions
  */
-class FunctionsDb {
+class FunctionsDb
+{
 	/**
 	 * Fetch all records linked to a record - when deleting an object, we must
 	 * also delete all links to it.
@@ -48,7 +49,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function fetchAllLinks($xref, $gedcom_id) {
+	public static function fetchAllLinks($xref, $gedcom_id)
+	{
 		return
 			Database::prepare(
 				"SELECT l_from FROM `##link` WHERE l_file = ? AND l_to = ?" .
@@ -71,7 +73,8 @@ 
 	 *
 	 * @return Source[] array
 	 */
-	public static function getSourceList(Tree $tree) {
+	public static function getSourceList(Tree $tree)
+	{
 		$rows = Database::prepare(
 			"SELECT s_id AS xref, s_gedcom AS gedcom FROM `##sources` WHERE s_file = :tree_id"
 		)->execute(array(
@@ -95,7 +98,8 @@ 
 	 *
 	 * @return Repository[] array
 	 */
-	public static function getRepositoryList(Tree $tree) {
+	public static function getRepositoryList(Tree $tree)
+	{
 		$rows = Database::prepare(
 			"SELECT o_id AS xref, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'REPO' AND o_file = ?"
 		)->execute(array(
@@ -119,7 +123,8 @@ 
 	 *
 	 * @return Note[] array
 	 */
-	public static function getNoteList(Tree $tree) {
+	public static function getNoteList(Tree $tree)
+	{
 		$rows = Database::prepare(
 			"SELECT o_id AS xref, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'NOTE' AND o_file = :tree_id"
 		)->execute(array(
@@ -144,7 +149,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public static function searchIndividuals(array $query, array $trees) {
+	public static function searchIndividuals(array $query, array $trees)
+	{
 		// Convert the query into a regular expression
 		$queryregex = array();
 
@@ -197,7 +203,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public static function searchIndividualNames(array $query, array $trees) {
+	public static function searchIndividualNames(array $query, array $trees)
+	{
 		$sql  = "SELECT DISTINCT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom, n_full FROM `##individuals` JOIN `##name` ON i_id=n_id AND i_file=n_file WHERE 1";
 		$args = array();
 
@@ -247,7 +254,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public static function searchIndividualsPhonetic($soundex, $lastname, $firstname, $place, array $trees) {
+	public static function searchIndividualsPhonetic($soundex, $lastname, $firstname, $place, array $trees)
+	{
 		switch ($soundex) {
 		case 'Russell':
 			$givn_sdx = Soundex::russell($firstname);
@@ -358,7 +366,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public static function searchFamilies(array $query, array $trees) {
+	public static function searchFamilies(array $query, array $trees)
+	{
 		// Convert the query into a regular expression
 		$queryregex = array();
 
@@ -413,7 +422,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public static function searchFamilyNames(array $query, array $trees) {
+	public static function searchFamilyNames(array $query, array $trees)
+	{
 		// No query => no results
 		if (!$query) {
 			return array();
@@ -471,7 +481,8 @@ 
 	 *
 	 * @return Source[]
 	 */
-	public static function searchSources($query, $trees) {
+	public static function searchSources($query, $trees)
+	{
 		// Convert the query into a regular expression
 		$queryregex = array();
 
@@ -526,7 +537,8 @@ 
 	 *
 	 * @return Note[]
 	 */
-	public static function searchNotes(array $query, array $trees) {
+	public static function searchNotes(array $query, array $trees)
+	{
 		// Convert the query into a regular expression
 		$queryregex = array();
 
@@ -581,7 +593,8 @@ 
 	 *
 	 * @return Repository[]
 	 */
-	public static function searchRepositories(array $query, array $trees) {
+	public static function searchRepositories(array $query, array $trees)
+	{
 		// Convert the query into a regular expression
 		$queryregex = array();
 
@@ -635,7 +648,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function findRin($rin) {
+	public static function findRin($rin)
+	{
 		global $WT_TREE;
 
 		$xref =
@@ -659,7 +673,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public static function getCommonSurnames($min, Tree $tree) {
+	public static function getCommonSurnames($min, Tree $tree)
+	{
 		return self::getTopSurnames($tree->getTreeId(), $min, 0);
 	}
 
@@ -672,7 +687,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public static function getTopSurnames($ged_id, $min, $max) {
+	public static function getTopSurnames($ged_id, $min, $max)
+	{
 		// Use n_surn, rather than n_surname, as it is used to generate URLs for
 		// the indi-list, etc.
 		$max = (int) $max;
@@ -713,7 +729,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	public static function getAnniversaryEvents($jd, $facts, Tree $tree) {
+	public static function getAnniversaryEvents($jd, $facts, Tree $tree)
+	{
 		$found_facts = array();
 		foreach (array(
 			new GregorianDate($jd),
@@ -890,7 +907,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	public static function getCalendarEvents($jd1, $jd2, $facts, Tree $tree) {
+	public static function getCalendarEvents($jd1, $jd2, $facts, Tree $tree)
+	{
 		// If no facts specified, get all except these
 		$skipfacts = "CHAN,BAPL,SLGC,SLGS,ENDL,CENS,RESI,NOTE,ADDR,OBJE,SOUR,PAGE,DATA,TEXT";
 
@@ -944,7 +962,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	public static function getEventsList($jd1, $jd2, $events, Tree $tree) {
+	public static function getEventsList($jd1, $jd2, $events, Tree $tree)
+	{
 		$found_facts = array();
 		for ($jd = $jd1; $jd <= $jd2; ++$jd) {
 			$found_facts = array_merge($found_facts, self::getAnniversaryEvents($jd, $events, $tree));
@@ -961,7 +980,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function isMediaUsedInOtherTree($file_name, $ged_id) {
+	public static function isMediaUsedInOtherTree($file_name, $ged_id)
+	{
 		return
 			(bool) Database::prepare("SELECT COUNT(*) FROM `##media` WHERE m_filename LIKE ? AND m_file<>?")
 				->execute(array("%{$file_name}", $ged_id))
@@ -975,7 +995,8 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public static function getUserBlocks($user_id) {
+	public static function getUserBlocks($user_id)
+	{
 		global $WT_TREE;
 
 		$blocks = array('main' => array(), 'side' => array());
@@ -1004,7 +1025,8 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public static function getTreeBlocks($gedcom_id) {
+	public static function getTreeBlocks($gedcom_id)
+	{
 		if ($gedcom_id < 0) {
 			$access_level = Auth::PRIV_NONE;
 		} else {
@@ -1041,7 +1063,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function updateFavorites($xref_from, $xref_to, Tree $tree) {
+	public static function updateFavorites($xref_from, $xref_to, Tree $tree)
+	{
 		return
 			Database::prepare("UPDATE `##favorite` SET xref=? WHERE xref=? AND gedcom_id=?")
 				->execute(array($xref_to, $xref_from, $tree->getTreeId()))