| @@ -242,7 +242,7 @@ discard block | ||
| 242 | 242 |                              if ($spouse === $individual2) { | 
| 243 | 243 | return $new_path; | 
| 244 | 244 | } | 
| 245 | - $paths[] = $new_path; | |
| 245 | + $paths[] = $new_path; | |
| 246 | 246 | $visited[$spouse->xref()] = true; | 
| 247 | 247 | } | 
| 248 | 248 | } | 
| @@ -255,7 +255,7 @@ discard block | ||
| 255 | 255 |                              if ($child === $individual2) { | 
| 256 | 256 | return $new_path; | 
| 257 | 257 | } | 
| 258 | - $paths[] = $new_path; | |
| 258 | + $paths[] = $new_path; | |
| 259 | 259 | $visited[$child->xref()] = true; | 
| 260 | 260 | } | 
| 261 | 261 | } | 
| @@ -272,7 +272,7 @@ discard block | ||
| 272 | 272 |                              if ($spouse === $individual2) { | 
| 273 | 273 | return $new_path; | 
| 274 | 274 | } | 
| 275 | - $paths[] = $new_path; | |
| 275 | + $paths[] = $new_path; | |
| 276 | 276 | $visited[$spouse->xref()] = true; | 
| 277 | 277 | } | 
| 278 | 278 | } | 
| @@ -285,7 +285,7 @@ discard block | ||
| 285 | 285 |                              if ($child === $individual2) { | 
| 286 | 286 | return $new_path; | 
| 287 | 287 | } | 
| 288 | - $paths[] = $new_path; | |
| 288 | + $paths[] = $new_path; | |
| 289 | 289 | $visited[$child->xref()] = true; | 
| 290 | 290 | } | 
| 291 | 291 | } | 
| @@ -1574,9 +1574,9 @@ discard block | ||
| 1574 | 1574 |                                  return I18N::translate('great ×%s aunt', I18N::number($up - 2)); | 
| 1575 | 1575 | } | 
| 1576 | 1576 |                              return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 2)); | 
| 1577 | - case 'zh-Hans': | |
| 1578 | - case 'zh-Hant': | |
| 1579 | -			    if ($sex2 === 'M') { | |
| 1577 | + case 'zh-Hans': | |
| 1578 | + case 'zh-Hant': | |
| 1579 | +                if ($sex2 === 'M') { | |
| 1580 | 1580 |                                  return I18N::translate('great ×%s uncle', I18N::number($up)); | 
| 1581 | 1581 | } | 
| 1582 | 1582 |                              if ($sex2 === 'F') { | 
| @@ -1740,8 +1740,8 @@ discard block | ||
| 1740 | 1740 |                                  return I18N::translateContext('(a man’s) sister’s great ×(%s-1) grandchild', 'great ×%s nephew/niece', I18N::number($down - 3)); | 
| 1741 | 1741 | } | 
| 1742 | 1742 |                              return I18N::translateContext('(a woman’s) great ×%s nephew/niece', 'great ×%s nephew/niece', I18N::number($down - 3)); | 
| 1743 | - case 'zh-Hans': | |
| 1744 | - case 'zh-Hant': | |
| 1743 | + case 'zh-Hans': | |
| 1744 | + case 'zh-Hant': | |
| 1745 | 1745 |                              if ($sex2 === 'M') { | 
| 1746 | 1746 |                                  if ($first === 'bro' && $sex1 === 'M') { | 
| 1747 | 1747 |                                      return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 1)); | 
| @@ -1858,8 +1858,8 @@ discard block | ||
| 1858 | 1858 | } | 
| 1859 | 1859 |                              return I18N::translate('great ×%s grandparent', I18N::number($up - 3)); | 
| 1860 | 1860 | case 'it': // Source: Michele Locati | 
| 1861 | - case 'zh-Hans': | |
| 1862 | - case 'zh-Hant': | |
| 1861 | + case 'zh-Hans': | |
| 1862 | + case 'zh-Hant': | |
| 1863 | 1863 | case 'es': // Source: Wes Groleau | 
| 1864 | 1864 |                              if ($sex2 === 'M') { | 
| 1865 | 1865 |                                  return I18N::translate('great ×%s grandfather', I18N::number($up)); | 
| @@ -1868,7 +1868,7 @@ discard block | ||
| 1868 | 1868 |                                  return I18N::translate('great ×%s grandmother', I18N::number($up)); | 
| 1869 | 1869 | } | 
| 1870 | 1870 |                              return I18N::translate('great ×%s grandparent', I18N::number($up)); | 
| 1871 | - case 'fr': // Source: Jacqueline Tetreault | |
| 1871 | + case 'fr': // Source: Jacqueline Tetreault | |
| 1872 | 1872 | case 'fr_CA': | 
| 1873 | 1873 |                              if ($sex2 === 'M') { | 
| 1874 | 1874 |                                  return I18N::translate('great ×%s grandfather', I18N::number($up - 1)); | 
| @@ -1974,8 +1974,8 @@ discard block | ||
| 1974 | 1974 |                                  return I18N::translate('great ×%s granddaughter', I18N::number($up - 3)); | 
| 1975 | 1975 | } | 
| 1976 | 1976 |                              return I18N::translate('great ×%s grandchild', I18N::number($up - 3)); | 
| 1977 | - case 'zh-Hans': | |
| 1978 | - case 'zh-Hant': | |
| 1977 | + case 'zh-Hans': | |
| 1978 | + case 'zh-Hant': | |
| 1979 | 1979 |                              if ($sex2 === 'M') { | 
| 1980 | 1980 |                                  return I18N::translate('great ×%s grandson', I18N::number($up)); | 
| 1981 | 1981 | } | 
| @@ -1983,7 +1983,7 @@ discard block | ||
| 1983 | 1983 |                                  return I18N::translate('great ×%s granddaughter', I18N::number($up)); | 
| 1984 | 1984 | } | 
| 1985 | 1985 |                              return I18N::translate('great ×%s grandchild', I18N::number($up)); | 
| 1986 | - case 'it': | |
| 1986 | + case 'it': | |
| 1987 | 1987 | // Source: Michele Locati | 
| 1988 | 1988 | case 'es': | 
| 1989 | 1989 | // Source: Wes Groleau (adding doesn’t change behavior, but needs to be better researched) |