fisharebest / webtrees

app/Module/GoogleMapsModule.php

Switch Indentation +58 added lines, -58 removed lines

@@ -87,30 +87,30 @@ 
 		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
 
 		switch ($mod_action) {
-		case 'admin_config':
-			$this->config();
-			break;
-		case 'flags':
-			$this->flags();
-			break;
-		case 'pedigree_map':
-			$this->pedigreeMap();
-			break;
-		case 'admin_placecheck':
-			$this->adminPlaceCheck();
-			break;
-		case 'admin_places':
-			$this->adminPlaces();
-			break;
-		case 'places_edit':
-			$this->placesEdit();
-			break;
-		case 'wt_street_view':
-			$this->wtStreetView();
-			break;
-		default:
-			http_response_code(404);
-			break;
+			case 'admin_config':
+				$this->config();
+				break;
+			case 'flags':
+				$this->flags();
+				break;
+			case 'pedigree_map':
+				$this->pedigreeMap();
+				break;
+			case 'admin_placecheck':
+				$this->adminPlaceCheck();
+				break;
+			case 'admin_places':
+				$this->adminPlaces();
+				break;
+			case 'places_edit':
+				$this->placesEdit();
+				break;
+			case 'wt_street_view':
+				$this->wtStreetView();
+				break;
+			default:
+				http_response_code(404);
+				break;
 		}
 	}
 
@@ -1186,24 +1186,24 @@ 
 							if ($latlongval[$i] == $latlongval[$k]) {
 								$dups++;
 								switch ($dups) {
-								case 1:
-									$marker_number = $curgen . 'L';
-									break;
-								case 2:
-									$marker_number = $curgen . 'R';
-									break;
-								case 3:
-									$marker_number = $curgen . 'Ls';
-									break;
-								case 4:
-									$marker_number = $curgen . 'Rs';
-									break;
-								case 5: //adjust position where markers have same coodinates
-								default:
-									$marker_number = $curgen;
-									$lon[$i] += 0.0025;
-									$lat[$i] += 0.0025;
-									break;
+									case 1:
+										$marker_number = $curgen . 'L';
+										break;
+									case 2:
+										$marker_number = $curgen . 'R';
+										break;
+									case 3:
+										$marker_number = $curgen . 'Ls';
+										break;
+									case 4:
+										$marker_number = $curgen . 'Rs';
+										break;
+									case 5: //adjust position where markers have same coodinates
+									default:
+										$marker_number = $curgen;
+										$lon[$i] += 0.0025;
+										$lat[$i] += 0.0025;
+										break;
 								}
 							}
 						}
@@ -3055,22 +3055,22 @@ 
 				<?php
 				$coordsAsStr = array();
 				switch (strtoupper($place_name)) {
-				case 'ENGLAND':
-					$coordsAsStr[] = '-4.74361,50.66750|-4.78361,50.59361|-4.91584,50.57722|-5.01750,50.54264|-5.02569,50.47271|-5.04729,50.42750|-5.15208,50.34374|-5.26805,50.27389|-5.43194,50.19326|-5.49584,50.21695|-5.54639,50.20527|-5.71000,50.12916|-5.71681,50.06083|-5.66174,50.03631|-5.58278,50.04777|-5.54166,50.07055|-5.53416,50.11569|-5.47055,50.12499|-5.33361,50.09138|-5.27666,50.05972|-5.25674,50.00514|-5.19306,49.95527|-5.16070,50.00319|-5.06555,50.03750|-5.07090,50.08166|-5.04806,50.17111|-4.95278,50.19333|-4.85750,50.23166|-4.76250,50.31138|-4.67861,50.32583|-4.54334,50.32222|-4.48278,50.32583|-4.42972,50.35139|-4.38000,50.36388|-4.16555,50.37028|-4.11139,50.33027|-4.05708,50.29791|-3.94389,50.31346|-3.87764,50.28139|-3.83653,50.22972|-3.78944,50.21222|-3.70666,50.20972|-3.65195,50.23111|-3.55139,50.43833|-3.49416,50.54639|-3.46181,50.58792|-3.41139,50.61610|-3.24416,50.67444|-3.17347,50.68833|-3.09445,50.69222|-2.97806,50.70638|-2.92750,50.73125|-2.88278,50.73111|-2.82305,50.72027|-2.77139,50.70861|-2.66195,50.67334|-2.56305,50.63222|-2.45861,50.57500|-2.44666,50.62639|-2.39097,50.64166|-2.19722,50.62611|-2.12195,50.60722|-2.05445,50.58569|-1.96437,50.59674|-1.95441,50.66536|-2.06681,50.71430|-1.93416,50.71277|-1.81639,50.72306|-1.68445,50.73888|-1.59278,50.72416|-1.33139,50.79138|-1.11695,50.80694|-1.15889,50.84083|-1.09445,50.84584|-0.92842,50.83966|-0.86584,50.79965|-0.90826,50.77396|-0.78187,50.72722|-0.74611,50.76583|-0.67528,50.78111|-0.57722,50.79527|-0.25500,50.82638|-0.19084,50.82583|-0.13805,50.81833|0.05695,50.78083|0.12334,50.75944|0.22778,50.73944|0.28695,50.76500|0.37195,50.81638|0.43084,50.83111|0.56722,50.84777|0.67889,50.87681|0.71639,50.90500|0.79334,50.93610|0.85666,50.92556|0.97125,50.98111|0.99778,51.01903|1.04555,51.04944|1.10028,51.07361|1.26250,51.10166|1.36889,51.13583|1.41111,51.20111|1.42750,51.33111|1.38556,51.38777|1.19195,51.37861|1.05278,51.36722|0.99916,51.34777|0.90806,51.34069|0.70416,51.37749|0.61972,51.38304|0.55945,51.40596|0.64236,51.44042|0.69750,51.47084|0.59195,51.48777|0.53611,51.48806|0.48916,51.48445|0.45215,51.45562|0.38894,51.44822|0.46500,51.50306|0.65195,51.53680|0.76695,51.52138|0.82084,51.53556|0.87528,51.56110|0.95250,51.60923|0.94695,51.72556|0.90257,51.73465|0.86306,51.71166|0.76140,51.69164|0.70111,51.71847|0.86211,51.77361|0.93236,51.80583|0.98278,51.82527|1.03569,51.77416|1.08834,51.77056|1.13222,51.77694|1.18139,51.78972|1.22361,51.80888|1.26611,51.83916|1.28097,51.88096|1.20834,51.95083|1.16347,52.02361|1.27750,51.98555|1.33125,51.92875|1.39028,51.96999|1.58736,52.08388|1.63000,52.19527|1.68576,52.32630|1.73028,52.41138|1.74945,52.45583|1.74590,52.62021|1.70250,52.71583|1.64528,52.77111|1.50361,52.83749|1.43222,52.87472|1.35250,52.90972|1.28222,52.92750|1.18389,52.93889|0.99472,52.95111|0.94222,52.95083|0.88472,52.96638|0.66722,52.97611|0.54778,52.96618|0.49139,52.93430|0.44431,52.86569|0.42903,52.82403|0.36334,52.78027|0.21778,52.80694|0.16125,52.86250|0.05778,52.88916|0.00211,52.87985|0.03222,52.91722|0.20389,53.02805|0.27666,53.06694|0.33916,53.09236|0.35389,53.18722|0.33958,53.23472|0.23555,53.39944|0.14347,53.47527|0.08528,53.48638|0.02694,53.50972|-0.10084,53.57306|-0.20722,53.63083|-0.26445,53.69083|-0.30166,53.71319|-0.39022,53.70794|-0.51972,53.68527|-0.71653,53.69638|-0.65445,53.72527|-0.60584,53.72972|-0.54916,53.70611|-0.42261,53.71755|-0.35728,53.73056|-0.29389,53.73666|-0.23139,53.72166|-0.10584,53.63166|-0.03472,53.62555|0.04416,53.63916|0.08916,53.62666|0.14945,53.58847|0.12639,53.64527|0.06264,53.70389|-0.12750,53.86388|-0.16916,53.91847|-0.21222,54.00833|-0.20569,54.05153|-0.16111,54.08806|-0.11694,54.13222|-0.20053,54.15171|-0.26250,54.17444|-0.39334,54.27277|-0.42166,54.33222|-0.45750,54.37694|-0.51847,54.44749|-0.56472,54.48000|-0.87584,54.57027|-1.06139,54.61722|-1.16528,54.64972|-1.30445,54.77138|-1.34556,54.87138|-1.41278,54.99944|-1.48292,55.08625|-1.51500,55.14972|-1.56584,55.28722|-1.58097,55.48361|-1.63597,55.58194|-1.69000,55.60556|-1.74695,55.62499|-1.81764,55.63306|-1.97681,55.75416|-2.02166,55.80611|-2.08361,55.78054|-2.22000,55.66499|-2.27916,55.64472|-2.27416,55.57527|-2.21528,55.50583|-2.18278,55.45985|-2.21236,55.42777|-2.46305,55.36111|-2.63055,55.25500|-2.69945,55.17722|-2.96278,55.03889|-3.01500,55.05222|-3.05103,54.97986|-3.13292,54.93139|-3.20861,54.94944|-3.28931,54.93792|-3.39166,54.87639|-3.42916,54.81555|-3.56916,54.64249|-3.61306,54.48861|-3.49305,54.40333|-3.43389,54.34806|-3.41056,54.28014|-3.38055,54.24444|-3.21472,54.09555|-3.15222,54.08194|-2.93097,54.15333|-2.81361,54.22277|-2.81750,54.14277|-2.83361,54.08500|-2.93250,53.95055|-3.05264,53.90764|-3.03708,53.74944|-2.99278,53.73277|-2.89979,53.72499|-2.97729,53.69382|-3.07306,53.59805|-3.10563,53.55993|-3.00678,53.41738|-2.95389,53.36027|-2.85736,53.32083|-2.70493,53.35062|-2.77639,53.29250|-2.89972,53.28916|-2.94250,53.31056|-3.02889,53.38191|-3.07248,53.40936|-3.16695,53.35708|-3.12611,53.32500|-3.08860,53.26001|-3.02000,53.24722|-2.95528,53.21555|-2.91069,53.17014|-2.89389,53.10416|-2.85695,53.03249|-2.77792,52.98514|-2.73109,52.96873|-2.71945,52.91902|-2.79278,52.90207|-2.85069,52.93875|-2.99389,52.95361|-3.08639,52.91611|-3.13014,52.88486|-3.13708,52.79312|-3.06806,52.77027|-3.01111,52.71166|-3.06666,52.63527|-3.11750,52.58666|-3.07089,52.55702|-3.00792,52.56902|-2.98028,52.53083|-3.02736,52.49792|-3.11916,52.49194|-3.19514,52.46722|-3.19611,52.41027|-3.02195,52.34027|-2.95486,52.33117|-2.99750,52.28139|-3.05125,52.23347|-3.07555,52.14804|-3.12222,52.11805|-3.11250,52.06945|-3.08500,52.01930|-3.04528,51.97639|-2.98889,51.92555|-2.91757,51.91569|-2.86639,51.92889|-2.77861,51.88583|-2.65944,51.81806|-2.68334,51.76957|-2.68666,51.71889|-2.66500,51.61500|-2.62916,51.64416|-2.57889,51.67777|-2.46056,51.74666|-2.40389,51.74041|-2.47166,51.72445|-2.55305,51.65722|-2.65334,51.56389|-2.77055,51.48916|-2.85278,51.44472|-2.96000,51.37499|-3.00695,51.30722|-3.01278,51.25632|-3.02834,51.20611|-3.30139,51.18111|-3.39361,51.18138|-3.43729,51.20638|-3.50722,51.22333|-3.57014,51.23027|-3.63222,51.21805|-3.70028,51.23000|-3.79250,51.23916|-3.88389,51.22416|-3.98472,51.21695|-4.11666,51.21222|-4.22805,51.18777|-4.22028,51.11054|-4.23702,51.04659|-4.30361,51.00416|-4.37639,50.99110|-4.42736,51.00958|-4.47445,51.01416|-4.52132,51.01424|-4.54334,50.92694|-4.56139,50.77625|-4.65139,50.71527|-4.74361,50.66750';
-					break;
-				case 'SCOTLAND':
-					$coordsAsStr[] = '-2.02166,55.80611|-2.07972,55.86722|-2.13028,55.88583|-2.26028,55.91861|-2.37528,55.95694|-2.65722,56.05972|-2.82028,56.05694|-2.86618,56.02840|-2.89555,55.98861|-2.93500,55.96944|-3.01805,55.94944|-3.06750,55.94444|-3.25472,55.97166|-3.45472,55.99194|-3.66416,56.00652|-3.73722,56.05555|-3.57139,56.05360|-3.44111,56.01916|-3.39584,56.01083|-3.34403,56.02333|-3.13903,56.11084|-2.97611,56.19472|-2.91666,56.20499|-2.84695,56.18638|-2.78805,56.18749|-2.67937,56.21465|-2.58403,56.28264|-2.67208,56.32277|-2.76861,56.33180|-2.81528,56.37360|-2.81208,56.43958|-2.91653,56.45014|-2.99555,56.41416|-3.19042,56.35958|-3.27805,56.35750|-3.04055,56.45472|-2.95861,56.45611|-2.72084,56.48888|-2.64084,56.52250|-2.53126,56.57611|-2.48861,56.61416|-2.47805,56.71527|-2.39000,56.77166|-2.31986,56.79638|-2.21972,56.86777|-2.19708,56.94388|-2.16695,57.00055|-2.09334,57.07027|-2.05416,57.21861|-1.95889,57.33250|-1.85584,57.39889|-1.77334,57.45805|-1.78139,57.50555|-1.82195,57.57861|-1.86000,57.62138|-1.92972,57.67777|-2.02222,57.69388|-2.07555,57.69944|-2.14028,57.69056|-2.18611,57.66861|-2.39626,57.66638|-2.51000,57.67166|-2.78639,57.70222|-2.89806,57.70694|-2.96750,57.68027|-3.03847,57.66249|-3.12334,57.67166|-3.22334,57.69166|-3.28625,57.72499|-3.33972,57.72333|-3.48805,57.70945|-3.52222,57.66333|-3.59542,57.63666|-3.64063,57.63881|-3.75414,57.62504|-4.03986,57.55569|-4.19666,57.48584|-4.22889,57.51554|-4.17945,57.56249|-4.11139,57.59833|-4.08078,57.66533|-4.19139,57.67139|-4.25945,57.65527|-4.34361,57.60777|-4.41639,57.60166|-4.29666,57.67444|-4.08528,57.72611|-4.01908,57.70226|-3.96861,57.70250|-3.86556,57.76861|-3.81945,57.80458|-3.80681,57.85819|-3.85055,57.82000|-3.92639,57.80749|-4.04322,57.81438|-4.14973,57.82527|-4.29750,57.84638|-4.36250,57.89777|-4.24306,57.87028|-4.10666,57.85195|-4.01500,57.86777|-3.99166,57.90611|-3.99695,57.95056|-3.84500,58.02000|-3.56611,58.13916|-3.51319,58.16374|-3.45916,58.20305|-3.42028,58.24361|-3.33750,58.27694|-3.20555,58.30625|-3.10972,58.38166|-3.05792,58.45083|-3.02264,58.64653|-3.17639,58.64944|-3.35389,58.66055|-3.36931,58.59555|-3.57611,58.62194|-3.66028,58.61972|-3.71166,58.60374|-3.78264,58.56750|-3.84834,58.56000|-4.08056,58.55527|-4.27722,58.53361|-4.43653,58.54902|-4.50666,58.56777|-4.56055,58.57584|-4.59910,58.53027|-4.66805,58.48833|-4.76146,58.44604|-4.70195,58.50999|-4.70166,58.55861|-4.77014,58.60264|-5.00153,58.62416|-5.10945,58.50833|-5.16472,58.32527|-5.12639,58.28750|-5.07166,58.26472|-5.20361,58.25083|-5.39764,58.25055|-5.27389,58.11722|-5.31514,58.06416|-5.38416,58.08361|-5.45285,58.07416|-5.39805,58.03111|-5.26278,57.97111|-5.19334,57.95069|-5.12750,57.86944|-5.21750,57.90084|-5.33861,57.92083|-5.42876,57.90104|-5.45750,57.85889|-5.64445,57.89972|-5.62555,57.85222|-5.58153,57.81945|-5.60674,57.76618|-5.66305,57.78889|-5.71695,57.86944|-5.76695,57.86472|-5.81708,57.81944|-5.81084,57.63958|-5.69555,57.55944|-5.64361,57.55222|-5.53084,57.52833|-5.65305,57.50875|-5.75000,57.54834|-5.81569,57.57923|-5.85042,57.54972|-5.86695,57.46777|-5.81806,57.36250|-5.75111,57.34333|-5.50334,57.40111|-5.45126,57.41805|-5.49250,57.37083|-5.59884,57.33049|-5.57116,57.28411|-5.51266,57.27745|-5.40514,57.23097|-5.44972,57.22138|-5.49472,57.23888|-5.56066,57.25477|-5.64611,57.23499|-5.64751,57.16161|-5.55028,57.11639|-5.48166,57.11222|-5.40305,57.11062|-5.55945,57.09250|-5.65111,57.11611|-5.72472,57.11306|-5.77361,57.04556|-5.63139,56.98499|-5.56916,56.98972|-5.52403,56.99735|-5.57916,56.98000|-5.64611,56.97222|-5.73374,57.00909|-5.82584,57.00346|-5.91958,56.88708|-5.86528,56.87944|-5.74278,56.89374|-5.66292,56.86924|-5.73306,56.83916|-5.78584,56.83955|-5.85590,56.81430|-5.80208,56.79180|-5.84958,56.74444|-5.90500,56.75666|-5.96694,56.78027|-6.14000,56.75777|-6.19208,56.74888|-6.23452,56.71673|-6.19139,56.67972|-5.91916,56.67388|-5.82622,56.69156|-5.73945,56.71166|-5.55240,56.68886|-5.64861,56.68027|-5.69916,56.68278|-5.88261,56.65666|-5.97472,56.65138|-5.99584,56.61138|-5.93056,56.56972|-5.88416,56.55333|-5.79056,56.53805|-5.67695,56.49389|-5.56389,56.54056|-5.36334,56.66195|-5.23416,56.74333|-5.13236,56.79403|-5.31473,56.65666|-5.37405,56.55925|-5.31826,56.55633|-5.25080,56.55753|-5.37718,56.52112|-5.39866,56.47866|-5.19111,56.46194|-5.11556,56.51277|-5.07014,56.56069|-5.13555,56.48499|-5.22084,56.43583|-5.32764,56.43574|-5.42439,56.43091|-5.52611,56.37360|-5.57139,56.32833|-5.59653,56.25695|-5.57389,56.16000|-5.52000,56.16485|-5.56334,56.11333|-5.60139,56.07638|-5.64222,56.04305|-5.66039,55.98263|-5.62555,56.02055|-5.58014,56.01319|-5.63361,55.96611|-5.67697,55.88844|-5.64750,55.78139|-5.60986,55.75930|-5.66916,55.66166|-5.70166,55.58861|-5.71805,55.51500|-5.75916,55.41750|-5.79528,55.36027|-5.78166,55.29902|-5.73778,55.29222|-5.56694,55.31666|-5.51528,55.36347|-5.55520,55.41440|-5.48639,55.64306|-5.44597,55.70680|-5.38000,55.75027|-5.41889,55.90666|-5.39924,55.99972|-5.33895,56.03456|-5.30594,56.06922|-5.23889,56.11889|-5.03222,56.23250|-4.92229,56.27111|-4.97416,56.23333|-5.07222,56.18695|-5.20069,56.11861|-5.30906,56.00570|-5.34000,55.90201|-5.29250,55.84750|-5.20805,55.84444|-5.22458,55.90175|-5.17334,55.92916|-5.11000,55.90306|-5.01222,55.86694|-4.96195,55.88000|-4.89824,55.98145|-4.84623,56.08632|-4.86636,56.03178|-4.85461,55.98648|-4.77659,55.97977|-4.62723,55.94555|-4.52305,55.91861|-4.70972,55.93403|-4.75166,55.94611|-4.82406,55.94950|-4.87826,55.93653|-4.91639,55.70083|-4.87584,55.68194|-4.81361,55.64555|-4.68722,55.59750|-4.61361,55.49069|-4.63958,55.44264|-4.68250,55.43388|-4.74847,55.41055|-4.83715,55.31882|-4.84778,55.26944|-4.86542,55.22340|-4.93500,55.17860|-5.01250,55.13347|-5.05361,55.04902|-5.17834,54.98888|-5.18563,54.93622|-5.17000,54.89111|-5.11666,54.83180|-5.00500,54.76333|-4.96229,54.68125|-4.92250,54.64055|-4.85723,54.62958|-4.96076,54.79687|-4.92431,54.83708|-4.85222,54.86861|-4.80125,54.85556|-4.74055,54.82166|-4.68084,54.79972|-4.59861,54.78027|-4.55792,54.73903|-4.49639,54.69888|-4.37584,54.67666|-4.34569,54.70916|-4.35973,54.77111|-4.41111,54.82583|-4.42445,54.88152|-4.38479,54.90555|-4.35056,54.85903|-4.09555,54.76777|-3.95361,54.76749|-3.86972,54.80527|-3.81222,54.84888|-3.69250,54.88110|-3.61584,54.87527|-3.57111,54.99083|-3.44528,54.98638|-3.36056,54.97138|-3.14695,54.96500|-3.05103,54.97986|-3.01500,55.05222|-2.96278,55.03889|-2.69945,55.17722|-2.63055,55.25500|-2.46305,55.36111|-2.21236,55.42777|-2.18278,55.45985|-2.21528,55.50583|-2.27416,55.57527|-2.27916,55.64472|-2.22000,55.66499|-2.08361,55.78054|-2.02166,55.80611';
-					break;
-				case 'IRELAND':
-					$coordsAsStr[] = '-8.17166,54.46388|-8.06555,54.37277|-7.94139,54.29944|-7.87576,54.28499|-7.86834,54.22764|-7.81805,54.19916|-7.69972,54.20250|-7.55945,54.12694|-7.31334,54.11250|-7.14584,54.22527|-7.17555,54.28916|-7.16084,54.33666|-7.05834,54.41000|-6.97445,54.40166|-6.92695,54.37916|-6.87305,54.34208|-6.85111,54.28972|-6.73473,54.18361|-6.65556,54.06527|-6.60584,54.04444|-6.44750,54.05833|-6.33889,54.11555|-6.26697,54.09983|-6.17403,54.07222|-6.10834,54.03638|-6.04389,54.03139|-5.96834,54.06389|-5.88500,54.11639|-5.87347,54.20916|-5.82500,54.23958|-5.74611,54.24806|-5.65556,54.22701|-5.60834,54.24972|-5.55916,54.29084|-5.57334,54.37704|-5.64502,54.49267|-5.70472,54.53361|-5.68055,54.57306|-5.59972,54.54194|-5.55097,54.50083|-5.54216,54.44903|-5.54643,54.40527|-5.50672,54.36444|-5.46111,54.38555|-5.43132,54.48596|-5.47945,54.53638|-5.53521,54.65090|-5.57431,54.67722|-5.62916,54.67945|-5.73674,54.67383|-5.80305,54.66138|-5.88257,54.60652|-5.92445,54.63180|-5.86681,54.68972|-5.81903,54.70972|-5.74672,54.72452|-5.68775,54.76335|-5.70931,54.83166|-5.74694,54.85361|-5.79139,54.85139|-6.03611,55.05778|-6.04250,55.10277|-6.03444,55.15458|-6.10125,55.20945|-6.14584,55.22069|-6.25500,55.21194|-6.37639,55.23916|-6.51556,55.23305|-6.61334,55.20722|-6.73028,55.18027|-6.82472,55.16806|-6.88972,55.16777|-6.96695,55.15611|-6.99416,55.11027|-7.05139,55.04680|-7.09500,55.03694|-7.25251,55.07059|-7.32639,55.04527|-7.40639,54.95333|-7.45805,54.85777|-7.55334,54.76277|-7.73916,54.71054|-7.82576,54.73416|-7.92639,54.70054|-7.85236,54.63388|-7.77750,54.62694|-7.83361,54.55389|-7.95084,54.53222|-8.04695,54.50722|-8.17166,54.46388';
-					break;
-				case 'WALES':
-					$coordsAsStr[] = '-3.08860,53.26001|-3.33639,53.34722|-3.38806,53.34361|-3.60986,53.27944|-3.73014,53.28944|-3.85445,53.28444|-4.01861,53.23750|-4.06639,53.22639|-4.15334,53.22556|-4.19639,53.20611|-4.33028,53.11222|-4.36097,53.02888|-4.55278,52.92889|-4.61889,52.90916|-4.72195,52.83611|-4.72778,52.78139|-4.53945,52.79306|-4.47722,52.85500|-4.41416,52.88472|-4.31292,52.90499|-4.23334,52.91499|-4.13569,52.87888|-4.13056,52.77777|-4.05334,52.71666|-4.10639,52.65084|-4.12597,52.60375|-4.08056,52.55333|-4.05972,52.48584|-4.09666,52.38583|-4.14305,52.32027|-4.19361,52.27638|-4.23166,52.24888|-4.52722,52.13083|-4.66945,52.13027|-4.73695,52.10361|-4.76778,52.06444|-4.84445,52.01388|-5.09945,51.96056|-5.23916,51.91638|-5.25889,51.87056|-5.18500,51.86958|-5.11528,51.83333|-5.10257,51.77895|-5.16111,51.76222|-5.24694,51.73027|-5.19111,51.70888|-5.00739,51.70349|-4.90875,51.71249|-4.86111,51.71334|-4.97061,51.67577|-5.02128,51.66861|-5.05139,51.62028|-5.00528,51.60638|-4.94139,51.59416|-4.89028,51.62694|-4.83569,51.64534|-4.79063,51.63340|-4.69028,51.66666|-4.64584,51.72666|-4.57445,51.73416|-4.43611,51.73722|-4.26222,51.67694|-4.19750,51.67916|-4.06614,51.66804|-4.11639,51.63416|-4.17750,51.62235|-4.25055,51.62861|-4.29208,51.60743|-4.27778,51.55666|-4.20486,51.53527|-3.94972,51.61278|-3.83792,51.61999|-3.78166,51.56750|-3.75160,51.52931|-3.67194,51.47388|-3.54250,51.39777|-3.40334,51.37972|-3.27097,51.38014|-3.16458,51.40909|-3.15166,51.45305|-3.11875,51.48750|-3.02111,51.52527|-2.95472,51.53972|-2.89278,51.53861|-2.84778,51.54500|-2.71472,51.58083|-2.66500,51.61500|-2.68666,51.71889|-2.68334,51.76957|-2.65944,51.81806|-2.77861,51.88583|-2.86639,51.92889|-2.91757,51.91569|-2.98889,51.92555|-3.04528,51.97639|-3.08500,52.01930|-3.11250,52.06945|-3.12222,52.11805|-3.07555,52.14804|-3.05125,52.23347|-2.99750,52.28139|-2.95486,52.33117|-3.02195,52.34027|-3.19611,52.41027|-3.19514,52.46722|-3.11916,52.49194|-3.02736,52.49792|-2.98028,52.53083|-3.00792,52.56902|-3.07089,52.55702|-3.11750,52.58666|-3.06666,52.63527|-3.01111,52.71166|-3.06806,52.77027|-3.13708,52.79312|-3.13014,52.88486|-3.08639,52.91611|-2.99389,52.95361|-2.85069,52.93875|-2.79278,52.90207|-2.71945,52.91902|-2.73109,52.96873|-2.77792,52.98514|-2.85695,53.03249|-2.89389,53.10416|-2.91069,53.17014|-2.95528,53.21555|-3.02000,53.24722|-3.08860,53.26001';
-					break;
-				case 'NC':
-					$coordsAsStr[] = '-81.65876,36.60938|-81.70390,36.55513|-81.70639,36.50804|-81.74665,36.39777|-81.90723,36.30804|-82.03195,36.12694|-82.08416,36.10146|-82.12826,36.11020|-82.21500,36.15833|-82.36375,36.11347|-82.43472,36.06013|-82.46236,36.01708|-82.56006,35.96263|-82.60042,35.99638|-82.62308,36.06121|-82.73500,36.01833|-82.84612,35.94944|-82.90451,35.88819|-82.93555,35.83846|-83.16000,35.76236|-83.24222,35.71944|-83.49222,35.57111|-83.56847,35.55861|-83.64416,35.56471|-83.73499,35.56638|-83.88222,35.51791|-83.98361,35.44944|-84.03639,35.35444|-84.04964,35.29117|-84.09042,35.25986|-84.15084,35.25388|-84.20521,35.25722|-84.29284,35.22596|-84.32471,34.98701|-83.09778,35.00027|-82.77722,35.09138|-82.59639,35.14972|-82.37999,35.21500|-82.27362,35.20583|-81.41306,35.17416|-81.05915,35.15333|-80.92666,35.10695|-80.78751,34.95610|-80.79334,34.82555|-79.66777,34.80694|-79.11555,34.34527|-78.57222,33.88166|-78.51806,33.87999|-78.43721,33.89804|-78.23735,33.91986|-78.15389,33.91471|-78.06974,33.89500|-78.02597,33.88936|-77.97611,33.94276|-77.95299,33.99243|-77.94499,34.06499|-77.92728,34.11756|-77.92250,33.99194|-77.92264,33.93715|-77.88215,34.06166|-77.86222,34.15083|-77.83501,34.19194|-77.75724,34.28527|-77.68222,34.36555|-77.63667,34.39805|-77.57363,34.43694|-77.45527,34.50403|-77.38173,34.51646|-77.37905,34.56294|-77.38572,34.61260|-77.40944,34.68916|-77.38847,34.73304|-77.33097,34.63992|-77.35024,34.60099|-77.30958,34.55972|-77.09424,34.67742|-76.75994,34.76659|-76.68325,34.79749|-76.66097,34.75781|-76.62611,34.71014|-76.50063,34.73617|-76.48138,34.77638|-76.38305,34.86423|-76.34326,34.88194|-76.27181,34.96263|-76.35125,35.02221|-76.32354,34.97429|-76.45319,34.93524|-76.43395,34.98782|-76.45356,35.06676|-76.52917,35.00444|-76.63382,34.98242|-76.69722,34.94887|-76.75306,34.90526|-76.81636,34.93944|-76.89000,34.95388|-76.93180,34.96957|-76.96501,34.99777|-77.06816,35.14978|-76.97639,35.06806|-76.86722,35.00000|-76.80531,34.98559|-76.72708,35.00152|-76.60402,35.07416|-76.56555,35.11486|-76.57305,35.16013|-76.66489,35.16694|-76.56361,35.23361|-76.48750,35.22582|-76.46889,35.27166|-76.50298,35.30791|-76.83251,35.39222|-77.02305,35.48694|-77.04958,35.52694|-76.91292,35.46166|-76.65250,35.41499|-76.61611,35.45888|-76.63195,35.52249|-76.58820,35.55104|-76.51556,35.53194|-76.56711,35.48494|-76.52251,35.40416|-76.46195,35.37221|-76.13319,35.35986|-76.04111,35.42416|-76.00223,35.46610|-75.97958,35.51666|-75.89362,35.57555|-75.83834,35.56694|-75.78944,35.57138|-75.74076,35.61846|-75.72084,35.69263|-75.72084,35.81451|-75.74917,35.87791|-75.78333,35.91972|-75.85083,35.97527|-75.94333,35.91777|-75.98944,35.88054|-75.98854,35.79110|-75.99388,35.71027|-76.02875,35.65409|-76.10320,35.66041|-76.13563,35.69239|-76.04475,35.68436|-76.04167,35.74916|-76.05305,35.79361|-76.05305,35.87375|-76.02653,35.96222|-76.07751,35.99319|-76.17472,35.99596|-76.27917,35.91915|-76.37986,35.95763|-76.42014,35.97874|-76.55375,35.93971|-76.66222,35.93305|-76.72952,35.93984|-76.73392,36.04760|-76.75384,36.09477|-76.76028,36.14513|-76.74610,36.22818|-76.70458,36.24673|-76.72764,36.16736|-76.71021,36.11752|-76.69117,36.07165|-76.65979,36.03312|-76.49527,36.00958|-76.37138,36.07694|-76.37084,36.14999|-76.21417,36.09471|-76.07591,36.17910|-76.18361,36.26915|-76.19965,36.31739|-76.13986,36.28805|-76.04274,36.21974|-76.00465,36.18110|-75.95287,36.19241|-75.97604,36.31138|-75.93895,36.28381|-75.85271,36.11069|-75.79315,36.07385|-75.79639,36.11804|-75.88333,36.29554|-75.94665,36.37194|-75.98694,36.41166|-76.03473,36.49666|-76.02899,36.55000|-78.44234,36.54986|-78.56594,36.55799|-80.27556,36.55110|-81.15361,36.56499|-81.38722,36.57695|-81.65876,36.60938';
-					break;
-				default:
+					case 'ENGLAND':
+						$coordsAsStr[] = '-4.74361,50.66750|-4.78361,50.59361|-4.91584,50.57722|-5.01750,50.54264|-5.02569,50.47271|-5.04729,50.42750|-5.15208,50.34374|-5.26805,50.27389|-5.43194,50.19326|-5.49584,50.21695|-5.54639,50.20527|-5.71000,50.12916|-5.71681,50.06083|-5.66174,50.03631|-5.58278,50.04777|-5.54166,50.07055|-5.53416,50.11569|-5.47055,50.12499|-5.33361,50.09138|-5.27666,50.05972|-5.25674,50.00514|-5.19306,49.95527|-5.16070,50.00319|-5.06555,50.03750|-5.07090,50.08166|-5.04806,50.17111|-4.95278,50.19333|-4.85750,50.23166|-4.76250,50.31138|-4.67861,50.32583|-4.54334,50.32222|-4.48278,50.32583|-4.42972,50.35139|-4.38000,50.36388|-4.16555,50.37028|-4.11139,50.33027|-4.05708,50.29791|-3.94389,50.31346|-3.87764,50.28139|-3.83653,50.22972|-3.78944,50.21222|-3.70666,50.20972|-3.65195,50.23111|-3.55139,50.43833|-3.49416,50.54639|-3.46181,50.58792|-3.41139,50.61610|-3.24416,50.67444|-3.17347,50.68833|-3.09445,50.69222|-2.97806,50.70638|-2.92750,50.73125|-2.88278,50.73111|-2.82305,50.72027|-2.77139,50.70861|-2.66195,50.67334|-2.56305,50.63222|-2.45861,50.57500|-2.44666,50.62639|-2.39097,50.64166|-2.19722,50.62611|-2.12195,50.60722|-2.05445,50.58569|-1.96437,50.59674|-1.95441,50.66536|-2.06681,50.71430|-1.93416,50.71277|-1.81639,50.72306|-1.68445,50.73888|-1.59278,50.72416|-1.33139,50.79138|-1.11695,50.80694|-1.15889,50.84083|-1.09445,50.84584|-0.92842,50.83966|-0.86584,50.79965|-0.90826,50.77396|-0.78187,50.72722|-0.74611,50.76583|-0.67528,50.78111|-0.57722,50.79527|-0.25500,50.82638|-0.19084,50.82583|-0.13805,50.81833|0.05695,50.78083|0.12334,50.75944|0.22778,50.73944|0.28695,50.76500|0.37195,50.81638|0.43084,50.83111|0.56722,50.84777|0.67889,50.87681|0.71639,50.90500|0.79334,50.93610|0.85666,50.92556|0.97125,50.98111|0.99778,51.01903|1.04555,51.04944|1.10028,51.07361|1.26250,51.10166|1.36889,51.13583|1.41111,51.20111|1.42750,51.33111|1.38556,51.38777|1.19195,51.37861|1.05278,51.36722|0.99916,51.34777|0.90806,51.34069|0.70416,51.37749|0.61972,51.38304|0.55945,51.40596|0.64236,51.44042|0.69750,51.47084|0.59195,51.48777|0.53611,51.48806|0.48916,51.48445|0.45215,51.45562|0.38894,51.44822|0.46500,51.50306|0.65195,51.53680|0.76695,51.52138|0.82084,51.53556|0.87528,51.56110|0.95250,51.60923|0.94695,51.72556|0.90257,51.73465|0.86306,51.71166|0.76140,51.69164|0.70111,51.71847|0.86211,51.77361|0.93236,51.80583|0.98278,51.82527|1.03569,51.77416|1.08834,51.77056|1.13222,51.77694|1.18139,51.78972|1.22361,51.80888|1.26611,51.83916|1.28097,51.88096|1.20834,51.95083|1.16347,52.02361|1.27750,51.98555|1.33125,51.92875|1.39028,51.96999|1.58736,52.08388|1.63000,52.19527|1.68576,52.32630|1.73028,52.41138|1.74945,52.45583|1.74590,52.62021|1.70250,52.71583|1.64528,52.77111|1.50361,52.83749|1.43222,52.87472|1.35250,52.90972|1.28222,52.92750|1.18389,52.93889|0.99472,52.95111|0.94222,52.95083|0.88472,52.96638|0.66722,52.97611|0.54778,52.96618|0.49139,52.93430|0.44431,52.86569|0.42903,52.82403|0.36334,52.78027|0.21778,52.80694|0.16125,52.86250|0.05778,52.88916|0.00211,52.87985|0.03222,52.91722|0.20389,53.02805|0.27666,53.06694|0.33916,53.09236|0.35389,53.18722|0.33958,53.23472|0.23555,53.39944|0.14347,53.47527|0.08528,53.48638|0.02694,53.50972|-0.10084,53.57306|-0.20722,53.63083|-0.26445,53.69083|-0.30166,53.71319|-0.39022,53.70794|-0.51972,53.68527|-0.71653,53.69638|-0.65445,53.72527|-0.60584,53.72972|-0.54916,53.70611|-0.42261,53.71755|-0.35728,53.73056|-0.29389,53.73666|-0.23139,53.72166|-0.10584,53.63166|-0.03472,53.62555|0.04416,53.63916|0.08916,53.62666|0.14945,53.58847|0.12639,53.64527|0.06264,53.70389|-0.12750,53.86388|-0.16916,53.91847|-0.21222,54.00833|-0.20569,54.05153|-0.16111,54.08806|-0.11694,54.13222|-0.20053,54.15171|-0.26250,54.17444|-0.39334,54.27277|-0.42166,54.33222|-0.45750,54.37694|-0.51847,54.44749|-0.56472,54.48000|-0.87584,54.57027|-1.06139,54.61722|-1.16528,54.64972|-1.30445,54.77138|-1.34556,54.87138|-1.41278,54.99944|-1.48292,55.08625|-1.51500,55.14972|-1.56584,55.28722|-1.58097,55.48361|-1.63597,55.58194|-1.69000,55.60556|-1.74695,55.62499|-1.81764,55.63306|-1.97681,55.75416|-2.02166,55.80611|-2.08361,55.78054|-2.22000,55.66499|-2.27916,55.64472|-2.27416,55.57527|-2.21528,55.50583|-2.18278,55.45985|-2.21236,55.42777|-2.46305,55.36111|-2.63055,55.25500|-2.69945,55.17722|-2.96278,55.03889|-3.01500,55.05222|-3.05103,54.97986|-3.13292,54.93139|-3.20861,54.94944|-3.28931,54.93792|-3.39166,54.87639|-3.42916,54.81555|-3.56916,54.64249|-3.61306,54.48861|-3.49305,54.40333|-3.43389,54.34806|-3.41056,54.28014|-3.38055,54.24444|-3.21472,54.09555|-3.15222,54.08194|-2.93097,54.15333|-2.81361,54.22277|-2.81750,54.14277|-2.83361,54.08500|-2.93250,53.95055|-3.05264,53.90764|-3.03708,53.74944|-2.99278,53.73277|-2.89979,53.72499|-2.97729,53.69382|-3.07306,53.59805|-3.10563,53.55993|-3.00678,53.41738|-2.95389,53.36027|-2.85736,53.32083|-2.70493,53.35062|-2.77639,53.29250|-2.89972,53.28916|-2.94250,53.31056|-3.02889,53.38191|-3.07248,53.40936|-3.16695,53.35708|-3.12611,53.32500|-3.08860,53.26001|-3.02000,53.24722|-2.95528,53.21555|-2.91069,53.17014|-2.89389,53.10416|-2.85695,53.03249|-2.77792,52.98514|-2.73109,52.96873|-2.71945,52.91902|-2.79278,52.90207|-2.85069,52.93875|-2.99389,52.95361|-3.08639,52.91611|-3.13014,52.88486|-3.13708,52.79312|-3.06806,52.77027|-3.01111,52.71166|-3.06666,52.63527|-3.11750,52.58666|-3.07089,52.55702|-3.00792,52.56902|-2.98028,52.53083|-3.02736,52.49792|-3.11916,52.49194|-3.19514,52.46722|-3.19611,52.41027|-3.02195,52.34027|-2.95486,52.33117|-2.99750,52.28139|-3.05125,52.23347|-3.07555,52.14804|-3.12222,52.11805|-3.11250,52.06945|-3.08500,52.01930|-3.04528,51.97639|-2.98889,51.92555|-2.91757,51.91569|-2.86639,51.92889|-2.77861,51.88583|-2.65944,51.81806|-2.68334,51.76957|-2.68666,51.71889|-2.66500,51.61500|-2.62916,51.64416|-2.57889,51.67777|-2.46056,51.74666|-2.40389,51.74041|-2.47166,51.72445|-2.55305,51.65722|-2.65334,51.56389|-2.77055,51.48916|-2.85278,51.44472|-2.96000,51.37499|-3.00695,51.30722|-3.01278,51.25632|-3.02834,51.20611|-3.30139,51.18111|-3.39361,51.18138|-3.43729,51.20638|-3.50722,51.22333|-3.57014,51.23027|-3.63222,51.21805|-3.70028,51.23000|-3.79250,51.23916|-3.88389,51.22416|-3.98472,51.21695|-4.11666,51.21222|-4.22805,51.18777|-4.22028,51.11054|-4.23702,51.04659|-4.30361,51.00416|-4.37639,50.99110|-4.42736,51.00958|-4.47445,51.01416|-4.52132,51.01424|-4.54334,50.92694|-4.56139,50.77625|-4.65139,50.71527|-4.74361,50.66750';
+						break;
+					case 'SCOTLAND':
+						$coordsAsStr[] = '-2.02166,55.80611|-2.07972,55.86722|-2.13028,55.88583|-2.26028,55.91861|-2.37528,55.95694|-2.65722,56.05972|-2.82028,56.05694|-2.86618,56.02840|-2.89555,55.98861|-2.93500,55.96944|-3.01805,55.94944|-3.06750,55.94444|-3.25472,55.97166|-3.45472,55.99194|-3.66416,56.00652|-3.73722,56.05555|-3.57139,56.05360|-3.44111,56.01916|-3.39584,56.01083|-3.34403,56.02333|-3.13903,56.11084|-2.97611,56.19472|-2.91666,56.20499|-2.84695,56.18638|-2.78805,56.18749|-2.67937,56.21465|-2.58403,56.28264|-2.67208,56.32277|-2.76861,56.33180|-2.81528,56.37360|-2.81208,56.43958|-2.91653,56.45014|-2.99555,56.41416|-3.19042,56.35958|-3.27805,56.35750|-3.04055,56.45472|-2.95861,56.45611|-2.72084,56.48888|-2.64084,56.52250|-2.53126,56.57611|-2.48861,56.61416|-2.47805,56.71527|-2.39000,56.77166|-2.31986,56.79638|-2.21972,56.86777|-2.19708,56.94388|-2.16695,57.00055|-2.09334,57.07027|-2.05416,57.21861|-1.95889,57.33250|-1.85584,57.39889|-1.77334,57.45805|-1.78139,57.50555|-1.82195,57.57861|-1.86000,57.62138|-1.92972,57.67777|-2.02222,57.69388|-2.07555,57.69944|-2.14028,57.69056|-2.18611,57.66861|-2.39626,57.66638|-2.51000,57.67166|-2.78639,57.70222|-2.89806,57.70694|-2.96750,57.68027|-3.03847,57.66249|-3.12334,57.67166|-3.22334,57.69166|-3.28625,57.72499|-3.33972,57.72333|-3.48805,57.70945|-3.52222,57.66333|-3.59542,57.63666|-3.64063,57.63881|-3.75414,57.62504|-4.03986,57.55569|-4.19666,57.48584|-4.22889,57.51554|-4.17945,57.56249|-4.11139,57.59833|-4.08078,57.66533|-4.19139,57.67139|-4.25945,57.65527|-4.34361,57.60777|-4.41639,57.60166|-4.29666,57.67444|-4.08528,57.72611|-4.01908,57.70226|-3.96861,57.70250|-3.86556,57.76861|-3.81945,57.80458|-3.80681,57.85819|-3.85055,57.82000|-3.92639,57.80749|-4.04322,57.81438|-4.14973,57.82527|-4.29750,57.84638|-4.36250,57.89777|-4.24306,57.87028|-4.10666,57.85195|-4.01500,57.86777|-3.99166,57.90611|-3.99695,57.95056|-3.84500,58.02000|-3.56611,58.13916|-3.51319,58.16374|-3.45916,58.20305|-3.42028,58.24361|-3.33750,58.27694|-3.20555,58.30625|-3.10972,58.38166|-3.05792,58.45083|-3.02264,58.64653|-3.17639,58.64944|-3.35389,58.66055|-3.36931,58.59555|-3.57611,58.62194|-3.66028,58.61972|-3.71166,58.60374|-3.78264,58.56750|-3.84834,58.56000|-4.08056,58.55527|-4.27722,58.53361|-4.43653,58.54902|-4.50666,58.56777|-4.56055,58.57584|-4.59910,58.53027|-4.66805,58.48833|-4.76146,58.44604|-4.70195,58.50999|-4.70166,58.55861|-4.77014,58.60264|-5.00153,58.62416|-5.10945,58.50833|-5.16472,58.32527|-5.12639,58.28750|-5.07166,58.26472|-5.20361,58.25083|-5.39764,58.25055|-5.27389,58.11722|-5.31514,58.06416|-5.38416,58.08361|-5.45285,58.07416|-5.39805,58.03111|-5.26278,57.97111|-5.19334,57.95069|-5.12750,57.86944|-5.21750,57.90084|-5.33861,57.92083|-5.42876,57.90104|-5.45750,57.85889|-5.64445,57.89972|-5.62555,57.85222|-5.58153,57.81945|-5.60674,57.76618|-5.66305,57.78889|-5.71695,57.86944|-5.76695,57.86472|-5.81708,57.81944|-5.81084,57.63958|-5.69555,57.55944|-5.64361,57.55222|-5.53084,57.52833|-5.65305,57.50875|-5.75000,57.54834|-5.81569,57.57923|-5.85042,57.54972|-5.86695,57.46777|-5.81806,57.36250|-5.75111,57.34333|-5.50334,57.40111|-5.45126,57.41805|-5.49250,57.37083|-5.59884,57.33049|-5.57116,57.28411|-5.51266,57.27745|-5.40514,57.23097|-5.44972,57.22138|-5.49472,57.23888|-5.56066,57.25477|-5.64611,57.23499|-5.64751,57.16161|-5.55028,57.11639|-5.48166,57.11222|-5.40305,57.11062|-5.55945,57.09250|-5.65111,57.11611|-5.72472,57.11306|-5.77361,57.04556|-5.63139,56.98499|-5.56916,56.98972|-5.52403,56.99735|-5.57916,56.98000|-5.64611,56.97222|-5.73374,57.00909|-5.82584,57.00346|-5.91958,56.88708|-5.86528,56.87944|-5.74278,56.89374|-5.66292,56.86924|-5.73306,56.83916|-5.78584,56.83955|-5.85590,56.81430|-5.80208,56.79180|-5.84958,56.74444|-5.90500,56.75666|-5.96694,56.78027|-6.14000,56.75777|-6.19208,56.74888|-6.23452,56.71673|-6.19139,56.67972|-5.91916,56.67388|-5.82622,56.69156|-5.73945,56.71166|-5.55240,56.68886|-5.64861,56.68027|-5.69916,56.68278|-5.88261,56.65666|-5.97472,56.65138|-5.99584,56.61138|-5.93056,56.56972|-5.88416,56.55333|-5.79056,56.53805|-5.67695,56.49389|-5.56389,56.54056|-5.36334,56.66195|-5.23416,56.74333|-5.13236,56.79403|-5.31473,56.65666|-5.37405,56.55925|-5.31826,56.55633|-5.25080,56.55753|-5.37718,56.52112|-5.39866,56.47866|-5.19111,56.46194|-5.11556,56.51277|-5.07014,56.56069|-5.13555,56.48499|-5.22084,56.43583|-5.32764,56.43574|-5.42439,56.43091|-5.52611,56.37360|-5.57139,56.32833|-5.59653,56.25695|-5.57389,56.16000|-5.52000,56.16485|-5.56334,56.11333|-5.60139,56.07638|-5.64222,56.04305|-5.66039,55.98263|-5.62555,56.02055|-5.58014,56.01319|-5.63361,55.96611|-5.67697,55.88844|-5.64750,55.78139|-5.60986,55.75930|-5.66916,55.66166|-5.70166,55.58861|-5.71805,55.51500|-5.75916,55.41750|-5.79528,55.36027|-5.78166,55.29902|-5.73778,55.29222|-5.56694,55.31666|-5.51528,55.36347|-5.55520,55.41440|-5.48639,55.64306|-5.44597,55.70680|-5.38000,55.75027|-5.41889,55.90666|-5.39924,55.99972|-5.33895,56.03456|-5.30594,56.06922|-5.23889,56.11889|-5.03222,56.23250|-4.92229,56.27111|-4.97416,56.23333|-5.07222,56.18695|-5.20069,56.11861|-5.30906,56.00570|-5.34000,55.90201|-5.29250,55.84750|-5.20805,55.84444|-5.22458,55.90175|-5.17334,55.92916|-5.11000,55.90306|-5.01222,55.86694|-4.96195,55.88000|-4.89824,55.98145|-4.84623,56.08632|-4.86636,56.03178|-4.85461,55.98648|-4.77659,55.97977|-4.62723,55.94555|-4.52305,55.91861|-4.70972,55.93403|-4.75166,55.94611|-4.82406,55.94950|-4.87826,55.93653|-4.91639,55.70083|-4.87584,55.68194|-4.81361,55.64555|-4.68722,55.59750|-4.61361,55.49069|-4.63958,55.44264|-4.68250,55.43388|-4.74847,55.41055|-4.83715,55.31882|-4.84778,55.26944|-4.86542,55.22340|-4.93500,55.17860|-5.01250,55.13347|-5.05361,55.04902|-5.17834,54.98888|-5.18563,54.93622|-5.17000,54.89111|-5.11666,54.83180|-5.00500,54.76333|-4.96229,54.68125|-4.92250,54.64055|-4.85723,54.62958|-4.96076,54.79687|-4.92431,54.83708|-4.85222,54.86861|-4.80125,54.85556|-4.74055,54.82166|-4.68084,54.79972|-4.59861,54.78027|-4.55792,54.73903|-4.49639,54.69888|-4.37584,54.67666|-4.34569,54.70916|-4.35973,54.77111|-4.41111,54.82583|-4.42445,54.88152|-4.38479,54.90555|-4.35056,54.85903|-4.09555,54.76777|-3.95361,54.76749|-3.86972,54.80527|-3.81222,54.84888|-3.69250,54.88110|-3.61584,54.87527|-3.57111,54.99083|-3.44528,54.98638|-3.36056,54.97138|-3.14695,54.96500|-3.05103,54.97986|-3.01500,55.05222|-2.96278,55.03889|-2.69945,55.17722|-2.63055,55.25500|-2.46305,55.36111|-2.21236,55.42777|-2.18278,55.45985|-2.21528,55.50583|-2.27416,55.57527|-2.27916,55.64472|-2.22000,55.66499|-2.08361,55.78054|-2.02166,55.80611';
+						break;
+					case 'IRELAND':
+						$coordsAsStr[] = '-8.17166,54.46388|-8.06555,54.37277|-7.94139,54.29944|-7.87576,54.28499|-7.86834,54.22764|-7.81805,54.19916|-7.69972,54.20250|-7.55945,54.12694|-7.31334,54.11250|-7.14584,54.22527|-7.17555,54.28916|-7.16084,54.33666|-7.05834,54.41000|-6.97445,54.40166|-6.92695,54.37916|-6.87305,54.34208|-6.85111,54.28972|-6.73473,54.18361|-6.65556,54.06527|-6.60584,54.04444|-6.44750,54.05833|-6.33889,54.11555|-6.26697,54.09983|-6.17403,54.07222|-6.10834,54.03638|-6.04389,54.03139|-5.96834,54.06389|-5.88500,54.11639|-5.87347,54.20916|-5.82500,54.23958|-5.74611,54.24806|-5.65556,54.22701|-5.60834,54.24972|-5.55916,54.29084|-5.57334,54.37704|-5.64502,54.49267|-5.70472,54.53361|-5.68055,54.57306|-5.59972,54.54194|-5.55097,54.50083|-5.54216,54.44903|-5.54643,54.40527|-5.50672,54.36444|-5.46111,54.38555|-5.43132,54.48596|-5.47945,54.53638|-5.53521,54.65090|-5.57431,54.67722|-5.62916,54.67945|-5.73674,54.67383|-5.80305,54.66138|-5.88257,54.60652|-5.92445,54.63180|-5.86681,54.68972|-5.81903,54.70972|-5.74672,54.72452|-5.68775,54.76335|-5.70931,54.83166|-5.74694,54.85361|-5.79139,54.85139|-6.03611,55.05778|-6.04250,55.10277|-6.03444,55.15458|-6.10125,55.20945|-6.14584,55.22069|-6.25500,55.21194|-6.37639,55.23916|-6.51556,55.23305|-6.61334,55.20722|-6.73028,55.18027|-6.82472,55.16806|-6.88972,55.16777|-6.96695,55.15611|-6.99416,55.11027|-7.05139,55.04680|-7.09500,55.03694|-7.25251,55.07059|-7.32639,55.04527|-7.40639,54.95333|-7.45805,54.85777|-7.55334,54.76277|-7.73916,54.71054|-7.82576,54.73416|-7.92639,54.70054|-7.85236,54.63388|-7.77750,54.62694|-7.83361,54.55389|-7.95084,54.53222|-8.04695,54.50722|-8.17166,54.46388';
+						break;
+					case 'WALES':
+						$coordsAsStr[] = '-3.08860,53.26001|-3.33639,53.34722|-3.38806,53.34361|-3.60986,53.27944|-3.73014,53.28944|-3.85445,53.28444|-4.01861,53.23750|-4.06639,53.22639|-4.15334,53.22556|-4.19639,53.20611|-4.33028,53.11222|-4.36097,53.02888|-4.55278,52.92889|-4.61889,52.90916|-4.72195,52.83611|-4.72778,52.78139|-4.53945,52.79306|-4.47722,52.85500|-4.41416,52.88472|-4.31292,52.90499|-4.23334,52.91499|-4.13569,52.87888|-4.13056,52.77777|-4.05334,52.71666|-4.10639,52.65084|-4.12597,52.60375|-4.08056,52.55333|-4.05972,52.48584|-4.09666,52.38583|-4.14305,52.32027|-4.19361,52.27638|-4.23166,52.24888|-4.52722,52.13083|-4.66945,52.13027|-4.73695,52.10361|-4.76778,52.06444|-4.84445,52.01388|-5.09945,51.96056|-5.23916,51.91638|-5.25889,51.87056|-5.18500,51.86958|-5.11528,51.83333|-5.10257,51.77895|-5.16111,51.76222|-5.24694,51.73027|-5.19111,51.70888|-5.00739,51.70349|-4.90875,51.71249|-4.86111,51.71334|-4.97061,51.67577|-5.02128,51.66861|-5.05139,51.62028|-5.00528,51.60638|-4.94139,51.59416|-4.89028,51.62694|-4.83569,51.64534|-4.79063,51.63340|-4.69028,51.66666|-4.64584,51.72666|-4.57445,51.73416|-4.43611,51.73722|-4.26222,51.67694|-4.19750,51.67916|-4.06614,51.66804|-4.11639,51.63416|-4.17750,51.62235|-4.25055,51.62861|-4.29208,51.60743|-4.27778,51.55666|-4.20486,51.53527|-3.94972,51.61278|-3.83792,51.61999|-3.78166,51.56750|-3.75160,51.52931|-3.67194,51.47388|-3.54250,51.39777|-3.40334,51.37972|-3.27097,51.38014|-3.16458,51.40909|-3.15166,51.45305|-3.11875,51.48750|-3.02111,51.52527|-2.95472,51.53972|-2.89278,51.53861|-2.84778,51.54500|-2.71472,51.58083|-2.66500,51.61500|-2.68666,51.71889|-2.68334,51.76957|-2.65944,51.81806|-2.77861,51.88583|-2.86639,51.92889|-2.91757,51.91569|-2.98889,51.92555|-3.04528,51.97639|-3.08500,52.01930|-3.11250,52.06945|-3.12222,52.11805|-3.07555,52.14804|-3.05125,52.23347|-2.99750,52.28139|-2.95486,52.33117|-3.02195,52.34027|-3.19611,52.41027|-3.19514,52.46722|-3.11916,52.49194|-3.02736,52.49792|-2.98028,52.53083|-3.00792,52.56902|-3.07089,52.55702|-3.11750,52.58666|-3.06666,52.63527|-3.01111,52.71166|-3.06806,52.77027|-3.13708,52.79312|-3.13014,52.88486|-3.08639,52.91611|-2.99389,52.95361|-2.85069,52.93875|-2.79278,52.90207|-2.71945,52.91902|-2.73109,52.96873|-2.77792,52.98514|-2.85695,53.03249|-2.89389,53.10416|-2.91069,53.17014|-2.95528,53.21555|-3.02000,53.24722|-3.08860,53.26001';
+						break;
+					case 'NC':
+						$coordsAsStr[] = '-81.65876,36.60938|-81.70390,36.55513|-81.70639,36.50804|-81.74665,36.39777|-81.90723,36.30804|-82.03195,36.12694|-82.08416,36.10146|-82.12826,36.11020|-82.21500,36.15833|-82.36375,36.11347|-82.43472,36.06013|-82.46236,36.01708|-82.56006,35.96263|-82.60042,35.99638|-82.62308,36.06121|-82.73500,36.01833|-82.84612,35.94944|-82.90451,35.88819|-82.93555,35.83846|-83.16000,35.76236|-83.24222,35.71944|-83.49222,35.57111|-83.56847,35.55861|-83.64416,35.56471|-83.73499,35.56638|-83.88222,35.51791|-83.98361,35.44944|-84.03639,35.35444|-84.04964,35.29117|-84.09042,35.25986|-84.15084,35.25388|-84.20521,35.25722|-84.29284,35.22596|-84.32471,34.98701|-83.09778,35.00027|-82.77722,35.09138|-82.59639,35.14972|-82.37999,35.21500|-82.27362,35.20583|-81.41306,35.17416|-81.05915,35.15333|-80.92666,35.10695|-80.78751,34.95610|-80.79334,34.82555|-79.66777,34.80694|-79.11555,34.34527|-78.57222,33.88166|-78.51806,33.87999|-78.43721,33.89804|-78.23735,33.91986|-78.15389,33.91471|-78.06974,33.89500|-78.02597,33.88936|-77.97611,33.94276|-77.95299,33.99243|-77.94499,34.06499|-77.92728,34.11756|-77.92250,33.99194|-77.92264,33.93715|-77.88215,34.06166|-77.86222,34.15083|-77.83501,34.19194|-77.75724,34.28527|-77.68222,34.36555|-77.63667,34.39805|-77.57363,34.43694|-77.45527,34.50403|-77.38173,34.51646|-77.37905,34.56294|-77.38572,34.61260|-77.40944,34.68916|-77.38847,34.73304|-77.33097,34.63992|-77.35024,34.60099|-77.30958,34.55972|-77.09424,34.67742|-76.75994,34.76659|-76.68325,34.79749|-76.66097,34.75781|-76.62611,34.71014|-76.50063,34.73617|-76.48138,34.77638|-76.38305,34.86423|-76.34326,34.88194|-76.27181,34.96263|-76.35125,35.02221|-76.32354,34.97429|-76.45319,34.93524|-76.43395,34.98782|-76.45356,35.06676|-76.52917,35.00444|-76.63382,34.98242|-76.69722,34.94887|-76.75306,34.90526|-76.81636,34.93944|-76.89000,34.95388|-76.93180,34.96957|-76.96501,34.99777|-77.06816,35.14978|-76.97639,35.06806|-76.86722,35.00000|-76.80531,34.98559|-76.72708,35.00152|-76.60402,35.07416|-76.56555,35.11486|-76.57305,35.16013|-76.66489,35.16694|-76.56361,35.23361|-76.48750,35.22582|-76.46889,35.27166|-76.50298,35.30791|-76.83251,35.39222|-77.02305,35.48694|-77.04958,35.52694|-76.91292,35.46166|-76.65250,35.41499|-76.61611,35.45888|-76.63195,35.52249|-76.58820,35.55104|-76.51556,35.53194|-76.56711,35.48494|-76.52251,35.40416|-76.46195,35.37221|-76.13319,35.35986|-76.04111,35.42416|-76.00223,35.46610|-75.97958,35.51666|-75.89362,35.57555|-75.83834,35.56694|-75.78944,35.57138|-75.74076,35.61846|-75.72084,35.69263|-75.72084,35.81451|-75.74917,35.87791|-75.78333,35.91972|-75.85083,35.97527|-75.94333,35.91777|-75.98944,35.88054|-75.98854,35.79110|-75.99388,35.71027|-76.02875,35.65409|-76.10320,35.66041|-76.13563,35.69239|-76.04475,35.68436|-76.04167,35.74916|-76.05305,35.79361|-76.05305,35.87375|-76.02653,35.96222|-76.07751,35.99319|-76.17472,35.99596|-76.27917,35.91915|-76.37986,35.95763|-76.42014,35.97874|-76.55375,35.93971|-76.66222,35.93305|-76.72952,35.93984|-76.73392,36.04760|-76.75384,36.09477|-76.76028,36.14513|-76.74610,36.22818|-76.70458,36.24673|-76.72764,36.16736|-76.71021,36.11752|-76.69117,36.07165|-76.65979,36.03312|-76.49527,36.00958|-76.37138,36.07694|-76.37084,36.14999|-76.21417,36.09471|-76.07591,36.17910|-76.18361,36.26915|-76.19965,36.31739|-76.13986,36.28805|-76.04274,36.21974|-76.00465,36.18110|-75.95287,36.19241|-75.97604,36.31138|-75.93895,36.28381|-75.85271,36.11069|-75.79315,36.07385|-75.79639,36.11804|-75.88333,36.29554|-75.94665,36.37194|-75.98694,36.41166|-76.03473,36.49666|-76.02899,36.55000|-78.44234,36.54986|-78.56594,36.55799|-80.27556,36.55110|-81.15361,36.56499|-81.38722,36.57695|-81.65876,36.60938';
+						break;
+					default:
 				}
 				?>
 				var coordStr = <?php echo json_encode($coordsAsStr) ?>;

app/Module/ClippingsCart/ClippingsCartController.php

Switch Indentation +57 added lines, -57 removed lines

@@ -190,18 +190,18 @@ 
 			}
 
 			switch ($this->privatize_export) {
-			case 'gedadmin':
-				$access_level = Auth::PRIV_NONE;
-				break;
-			case 'user':
-				$access_level = Auth::PRIV_USER;
-				break;
-			case 'visitor':
-				$access_level = Auth::PRIV_PRIVATE;
-				break;
-			case 'none':
-				$access_level = Auth::PRIV_HIDE;
-				break;
+				case 'gedadmin':
+					$access_level = Auth::PRIV_NONE;
+					break;
+				case 'user':
+					$access_level = Auth::PRIV_USER;
+					break;
+				case 'visitor':
+					$access_level = Auth::PRIV_PRIVATE;
+					break;
+				case 'none':
+					$access_level = Auth::PRIV_HIDE;
+					break;
 			}
 
 			foreach (array_keys($this->cart[$WT_TREE->getTreeId()]) as $xref) {
@@ -234,38 +234,38 @@ 
 						$record = utf8_decode($record);
 					}
 					switch ($object::RECORD_TYPE) {
-					case 'INDI':
-						$filetext .= $record . "\n";
-						$filetext .= "1 SOUR @WEBTREES@\n";
-						$filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
-						break;
-					case 'FAM':
-						$filetext .= $record . "\n";
-						$filetext .= "1 SOUR @WEBTREES@\n";
-						$filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
-						break;
-					case 'SOUR':
-						$filetext .= $record . "\n";
-						$filetext .= "1 NOTE " . WT_BASE_URL . $object->getRawUrl() . "\n";
-						break;
-					default:
-						// This autoloads the PclZip library, so we can use its constants.
-						new PclZip('');
-
-						$ft              = preg_match_all("/\n\d FILE (.+)/", $savedRecord, $match, PREG_SET_ORDER);
-						$MEDIA_DIRECTORY = $WT_TREE->getPreference('MEDIA_DIRECTORY');
-						for ($k = 0; $k < $ft; $k++) {
-							// Skip external files and non-existant files
-							if (file_exists(WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1])) {
-								$media[$mediacount] = array(
-									\PCLZIP_ATT_FILE_NAME          => WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1],
-									\PCLZIP_ATT_FILE_NEW_FULL_NAME => $match[$k][1],
-								);
-								$mediacount++;
+						case 'INDI':
+							$filetext .= $record . "\n";
+							$filetext .= "1 SOUR @WEBTREES@\n";
+							$filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
+							break;
+						case 'FAM':
+							$filetext .= $record . "\n";
+							$filetext .= "1 SOUR @WEBTREES@\n";
+							$filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
+							break;
+						case 'SOUR':
+							$filetext .= $record . "\n";
+							$filetext .= "1 NOTE " . WT_BASE_URL . $object->getRawUrl() . "\n";
+							break;
+						default:
+							// This autoloads the PclZip library, so we can use its constants.
+							new PclZip('');
+
+							$ft              = preg_match_all("/\n\d FILE (.+)/", $savedRecord, $match, PREG_SET_ORDER);
+							$MEDIA_DIRECTORY = $WT_TREE->getPreference('MEDIA_DIRECTORY');
+							for ($k = 0; $k < $ft; $k++) {
+								// Skip external files and non-existant files
+								if (file_exists(WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1])) {
+									$media[$mediacount] = array(
+										\PCLZIP_ATT_FILE_NAME          => WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1],
+										\PCLZIP_ATT_FILE_NEW_FULL_NAME => $match[$k][1],
+									);
+									$mediacount++;
+								}
 							}
-						}
-						$filetext .= trim($record) . "\n";
-						break;
+							$filetext .= trim($record) . "\n";
+							break;
 					}
 				}
 			}
@@ -452,22 +452,22 @@ 
 		$b = GedcomRecord::getInstance($b, $WT_TREE);
 		if ($a && $b) {
 			switch ($a::RECORD_TYPE) {
-			case 'INDI': $t1 = 1; break;
-			case 'FAM':  $t1 = 2; break;
-			case 'SOUR': $t1 = 3; break;
-			case 'REPO': $t1 = 4; break;
-			case 'OBJE': $t1 = 5; break;
-			case 'NOTE': $t1 = 6; break;
-			default:     $t1 = 7; break;
+				case 'INDI': $t1 = 1; break;
+				case 'FAM':  $t1 = 2; break;
+				case 'SOUR': $t1 = 3; break;
+				case 'REPO': $t1 = 4; break;
+				case 'OBJE': $t1 = 5; break;
+				case 'NOTE': $t1 = 6; break;
+				default:     $t1 = 7; break;
 			}
 			switch ($b::RECORD_TYPE) {
-			case 'INDI': $t2 = 1; break;
-			case 'FAM':  $t2 = 2; break;
-			case 'SOUR': $t2 = 3; break;
-			case 'REPO': $t2 = 4; break;
-			case 'OBJE': $t2 = 5; break;
-			case 'NOTE': $t2 = 6; break;
-			default:     $t2 = 7; break;
+				case 'INDI': $t2 = 1; break;
+				case 'FAM':  $t2 = 2; break;
+				case 'SOUR': $t2 = 3; break;
+				case 'REPO': $t2 = 4; break;
+				case 'OBJE': $t2 = 5; break;
+				case 'NOTE': $t2 = 6; break;
+				default:     $t2 = 7; break;
 			}
 			if ($t1 != $t2) {
 				return $t1 - $t2;

app/Module/FrequentlyAskedQuestionsModule.php

Switch Indentation +35 added lines, -35 removed lines

@@ -47,41 +47,41 @@
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'admin_config':
-			$this->config();
-			break;
-		case 'admin_delete':
-			if (Auth::isAdmin()) {
-				$this->delete();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'admin_edit':
-			$this->edit();
-			break;
-		case 'admin_edit_save':
-			if (Auth::isAdmin()) {
-				$this->editSave();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'admin_movedown':
-			if (Auth::isAdmin()) {
-				$this->movedown();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'admin_moveup':
-			if (Auth::isAdmin()) {
-				$this->moveup();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'show':
-			$this->show();
-			break;
-		default:
-			http_response_code(404);
+			case 'admin_config':
+				$this->config();
+				break;
+			case 'admin_delete':
+				if (Auth::isAdmin()) {
+					$this->delete();
+				}
+				header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+				break;
+			case 'admin_edit':
+				$this->edit();
+				break;
+			case 'admin_edit_save':
+				if (Auth::isAdmin()) {
+					$this->editSave();
+				}
+				header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+				break;
+			case 'admin_movedown':
+				if (Auth::isAdmin()) {
+					$this->movedown();
+				}
+				header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+				break;
+			case 'admin_moveup':
+				if (Auth::isAdmin()) {
+					$this->moveup();
+				}
+				header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+				break;
+			case 'show':
+				$this->show();
+				break;
+			default:
+				http_response_code(404);
 		}
 	}
 

app/Module/YahrzeitModule.php

Switch Indentation +60 added lines, -60 removed lines

@@ -119,24 +119,24 @@ 
 		}
 
 		switch ($infoStyle) {
-		case 'list':
-			foreach ($yahrzeits as $yahrzeit) {
-				if ($yahrzeit->jd >= $startjd && $yahrzeit->jd < $startjd + $days) {
-					$ind = $yahrzeit->getParent();
-					$content .= "<a href=\"" . $ind->getHtmlUrl() . "\" class=\"list_item name2\">" . $ind->getFullName() . "</a>" . $ind->getSexImage();
-					$content .= "<div class=\"indent\">";
-					$content .= $yahrzeit->getDate()->display(true);
-					$content .= ', ' . I18N::translate('%s year anniversary', $yahrzeit->anniv);
-					$content .= "</div>";
+			case 'list':
+				foreach ($yahrzeits as $yahrzeit) {
+					if ($yahrzeit->jd >= $startjd && $yahrzeit->jd < $startjd + $days) {
+						$ind = $yahrzeit->getParent();
+						$content .= "<a href=\"" . $ind->getHtmlUrl() . "\" class=\"list_item name2\">" . $ind->getFullName() . "</a>" . $ind->getSexImage();
+						$content .= "<div class=\"indent\">";
+						$content .= $yahrzeit->getDate()->display(true);
+						$content .= ', ' . I18N::translate('%s year anniversary', $yahrzeit->anniv);
+						$content .= "</div>";
+					}
 				}
-			}
-			break;
-		case 'table':
-		default:
-			$table_id = Uuid::uuid4(); // table requires a unique ID
-			$controller
-				->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-				->addInlineJavascript('
+				break;
+			case 'table':
+			default:
+				$table_id = Uuid::uuid4(); // table requires a unique ID
+				$controller
+					->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+					->addInlineJavascript('
 					jQuery("#' . $table_id . '").dataTable({
 						dom: \'t\',
 						' . I18N::datatablesI18N() . ',
@@ -160,53 +160,53 @@ 
 					jQuery("#' . $table_id . '").css("visibility", "visible");
 					jQuery(".loading-image").css("display", "none");
 				');
-			$content = '';
-			$content .= '<div class="loading-image">&nbsp;</div>';
-			$content .= '<table id="' . $table_id . '" class="width100" style="visibility:hidden;">';
-			$content .= '<thead><tr>';
-			$content .= '<th>' . GedcomTag::getLabel('NAME') . '</th>';
-			$content .= '<th>' . GedcomTag::getLabel('NAME') . '</th>';
-			$content .= '<th>' . GedcomTag::getLabel('DEAT') . '</th>';
-			$content .= '<th>DEAT</th>';
-			$content .= '<th><i class="icon-reminder" title="' . I18N::translate('Anniversary') . '"></i></th>';
-			$content .= '<th>' . GedcomTag::getLabel('_YART') . '</th>';
-			$content .= '<th>_YART</th>';
-			$content .= '</tr></thead><tbody>';
+				$content = '';
+				$content .= '<div class="loading-image">&nbsp;</div>';
+				$content .= '<table id="' . $table_id . '" class="width100" style="visibility:hidden;">';
+				$content .= '<thead><tr>';
+				$content .= '<th>' . GedcomTag::getLabel('NAME') . '</th>';
+				$content .= '<th>' . GedcomTag::getLabel('NAME') . '</th>';
+				$content .= '<th>' . GedcomTag::getLabel('DEAT') . '</th>';
+				$content .= '<th>DEAT</th>';
+				$content .= '<th><i class="icon-reminder" title="' . I18N::translate('Anniversary') . '"></i></th>';
+				$content .= '<th>' . GedcomTag::getLabel('_YART') . '</th>';
+				$content .= '<th>_YART</th>';
+				$content .= '</tr></thead><tbody>';
 
-			foreach ($yahrzeits as $yahrzeit) {
-				if ($yahrzeit->jd >= $startjd && $yahrzeit->jd < $startjd + $days) {
-					$content .= '<tr>';
-					$ind = $yahrzeit->getParent();
-					// Individual name(s)
-					$name = $ind->getFullName();
-					$url  = $ind->getHtmlUrl();
-					$content .= '<td>';
-					$content .= '<a href="' . $url . '">' . $name . '</a>';
-					$content .= $ind->getSexImage();
-					$addname = $ind->getAddName();
-					if ($addname) {
-						$content .= '<br><a href="' . $url . '">' . $addname . '</a>';
-					}
-					$content .= '</td>';
-					$content .= '<td>' . $ind->getSortName() . '</td>';
+				foreach ($yahrzeits as $yahrzeit) {
+					if ($yahrzeit->jd >= $startjd && $yahrzeit->jd < $startjd + $days) {
+						$content .= '<tr>';
+						$ind = $yahrzeit->getParent();
+						// Individual name(s)
+						$name = $ind->getFullName();
+						$url  = $ind->getHtmlUrl();
+						$content .= '<td>';
+						$content .= '<a href="' . $url . '">' . $name . '</a>';
+						$content .= $ind->getSexImage();
+						$addname = $ind->getAddName();
+						if ($addname) {
+							$content .= '<br><a href="' . $url . '">' . $addname . '</a>';
+						}
+						$content .= '</td>';
+						$content .= '<td>' . $ind->getSortName() . '</td>';
 
-					// death/yahrzeit event date
-					$content .= '<td>' . $yahrzeit->getDate()->display() . '</td>';
-					$content .= '<td>' . $yahrzeit->getDate()->julianDay() . '</td>'; // sortable date
+						// death/yahrzeit event date
+						$content .= '<td>' . $yahrzeit->getDate()->display() . '</td>';
+						$content .= '<td>' . $yahrzeit->getDate()->julianDay() . '</td>'; // sortable date
 
-					// Anniversary
-					$content .= '<td>' . $yahrzeit->anniv . '</td>';
+						// Anniversary
+						$content .= '<td>' . $yahrzeit->anniv . '</td>';
 
-					// upcomming yahrzeit dates
-					switch ($calendar) {
-					case 'gregorian':
-						$today = new GregorianDate($yahrzeit->jd);
-						break;
-					case 'jewish':
-					default:
-						$today = new JewishDate($yahrzeit->jd);
-						break;
-					}
+						// upcomming yahrzeit dates
+						switch ($calendar) {
+							case 'gregorian':
+								$today = new GregorianDate($yahrzeit->jd);
+								break;
+							case 'jewish':
+							default:
+								$today = new JewishDate($yahrzeit->jd);
+								break;
+						}
 					$td = new Date($today->format('%@ %A %O %E'));
 					$content .= '<td>' . $td->display() . '</td>';
 					$content .= '<td>' . $td->julianDay() . '</td>'; // sortable date

app/Functions/Functions.php

Switch Indentation +1458 added lines, -1458 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');
+			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:
-			return I18N::translate('%s × cousin', I18N::number($n));
-			}
+				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);
+			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:
-				return /* I18N: A Spanish relationship name, such as 7th great-nephew */ I18N::translate('%1$s × %2$s', I18N::number($n), $relation);
-			}
+				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');
+			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');
 							}
-						} 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');
+				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');
 							}
-						} 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');
+				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');
 							}
-						} 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));
+				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:
-				return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 4));
-				}
+					// 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));
-				}
+				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:
-				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));
-				}
-				}
+					// 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));
+				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:
-				return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
-				}
+					// 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));
-				}
+					// 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));
-				}
+				case 'en_AU': // See: http://en.wikipedia.org/wiki/File:CousinTree.svg
+				case 'en_GB':
+				case 'en_US':
 				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));
-				}
-				}
+					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));
+						}
+					}
 			}
 		}
 

app/Functions/FunctionsImport.php

Switch Indentation +632 added lines, -632 removed lines

@@ -59,477 +59,477 @@ 
 			$tag                               = strtoupper($tag); // Tags should always be upper case
 			switch ($tag) {
 				// Convert PhpGedView tags to WT
-			case '_PGVU':
-				$tag = '_WT_USER';
-				break;
-			case '_PGV_OBJS':
-				$tag = '_WT_OBJE_SORT';
-				break;
-				// Convert FTM-style "TAG_FORMAL_NAME" into "TAG".
-			case 'ABBREVIATION':
-				$tag = 'ABBR';
-				break;
-			case 'ADDRESS':
-				$tag = 'ADDR';
-				break;
-			case 'ADDRESS1':
-				$tag = 'ADR1';
-				break;
-			case 'ADDRESS2':
-				$tag = 'ADR2';
-				break;
-			case 'ADDRESS3':
-				$tag = 'ADR3';
-				break;
-			case 'ADOPTION':
-				$tag = 'ADOP';
-				break;
-			case 'ADULT_CHRISTENING':
-				$tag = 'CHRA';
-				break;
-			case 'AFN':
-				// AFN values are upper case
-				$data = strtoupper($data);
-				break;
-			case 'AGENCY':
-				$tag = 'AGNC';
-				break;
-			case 'ALIAS':
-				$tag = 'ALIA';
-				break;
-			case 'ANCESTORS':
-				$tag = 'ANCE';
-				break;
-			case 'ANCES_INTEREST':
-				$tag = 'ANCI';
-				break;
-			case 'ANNULMENT':
-				$tag = 'ANUL';
-				break;
-			case 'ASSOCIATES':
-				$tag = 'ASSO';
-				break;
-			case 'AUTHOR':
-				$tag = 'AUTH';
-				break;
-			case 'BAPTISM':
-				$tag = 'BAPM';
-				break;
-			case 'BAPTISM_LDS':
-				$tag = 'BAPL';
-				break;
-			case 'BAR_MITZVAH':
-				$tag = 'BARM';
-				break;
-			case 'BAS_MITZVAH':
-				$tag = 'BASM';
-				break;
-			case 'BIRTH':
-				$tag = 'BIRT';
-				break;
-			case 'BLESSING':
-				$tag = 'BLES';
-				break;
-			case 'BURIAL':
-				$tag = 'BURI';
-				break;
-			case 'CALL_NUMBER':
-				$tag = 'CALN';
-				break;
-			case 'CASTE':
-				$tag = 'CAST';
-				break;
-			case 'CAUSE':
-				$tag = 'CAUS';
-				break;
-			case 'CENSUS':
-				$tag = 'CENS';
-				break;
-			case 'CHANGE':
-				$tag = 'CHAN';
-				break;
-			case 'CHARACTER':
-				$tag = 'CHAR';
-				break;
-			case 'CHILD':
-				$tag = 'CHIL';
-				break;
-			case 'CHILDREN_COUNT':
-				$tag = 'NCHI';
-				break;
-			case 'CHRISTENING':
-				$tag = 'CHR';
-				break;
-			case 'CONCATENATION':
-				$tag = 'CONC';
-				break;
-			case 'CONFIRMATION':
-				$tag = 'CONF';
-				break;
-			case 'CONFIRMATION_LDS':
-				$tag = 'CONL';
-				break;
-			case 'CONTINUED':
-				$tag = 'CONT';
-				break;
-			case 'COPYRIGHT':
-				$tag = 'COPR';
-				break;
-			case 'CORPORATE':
-				$tag = 'CORP';
-				break;
-			case 'COUNTRY':
-				$tag = 'CTRY';
-				break;
-			case 'CREMATION':
-				$tag = 'CREM';
-				break;
-			case 'DATE':
-				// Preserve text from INT dates
-				if (strpos($data, '(') !== false) {
-					list($date, $text) = explode('(', $data, 2);
-					$text              = ' (' . $text;
-				} else {
-					$date = $data;
-					$text = '';
-				}
-				// Capitals
-				$date = strtoupper($date);
-				// Temporarily add leading/trailing spaces, to allow efficient matching below
-				$date = " {$date} ";
-				// Ensure space digits and letters
-				$date = preg_replace('/([A-Z])(\d)/', '$1 $2', $date);
-				$date = preg_replace('/(\d)([A-Z])/', '$1 $2', $date);
-				// Ensure space before/after calendar escapes
-				$date = preg_replace('/@#[^@]+@/', ' $0 ', $date);
-				// "BET." => "BET"
-				$date = preg_replace('/(\w\w)\./', '$1', $date);
-				// "CIR" => "ABT"
-				$date = str_replace(' CIR ', ' ABT ', $date);
-				$date = str_replace(' APX ', ' ABT ', $date);
-				// B.C. => BC (temporarily, to allow easier handling of ".")
-				$date = str_replace(' B.C. ', ' BC ', $date);
-				// "BET X - Y " => "BET X AND Y"
-				$date = preg_replace('/^(.* BET .+) - (.+)/', '$1 AND $2', $date);
-				$date = preg_replace('/^(.* FROM .+) - (.+)/', '$1 TO $2', $date);
-				// "@#ESC@ FROM X TO Y" => "FROM @#ESC@ X TO @#ESC@ Y"
-				$date = preg_replace('/^ +(@#[^@]+@) +FROM +(.+) +TO +(.+)/', ' FROM $1 $2 TO $1 $3', $date);
-				$date = preg_replace('/^ +(@#[^@]+@) +BET +(.+) +AND +(.+)/', ' BET $1 $2 AND $1 $3', $date);
-				// "@#ESC@ AFT X" => "AFT @#ESC@ X"
-				$date = preg_replace('/^ +(@#[^@]+@) +(FROM|BET|TO|AND|BEF|AFT|CAL|EST|INT|ABT) +(.+)/', ' $2 $1 $3', $date);
-				// Ignore any remaining punctuation, e.g. "14-MAY, 1900" => "14 MAY 1900"
-				// (don't change "/" - it is used in NS/OS dates)
-				$date = preg_replace('/[.,:;-]/', ' ', $date);
-				// BC => B.C.
-				$date = str_replace(' BC ', ' B.C. ', $date);
-				// Append the "INT" text
-				$data = $date . $text;
-				break;
-			case 'DEATH':
-				$tag = 'DEAT';
-				break;
-			case '_DEATH_OF_SPOUSE':
-				$tag = '_DETS';
-				break;
-			case '_DEGREE':
-				$tag = '_DEG';
-				break;
-			case 'DESCENDANTS':
-				$tag = 'DESC';
-				break;
-			case 'DESCENDANT_INT':
-				$tag = 'DESI';
-				break;
-			case 'DESTINATION':
-				$tag = 'DEST';
-				break;
-			case 'DIVORCE':
-				$tag = 'DIV';
-				break;
-			case 'DIVORCE_FILED':
-				$tag = 'DIVF';
-				break;
-			case 'EDUCATION':
-				$tag = 'EDUC';
-				break;
-			case 'EMIGRATION':
-				$tag = 'EMIG';
-				break;
-			case 'ENDOWMENT':
-				$tag = 'ENDL';
-				break;
-			case 'ENGAGEMENT':
-				$tag = 'ENGA';
-				break;
-			case 'EVENT':
-				$tag = 'EVEN';
-				break;
-			case 'FACSIMILE':
-				$tag = 'FAX';
-				break;
-			case 'FAMILY':
-				$tag = 'FAM';
-				break;
-			case 'FAMILY_CHILD':
-				$tag = 'FAMC';
-				break;
-			case 'FAMILY_FILE':
-				$tag = 'FAMF';
-				break;
-			case 'FAMILY_SPOUSE':
-				$tag = 'FAMS';
-				break;
-			case 'FIRST_COMMUNION':
-				$tag = 'FCOM';
-				break;
-			case '_FILE':
-				$tag = 'FILE';
-				break;
-			case 'FORMAT':
-				$tag = 'FORM';
-			case 'FORM':
-				// Consistent commas
-				$data = preg_replace('/ *, */', ', ', $data);
-				break;
-			case 'GEDCOM':
-				$tag = 'GEDC';
-				break;
-			case 'GIVEN_NAME':
-				$tag = 'GIVN';
-				break;
-			case 'GRADUATION':
-				$tag = 'GRAD';
-				break;
-			case 'HEADER':
-				$tag = 'HEAD';
-			case 'HEAD':
-				// HEAD records don't have an XREF or DATA
-				if ($level == '0') {
-					$xref = '';
-					$data = '';
-				}
-				break;
-			case 'HUSBAND':
-				$tag = 'HUSB';
-				break;
-			case 'IDENT_NUMBER':
-				$tag = 'IDNO';
-				break;
-			case 'IMMIGRATION':
-				$tag = 'IMMI';
-				break;
-			case 'INDIVIDUAL':
-				$tag = 'INDI';
-				break;
-			case 'LANGUAGE':
-				$tag = 'LANG';
-				break;
-			case 'LATITUDE':
-				$tag = 'LATI';
-				break;
-			case 'LONGITUDE':
-				$tag = 'LONG';
-				break;
-			case 'MARRIAGE':
-				$tag = 'MARR';
-				break;
-			case 'MARRIAGE_BANN':
-				$tag = 'MARB';
-				break;
-			case 'MARRIAGE_COUNT':
-				$tag = 'NMR';
-				break;
-			case 'MARRIAGE_CONTRACT':
-				$tag = 'MARC';
-				break;
-			case 'MARRIAGE_LICENSE':
-				$tag = 'MARL';
-				break;
-			case 'MARRIAGE_SETTLEMENT':
-				$tag = 'MARS';
-				break;
-			case 'MEDIA':
-				$tag = 'MEDI';
-				break;
-			case '_MEDICAL':
-				$tag = '_MDCL';
-				break;
-			case '_MILITARY_SERVICE':
-				$tag = '_MILT';
-				break;
-			case 'NAME':
-				// Tidy up whitespace
-				$data = preg_replace('/  +/', ' ', trim($data));
-				break;
-			case 'NAME_PREFIX':
-				$tag = 'NPFX';
-				break;
-			case 'NAME_SUFFIX':
-				$tag = 'NSFX';
-				break;
-			case 'NATIONALITY':
-				$tag = 'NATI';
-				break;
-			case 'NATURALIZATION':
-				$tag = 'NATU';
-				break;
-			case 'NICKNAME':
-				$tag = 'NICK';
-				break;
-			case 'OBJECT':
-				$tag = 'OBJE';
-				break;
-			case 'OCCUPATION':
-				$tag = 'OCCU';
-				break;
-			case 'ORDINANCE':
-				$tag = 'ORDI';
-				break;
-			case 'ORDINATION':
-				$tag = 'ORDN';
-				break;
-			case 'PEDIGREE':
-				$tag = 'PEDI';
-			case 'PEDI':
-				// PEDI values are lower case
-				$data = strtolower($data);
-				break;
-			case 'PHONE':
-				$tag = 'PHON';
-				break;
-			case 'PHONETIC':
-				$tag = 'FONE';
-				break;
-			case 'PHY_DESCRIPTION':
-				$tag = 'DSCR';
-				break;
-			case 'PLACE':
-				$tag = 'PLAC';
-			case 'PLAC':
-				// Consistent commas
-				$data = preg_replace('/ *(،|,) */', ', ', $data);
-				// The Master Genealogist stores LAT/LONG data in the PLAC field, e.g. Pennsylvania, USA, 395945N0751013W
-				if (preg_match('/(.*), (\d\d)(\d\d)(\d\d)([NS])(\d\d\d)(\d\d)(\d\d)([EW])$/', $data, $match)) {
-					$data =
-						$match[1] . "\n" .
-						($level + 1) . " MAP\n" .
-						($level + 2) . " LATI " . ($match[5] . (round($match[2] + ($match[3] / 60) + ($match[4] / 3600), 4))) . "\n" .
-						($level + 2) . " LONG " . ($match[9] . (round($match[6] + ($match[7] / 60) + ($match[8] / 3600), 4)));
-				}
-				break;
-			case 'POSTAL_CODE':
-				$tag = 'POST';
-				break;
-			case 'PROBATE':
-				$tag = 'PROB';
-				break;
-			case 'PROPERTY':
-				$tag = 'PROP';
-				break;
-			case 'PUBLICATION':
-				$tag = 'PUBL';
-				break;
-			case 'QUALITY_OF_DATA':
-				$tag = 'QUAL';
-				break;
-			case 'REC_FILE_NUMBER':
-				$tag = 'RFN';
-				break;
-			case 'REC_ID_NUMBER':
-				$tag = 'RIN';
-				break;
-			case 'REFERENCE':
-				$tag = 'REFN';
-				break;
-			case 'RELATIONSHIP':
-				$tag = 'RELA';
-				break;
-			case 'RELIGION':
-				$tag = 'RELI';
-				break;
-			case 'REPOSITORY':
-				$tag = 'REPO';
-				break;
-			case 'RESIDENCE':
-				$tag = 'RESI';
-				break;
-			case 'RESTRICTION':
-				$tag = 'RESN';
-			case 'RESN':
-				// RESN values are lower case (confidential, privacy, locked, none)
-				$data = strtolower($data);
-				if ($data == 'invisible') {
-					$data = 'confidential'; // From old versions of Legacy.
-				}
-				break;
-			case 'RETIREMENT':
-				$tag = 'RETI';
-				break;
-			case 'ROMANIZED':
-				$tag = 'ROMN';
-				break;
-			case 'SEALING_CHILD':
-				$tag = 'SLGC';
-				break;
-			case 'SEALING_SPOUSE':
-				$tag = 'SLGS';
-				break;
-			case 'SOC_SEC_NUMBER':
-				$tag = 'SSN';
-				break;
-			case 'SEX':
-				$data = strtoupper($data);
-				break;
-			case 'SOURCE':
-				$tag = 'SOUR';
-				break;
-			case 'STATE':
-				$tag = 'STAE';
-				break;
-			case 'STATUS':
-				$tag = 'STAT';
-			case 'STAT':
-				if ($data == 'CANCELLED') {
-					// PhpGedView mis-spells this tag - correct it.
-					$data = 'CANCELED';
-				}
-				break;
-			case 'SUBMISSION':
-				$tag = 'SUBN';
-				break;
-			case 'SUBMITTER':
-				$tag = 'SUBM';
-				break;
-			case 'SURNAME':
-				$tag = 'SURN';
-				break;
-			case 'SURN_PREFIX':
-				$tag = 'SPFX';
-				break;
-			case 'TEMPLE':
-				$tag = 'TEMP';
-			case 'TEMP':
-				// Temple codes are upper case
-				$data = strtoupper($data);
-				break;
-			case 'TITLE':
-				$tag = 'TITL';
-				break;
-			case 'TRAILER':
-				$tag = 'TRLR';
-			case 'TRLR':
-				// TRLR records don't have an XREF or DATA
-				if ($level == '0') {
-					$xref = '';
-					$data = '';
-				}
-				break;
-			case 'VERSION':
-				$tag = 'VERS';
-				break;
-			case 'WEB':
-				$tag = 'WWW';
-				break;
+				case '_PGVU':
+					$tag = '_WT_USER';
+					break;
+				case '_PGV_OBJS':
+					$tag = '_WT_OBJE_SORT';
+					break;
+					// Convert FTM-style "TAG_FORMAL_NAME" into "TAG".
+				case 'ABBREVIATION':
+					$tag = 'ABBR';
+					break;
+				case 'ADDRESS':
+					$tag = 'ADDR';
+					break;
+				case 'ADDRESS1':
+					$tag = 'ADR1';
+					break;
+				case 'ADDRESS2':
+					$tag = 'ADR2';
+					break;
+				case 'ADDRESS3':
+					$tag = 'ADR3';
+					break;
+				case 'ADOPTION':
+					$tag = 'ADOP';
+					break;
+				case 'ADULT_CHRISTENING':
+					$tag = 'CHRA';
+					break;
+				case 'AFN':
+					// AFN values are upper case
+					$data = strtoupper($data);
+					break;
+				case 'AGENCY':
+					$tag = 'AGNC';
+					break;
+				case 'ALIAS':
+					$tag = 'ALIA';
+					break;
+				case 'ANCESTORS':
+					$tag = 'ANCE';
+					break;
+				case 'ANCES_INTEREST':
+					$tag = 'ANCI';
+					break;
+				case 'ANNULMENT':
+					$tag = 'ANUL';
+					break;
+				case 'ASSOCIATES':
+					$tag = 'ASSO';
+					break;
+				case 'AUTHOR':
+					$tag = 'AUTH';
+					break;
+				case 'BAPTISM':
+					$tag = 'BAPM';
+					break;
+				case 'BAPTISM_LDS':
+					$tag = 'BAPL';
+					break;
+				case 'BAR_MITZVAH':
+					$tag = 'BARM';
+					break;
+				case 'BAS_MITZVAH':
+					$tag = 'BASM';
+					break;
+				case 'BIRTH':
+					$tag = 'BIRT';
+					break;
+				case 'BLESSING':
+					$tag = 'BLES';
+					break;
+				case 'BURIAL':
+					$tag = 'BURI';
+					break;
+				case 'CALL_NUMBER':
+					$tag = 'CALN';
+					break;
+				case 'CASTE':
+					$tag = 'CAST';
+					break;
+				case 'CAUSE':
+					$tag = 'CAUS';
+					break;
+				case 'CENSUS':
+					$tag = 'CENS';
+					break;
+				case 'CHANGE':
+					$tag = 'CHAN';
+					break;
+				case 'CHARACTER':
+					$tag = 'CHAR';
+					break;
+				case 'CHILD':
+					$tag = 'CHIL';
+					break;
+				case 'CHILDREN_COUNT':
+					$tag = 'NCHI';
+					break;
+				case 'CHRISTENING':
+					$tag = 'CHR';
+					break;
+				case 'CONCATENATION':
+					$tag = 'CONC';
+					break;
+				case 'CONFIRMATION':
+					$tag = 'CONF';
+					break;
+				case 'CONFIRMATION_LDS':
+					$tag = 'CONL';
+					break;
+				case 'CONTINUED':
+					$tag = 'CONT';
+					break;
+				case 'COPYRIGHT':
+					$tag = 'COPR';
+					break;
+				case 'CORPORATE':
+					$tag = 'CORP';
+					break;
+				case 'COUNTRY':
+					$tag = 'CTRY';
+					break;
+				case 'CREMATION':
+					$tag = 'CREM';
+					break;
+				case 'DATE':
+					// Preserve text from INT dates
+					if (strpos($data, '(') !== false) {
+						list($date, $text) = explode('(', $data, 2);
+						$text              = ' (' . $text;
+					} else {
+						$date = $data;
+						$text = '';
+					}
+					// Capitals
+					$date = strtoupper($date);
+					// Temporarily add leading/trailing spaces, to allow efficient matching below
+					$date = " {$date} ";
+					// Ensure space digits and letters
+					$date = preg_replace('/([A-Z])(\d)/', '$1 $2', $date);
+					$date = preg_replace('/(\d)([A-Z])/', '$1 $2', $date);
+					// Ensure space before/after calendar escapes
+					$date = preg_replace('/@#[^@]+@/', ' $0 ', $date);
+					// "BET." => "BET"
+					$date = preg_replace('/(\w\w)\./', '$1', $date);
+					// "CIR" => "ABT"
+					$date = str_replace(' CIR ', ' ABT ', $date);
+					$date = str_replace(' APX ', ' ABT ', $date);
+					// B.C. => BC (temporarily, to allow easier handling of ".")
+					$date = str_replace(' B.C. ', ' BC ', $date);
+					// "BET X - Y " => "BET X AND Y"
+					$date = preg_replace('/^(.* BET .+) - (.+)/', '$1 AND $2', $date);
+					$date = preg_replace('/^(.* FROM .+) - (.+)/', '$1 TO $2', $date);
+					// "@#ESC@ FROM X TO Y" => "FROM @#ESC@ X TO @#ESC@ Y"
+					$date = preg_replace('/^ +(@#[^@]+@) +FROM +(.+) +TO +(.+)/', ' FROM $1 $2 TO $1 $3', $date);
+					$date = preg_replace('/^ +(@#[^@]+@) +BET +(.+) +AND +(.+)/', ' BET $1 $2 AND $1 $3', $date);
+					// "@#ESC@ AFT X" => "AFT @#ESC@ X"
+					$date = preg_replace('/^ +(@#[^@]+@) +(FROM|BET|TO|AND|BEF|AFT|CAL|EST|INT|ABT) +(.+)/', ' $2 $1 $3', $date);
+					// Ignore any remaining punctuation, e.g. "14-MAY, 1900" => "14 MAY 1900"
+					// (don't change "/" - it is used in NS/OS dates)
+					$date = preg_replace('/[.,:;-]/', ' ', $date);
+					// BC => B.C.
+					$date = str_replace(' BC ', ' B.C. ', $date);
+					// Append the "INT" text
+					$data = $date . $text;
+					break;
+				case 'DEATH':
+					$tag = 'DEAT';
+					break;
+				case '_DEATH_OF_SPOUSE':
+					$tag = '_DETS';
+					break;
+				case '_DEGREE':
+					$tag = '_DEG';
+					break;
+				case 'DESCENDANTS':
+					$tag = 'DESC';
+					break;
+				case 'DESCENDANT_INT':
+					$tag = 'DESI';
+					break;
+				case 'DESTINATION':
+					$tag = 'DEST';
+					break;
+				case 'DIVORCE':
+					$tag = 'DIV';
+					break;
+				case 'DIVORCE_FILED':
+					$tag = 'DIVF';
+					break;
+				case 'EDUCATION':
+					$tag = 'EDUC';
+					break;
+				case 'EMIGRATION':
+					$tag = 'EMIG';
+					break;
+				case 'ENDOWMENT':
+					$tag = 'ENDL';
+					break;
+				case 'ENGAGEMENT':
+					$tag = 'ENGA';
+					break;
+				case 'EVENT':
+					$tag = 'EVEN';
+					break;
+				case 'FACSIMILE':
+					$tag = 'FAX';
+					break;
+				case 'FAMILY':
+					$tag = 'FAM';
+					break;
+				case 'FAMILY_CHILD':
+					$tag = 'FAMC';
+					break;
+				case 'FAMILY_FILE':
+					$tag = 'FAMF';
+					break;
+				case 'FAMILY_SPOUSE':
+					$tag = 'FAMS';
+					break;
+				case 'FIRST_COMMUNION':
+					$tag = 'FCOM';
+					break;
+				case '_FILE':
+					$tag = 'FILE';
+					break;
+				case 'FORMAT':
+					$tag = 'FORM';
+				case 'FORM':
+					// Consistent commas
+					$data = preg_replace('/ *, */', ', ', $data);
+					break;
+				case 'GEDCOM':
+					$tag = 'GEDC';
+					break;
+				case 'GIVEN_NAME':
+					$tag = 'GIVN';
+					break;
+				case 'GRADUATION':
+					$tag = 'GRAD';
+					break;
+				case 'HEADER':
+					$tag = 'HEAD';
+				case 'HEAD':
+					// HEAD records don't have an XREF or DATA
+					if ($level == '0') {
+						$xref = '';
+						$data = '';
+					}
+					break;
+				case 'HUSBAND':
+					$tag = 'HUSB';
+					break;
+				case 'IDENT_NUMBER':
+					$tag = 'IDNO';
+					break;
+				case 'IMMIGRATION':
+					$tag = 'IMMI';
+					break;
+				case 'INDIVIDUAL':
+					$tag = 'INDI';
+					break;
+				case 'LANGUAGE':
+					$tag = 'LANG';
+					break;
+				case 'LATITUDE':
+					$tag = 'LATI';
+					break;
+				case 'LONGITUDE':
+					$tag = 'LONG';
+					break;
+				case 'MARRIAGE':
+					$tag = 'MARR';
+					break;
+				case 'MARRIAGE_BANN':
+					$tag = 'MARB';
+					break;
+				case 'MARRIAGE_COUNT':
+					$tag = 'NMR';
+					break;
+				case 'MARRIAGE_CONTRACT':
+					$tag = 'MARC';
+					break;
+				case 'MARRIAGE_LICENSE':
+					$tag = 'MARL';
+					break;
+				case 'MARRIAGE_SETTLEMENT':
+					$tag = 'MARS';
+					break;
+				case 'MEDIA':
+					$tag = 'MEDI';
+					break;
+				case '_MEDICAL':
+					$tag = '_MDCL';
+					break;
+				case '_MILITARY_SERVICE':
+					$tag = '_MILT';
+					break;
+				case 'NAME':
+					// Tidy up whitespace
+					$data = preg_replace('/  +/', ' ', trim($data));
+					break;
+				case 'NAME_PREFIX':
+					$tag = 'NPFX';
+					break;
+				case 'NAME_SUFFIX':
+					$tag = 'NSFX';
+					break;
+				case 'NATIONALITY':
+					$tag = 'NATI';
+					break;
+				case 'NATURALIZATION':
+					$tag = 'NATU';
+					break;
+				case 'NICKNAME':
+					$tag = 'NICK';
+					break;
+				case 'OBJECT':
+					$tag = 'OBJE';
+					break;
+				case 'OCCUPATION':
+					$tag = 'OCCU';
+					break;
+				case 'ORDINANCE':
+					$tag = 'ORDI';
+					break;
+				case 'ORDINATION':
+					$tag = 'ORDN';
+					break;
+				case 'PEDIGREE':
+					$tag = 'PEDI';
+				case 'PEDI':
+					// PEDI values are lower case
+					$data = strtolower($data);
+					break;
+				case 'PHONE':
+					$tag = 'PHON';
+					break;
+				case 'PHONETIC':
+					$tag = 'FONE';
+					break;
+				case 'PHY_DESCRIPTION':
+					$tag = 'DSCR';
+					break;
+				case 'PLACE':
+					$tag = 'PLAC';
+				case 'PLAC':
+					// Consistent commas
+					$data = preg_replace('/ *(،|,) */', ', ', $data);
+					// The Master Genealogist stores LAT/LONG data in the PLAC field, e.g. Pennsylvania, USA, 395945N0751013W
+					if (preg_match('/(.*), (\d\d)(\d\d)(\d\d)([NS])(\d\d\d)(\d\d)(\d\d)([EW])$/', $data, $match)) {
+						$data =
+							$match[1] . "\n" .
+							($level + 1) . " MAP\n" .
+							($level + 2) . " LATI " . ($match[5] . (round($match[2] + ($match[3] / 60) + ($match[4] / 3600), 4))) . "\n" .
+							($level + 2) . " LONG " . ($match[9] . (round($match[6] + ($match[7] / 60) + ($match[8] / 3600), 4)));
+					}
+					break;
+				case 'POSTAL_CODE':
+					$tag = 'POST';
+					break;
+				case 'PROBATE':
+					$tag = 'PROB';
+					break;
+				case 'PROPERTY':
+					$tag = 'PROP';
+					break;
+				case 'PUBLICATION':
+					$tag = 'PUBL';
+					break;
+				case 'QUALITY_OF_DATA':
+					$tag = 'QUAL';
+					break;
+				case 'REC_FILE_NUMBER':
+					$tag = 'RFN';
+					break;
+				case 'REC_ID_NUMBER':
+					$tag = 'RIN';
+					break;
+				case 'REFERENCE':
+					$tag = 'REFN';
+					break;
+				case 'RELATIONSHIP':
+					$tag = 'RELA';
+					break;
+				case 'RELIGION':
+					$tag = 'RELI';
+					break;
+				case 'REPOSITORY':
+					$tag = 'REPO';
+					break;
+				case 'RESIDENCE':
+					$tag = 'RESI';
+					break;
+				case 'RESTRICTION':
+					$tag = 'RESN';
+				case 'RESN':
+					// RESN values are lower case (confidential, privacy, locked, none)
+					$data = strtolower($data);
+					if ($data == 'invisible') {
+						$data = 'confidential'; // From old versions of Legacy.
+					}
+					break;
+				case 'RETIREMENT':
+					$tag = 'RETI';
+					break;
+				case 'ROMANIZED':
+					$tag = 'ROMN';
+					break;
+				case 'SEALING_CHILD':
+					$tag = 'SLGC';
+					break;
+				case 'SEALING_SPOUSE':
+					$tag = 'SLGS';
+					break;
+				case 'SOC_SEC_NUMBER':
+					$tag = 'SSN';
+					break;
+				case 'SEX':
+					$data = strtoupper($data);
+					break;
+				case 'SOURCE':
+					$tag = 'SOUR';
+					break;
+				case 'STATE':
+					$tag = 'STAE';
+					break;
+				case 'STATUS':
+					$tag = 'STAT';
+				case 'STAT':
+					if ($data == 'CANCELLED') {
+						// PhpGedView mis-spells this tag - correct it.
+						$data = 'CANCELED';
+					}
+					break;
+				case 'SUBMISSION':
+					$tag = 'SUBN';
+					break;
+				case 'SUBMITTER':
+					$tag = 'SUBM';
+					break;
+				case 'SURNAME':
+					$tag = 'SURN';
+					break;
+				case 'SURN_PREFIX':
+					$tag = 'SPFX';
+					break;
+				case 'TEMPLE':
+					$tag = 'TEMP';
+				case 'TEMP':
+					// Temple codes are upper case
+					$data = strtoupper($data);
+					break;
+				case 'TITLE':
+					$tag = 'TITL';
+					break;
+				case 'TRAILER':
+					$tag = 'TRLR';
+				case 'TRLR':
+					// TRLR records don't have an XREF or DATA
+					if ($level == '0') {
+						$xref = '';
+						$data = '';
+					}
+					break;
+				case 'VERSION':
+					$tag = 'VERS';
+					break;
+				case 'WEB':
+					$tag = 'WWW';
+					break;
 			}
 			// Suppress "Y", for facts/events with a DATE or PLAC
 			if ($data == 'y') {
@@ -545,40 +545,40 @@ 
 			}
 			// Reassemble components back into a single line
 			switch ($tag) {
-			default:
-				// Remove tabs and multiple/leading/trailing spaces
-				if (strpos($data, "\t") !== false) {
-					$data = str_replace("\t", ' ', $data);
-				}
-				if (substr($data, 0, 1) == ' ' || substr($data, -1, 1) == ' ') {
-					$data = trim($data);
-				}
-				while (strpos($data, '  ')) {
-					$data = str_replace('  ', ' ', $data);
-				}
-				$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
-				break;
-			case 'NOTE':
-			case 'TEXT':
-			case 'DATA':
-			case 'CONT':
-				$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
-				break;
-			case 'FILE':
-				// Strip off the user-defined path prefix
-				$GEDCOM_MEDIA_PATH = $tree->getPreference('GEDCOM_MEDIA_PATH');
-				if ($GEDCOM_MEDIA_PATH && strpos($data, $GEDCOM_MEDIA_PATH) === 0) {
-					$data = substr($data, strlen($GEDCOM_MEDIA_PATH));
-				}
-				// convert backslashes in filenames to forward slashes
-				$data = preg_replace("/\\\/", "/", $data);
+				default:
+					// Remove tabs and multiple/leading/trailing spaces
+					if (strpos($data, "\t") !== false) {
+						$data = str_replace("\t", ' ', $data);
+					}
+					if (substr($data, 0, 1) == ' ' || substr($data, -1, 1) == ' ') {
+						$data = trim($data);
+					}
+					while (strpos($data, '  ')) {
+						$data = str_replace('  ', ' ', $data);
+					}
+					$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
+					break;
+				case 'NOTE':
+				case 'TEXT':
+				case 'DATA':
+				case 'CONT':
+					$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
+					break;
+				case 'FILE':
+					// Strip off the user-defined path prefix
+					$GEDCOM_MEDIA_PATH = $tree->getPreference('GEDCOM_MEDIA_PATH');
+					if ($GEDCOM_MEDIA_PATH && strpos($data, $GEDCOM_MEDIA_PATH) === 0) {
+						$data = substr($data, strlen($GEDCOM_MEDIA_PATH));
+					}
+					// convert backslashes in filenames to forward slashes
+					$data = preg_replace("/\\\/", "/", $data);
 
-				$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
-				break;
-			case 'CONC':
-				// Merge CONC lines, to simplify access later on.
-				$newrec .= ($tree->getPreference('WORD_WRAPPED_NOTES') ? ' ' : '') . $data;
-				break;
+					$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
+					break;
+				case 'CONC':
+					// Merge CONC lines, to simplify access later on.
+					$newrec .= ($tree->getPreference('WORD_WRAPPED_NOTES') ? ' ' : '') . $data;
+					break;
 			}
 		}
 
@@ -635,123 +635,123 @@ 
 		}
 
 		switch ($type) {
-		case 'INDI':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+			case 'INDI':
+				// Convert inline media into media objects
+				$gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			$record = new Individual($xref, $gedrec, null, $tree);
-			if (preg_match('/\n1 RIN (.+)/', $gedrec, $match)) {
-				$rin = $match[1];
-			} else {
-				$rin = $xref;
-			}
-			Database::prepare(
-				"INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom) VALUES (?, ?, ?, ?, ?)"
-			)->execute(array(
-				$xref, $tree_id, $rin, $record->getSex(), $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updatePlaces($xref, $tree_id, $gedrec);
-			self::updateDates($xref, $tree_id, $gedrec);
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'FAM':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+				$record = new Individual($xref, $gedrec, null, $tree);
+				if (preg_match('/\n1 RIN (.+)/', $gedrec, $match)) {
+					$rin = $match[1];
+				} else {
+					$rin = $xref;
+				}
+				Database::prepare(
+					"INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom) VALUES (?, ?, ?, ?, ?)"
+				)->execute(array(
+					$xref, $tree_id, $rin, $record->getSex(), $gedrec,
+				));
+				// Update the cross-reference/index tables.
+				self::updatePlaces($xref, $tree_id, $gedrec);
+				self::updateDates($xref, $tree_id, $gedrec);
+				self::updateLinks($xref, $tree_id, $gedrec);
+				self::updateNames($xref, $tree_id, $record);
+				break;
+			case 'FAM':
+				// Convert inline media into media objects
+				$gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			if (preg_match('/\n1 HUSB @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
-				$husb = $match[1];
-			} else {
-				$husb = '';
-			}
-			if (preg_match('/\n1 WIFE @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
-				$wife = $match[1];
-			} else {
-				$wife = '';
-			}
-			$nchi = preg_match_all('/\n1 CHIL @(' . WT_REGEX_XREF . ')@/', $gedrec, $match);
-			if (preg_match('/\n1 NCHI (\d+)/', $gedrec, $match)) {
-				$nchi = max($nchi, $match[1]);
-			}
-			Database::prepare(
-				"INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil) VALUES (?, ?, ?, ?, ?, ?)"
-			)->execute(array(
-				$xref, $tree_id, $husb, $wife, $gedrec, $nchi,
-			));
-			// Update the cross-reference/index tables.
-			self::updatePlaces($xref, $tree_id, $gedrec);
-			self::updateDates($xref, $tree_id, $gedrec);
-			self::updateLinks($xref, $tree_id, $gedrec);
-			break;
-		case 'SOUR':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+				if (preg_match('/\n1 HUSB @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
+					$husb = $match[1];
+				} else {
+					$husb = '';
+				}
+				if (preg_match('/\n1 WIFE @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
+					$wife = $match[1];
+				} else {
+					$wife = '';
+				}
+				$nchi = preg_match_all('/\n1 CHIL @(' . WT_REGEX_XREF . ')@/', $gedrec, $match);
+				if (preg_match('/\n1 NCHI (\d+)/', $gedrec, $match)) {
+					$nchi = max($nchi, $match[1]);
+				}
+				Database::prepare(
+					"INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil) VALUES (?, ?, ?, ?, ?, ?)"
+				)->execute(array(
+					$xref, $tree_id, $husb, $wife, $gedrec, $nchi,
+				));
+				// Update the cross-reference/index tables.
+				self::updatePlaces($xref, $tree_id, $gedrec);
+				self::updateDates($xref, $tree_id, $gedrec);
+				self::updateLinks($xref, $tree_id, $gedrec);
+				break;
+			case 'SOUR':
+				// Convert inline media into media objects
+				$gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			$record = new Source($xref, $gedrec, null, $tree);
-			if (preg_match('/\n1 TITL (.+)/', $gedrec, $match)) {
-				$name = $match[1];
-			} elseif (preg_match('/\n1 ABBR (.+)/', $gedrec, $match)) {
-				$name = $match[1];
-			} else {
-				$name = $xref;
-			}
-			Database::prepare(
-				"INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom) VALUES (?, ?, LEFT(?, 255), ?)"
-			)->execute(array(
-				$xref, $tree_id, $name, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'REPO':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+				$record = new Source($xref, $gedrec, null, $tree);
+				if (preg_match('/\n1 TITL (.+)/', $gedrec, $match)) {
+					$name = $match[1];
+				} elseif (preg_match('/\n1 ABBR (.+)/', $gedrec, $match)) {
+					$name = $match[1];
+				} else {
+					$name = $xref;
+				}
+				Database::prepare(
+					"INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom) VALUES (?, ?, LEFT(?, 255), ?)"
+				)->execute(array(
+					$xref, $tree_id, $name, $gedrec,
+				));
+				// Update the cross-reference/index tables.
+				self::updateLinks($xref, $tree_id, $gedrec);
+				self::updateNames($xref, $tree_id, $record);
+				break;
+			case 'REPO':
+				// Convert inline media into media objects
+				$gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			$record = new Repository($xref, $gedrec, null, $tree);
-			Database::prepare(
-				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'REPO', ?)"
-			)->execute(array(
-				$xref, $tree_id, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'NOTE':
-			$record = new Note($xref, $gedrec, null, $tree);
-			Database::prepare(
-				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'NOTE', ?)"
-			)->execute(array(
-				$xref, $tree_id, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'OBJE':
-			$record = new Media($xref, $gedrec, null, $tree);
-			Database::prepare(
-				"INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom) VALUES (?, LEFT(?, 6), LEFT(?, 60), LEFT(?, 255), left(?, 512), ?, ?)"
-			)->execute(array(
-				$xref, $record->extension(), $record->getMediaType(), $record->getTitle(), $record->getFilename(), $tree_id, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		default: // HEAD, TRLR, SUBM, SUBN, and custom record types.
-			// Force HEAD records to have a creation date.
-			if ($type === 'HEAD' && strpos($gedrec, "\n1 DATE ") === false) {
-				$gedrec .= "\n1 DATE " . date('j M Y');
-			}
-			Database::prepare(
-				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, LEFT(?, 15), ?)"
-			)->execute(array($xref, $tree_id, $type, $gedrec));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			break;
+				$record = new Repository($xref, $gedrec, null, $tree);
+				Database::prepare(
+					"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'REPO', ?)"
+				)->execute(array(
+					$xref, $tree_id, $gedrec,
+				));
+				// Update the cross-reference/index tables.
+				self::updateLinks($xref, $tree_id, $gedrec);
+				self::updateNames($xref, $tree_id, $record);
+				break;
+			case 'NOTE':
+				$record = new Note($xref, $gedrec, null, $tree);
+				Database::prepare(
+					"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'NOTE', ?)"
+				)->execute(array(
+					$xref, $tree_id, $gedrec,
+				));
+				// Update the cross-reference/index tables.
+				self::updateLinks($xref, $tree_id, $gedrec);
+				self::updateNames($xref, $tree_id, $record);
+				break;
+			case 'OBJE':
+				$record = new Media($xref, $gedrec, null, $tree);
+				Database::prepare(
+					"INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom) VALUES (?, LEFT(?, 6), LEFT(?, 60), LEFT(?, 255), left(?, 512), ?, ?)"
+				)->execute(array(
+					$xref, $record->extension(), $record->getMediaType(), $record->getTitle(), $record->getFilename(), $tree_id, $gedrec,
+				));
+				// Update the cross-reference/index tables.
+				self::updateLinks($xref, $tree_id, $gedrec);
+				self::updateNames($xref, $tree_id, $record);
+				break;
+			default: // HEAD, TRLR, SUBM, SUBN, and custom record types.
+				// Force HEAD records to have a creation date.
+				if ($type === 'HEAD' && strpos($gedrec, "\n1 DATE ") === false) {
+					$gedrec .= "\n1 DATE " . date('j M Y');
+				}
+				Database::prepare(
+					"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, LEFT(?, 15), ?)"
+				)->execute(array($xref, $tree_id, $type, $gedrec));
+				// Update the cross-reference/index tables.
+				self::updateLinks($xref, $tree_id, $gedrec);
+				break;
 		}
 	}
 
@@ -1130,21 +1130,21 @@ 
 		Database::prepare("DELETE FROM `##link` WHERE l_from=? AND l_file=?")->execute(array($gid, $ged_id));
 
 		switch ($type) {
-		case 'INDI':
-			Database::prepare("DELETE FROM `##individuals` WHERE i_id=? AND i_file=?")->execute(array($gid, $ged_id));
-			break;
-		case 'FAM':
-			Database::prepare("DELETE FROM `##families` WHERE f_id=? AND f_file=?")->execute(array($gid, $ged_id));
-			break;
-		case 'SOUR':
-			Database::prepare("DELETE FROM `##sources` WHERE s_id=? AND s_file=?")->execute(array($gid, $ged_id));
-			break;
-		case 'OBJE':
-			Database::prepare("DELETE FROM `##media` WHERE m_id=? AND m_file=?")->execute(array($gid, $ged_id));
-			break;
-		default:
-			Database::prepare("DELETE FROM `##other` WHERE o_id=? AND o_file=?")->execute(array($gid, $ged_id));
-			break;
+			case 'INDI':
+				Database::prepare("DELETE FROM `##individuals` WHERE i_id=? AND i_file=?")->execute(array($gid, $ged_id));
+				break;
+			case 'FAM':
+				Database::prepare("DELETE FROM `##families` WHERE f_id=? AND f_file=?")->execute(array($gid, $ged_id));
+				break;
+			case 'SOUR':
+				Database::prepare("DELETE FROM `##sources` WHERE s_id=? AND s_file=?")->execute(array($gid, $ged_id));
+				break;
+			case 'OBJE':
+				Database::prepare("DELETE FROM `##media` WHERE m_id=? AND m_file=?")->execute(array($gid, $ged_id));
+				break;
+			default:
+				Database::prepare("DELETE FROM `##other` WHERE o_id=? AND o_file=?")->execute(array($gid, $ged_id));
+				break;
 		}
 
 		if (!$delete) {

app/Functions/FunctionsEdit.php

Switch Indentation +291 added lines, -291 removed lines

@@ -559,19 +559,19 @@ 
 		} else {
 			// Not all facts have help text.
 			switch ($fact) {
-			case 'NAME':
-				if ($upperlevel !== 'REPO' && $upperlevel !== 'UNKNOWN') {
+				case 'NAME':
+					if ($upperlevel !== 'REPO' && $upperlevel !== 'UNKNOWN') {
+						echo FunctionsPrint::helpLink($fact);
+					}
+					break;
+				case 'DATE':
+				case 'PLAC':
+				case 'RESN':
+				case 'ROMN':
+				case 'SURN':
+				case '_HEB':
 					echo FunctionsPrint::helpLink($fact);
-				}
-				break;
-			case 'DATE':
-			case 'PLAC':
-			case 'RESN':
-			case 'ROMN':
-			case 'SURN':
-			case '_HEB':
-				echo FunctionsPrint::helpLink($fact);
-				break;
+					break;
 			}
 		}
 		// tag level
@@ -716,51 +716,51 @@ 
 
 				// Extra markup for specific fact types
 				switch ($fact) {
-				case 'ALIA':
-				case 'ASSO':
-				case '_ASSO':
-					echo ' data-autocomplete-type="ASSO" data-autocomplete-extra="input.DATE"';
-					break;
-				case 'DATE':
-					echo ' onblur="valid_date(this);" onmouseout="valid_date(this);"';
-					break;
-				case 'GIVN':
-					echo ' autofocus data-autocomplete-type="GIVN"';
-					break;
-				case 'LATI':
-					echo ' onblur="valid_lati_long(this, \'N\', \'S\');" onmouseout="valid_lati_long(this, \'N\', \'S\');"';
-					break;
-				case 'LONG':
-					echo ' onblur="valid_lati_long(this, \'E\', \'W\');" onmouseout="valid_lati_long(this, \'E\', \'W\');"';
-					break;
-				case 'NOTE':
-					// Shared notes. Inline notes are handled elsewhere.
-					echo ' data-autocomplete-type="NOTE"';
-					break;
-				case 'OBJE':
-					echo ' data-autocomplete-type="OBJE"';
-					break;
-				case 'PAGE':
-					echo ' data-autocomplete-type="PAGE" data-autocomplete-extra="#' . $source_element_id . '"';
-					break;
-				case 'PLAC':
-					echo ' data-autocomplete-type="PLAC"';
-					break;
-				case 'REPO':
-					echo ' data-autocomplete-type="REPO"';
-					break;
-				case 'SOUR':
-					$source_element_id = $element_id;
-					echo ' data-autocomplete-type="SOUR"';
-					break;
-				case 'SURN':
-				case '_MARNM_SURN':
-					echo ' data-autocomplete-type="SURN"';
-					break;
-				case 'TIME':
-					echo ' pattern="([0-1][0-9]|2[0-3]):[0-5][0-9](:[0-5][0-9])?" dir="ltr" placeholder="' . /* I18N: Examples of valid time formats (hours:minutes:seconds) */
-						I18N::translate('hh:mm or hh:mm:ss') . '"';
-					break;
+					case 'ALIA':
+					case 'ASSO':
+					case '_ASSO':
+						echo ' data-autocomplete-type="ASSO" data-autocomplete-extra="input.DATE"';
+						break;
+					case 'DATE':
+						echo ' onblur="valid_date(this);" onmouseout="valid_date(this);"';
+						break;
+					case 'GIVN':
+						echo ' autofocus data-autocomplete-type="GIVN"';
+						break;
+					case 'LATI':
+						echo ' onblur="valid_lati_long(this, \'N\', \'S\');" onmouseout="valid_lati_long(this, \'N\', \'S\');"';
+						break;
+					case 'LONG':
+						echo ' onblur="valid_lati_long(this, \'E\', \'W\');" onmouseout="valid_lati_long(this, \'E\', \'W\');"';
+						break;
+					case 'NOTE':
+						// Shared notes. Inline notes are handled elsewhere.
+						echo ' data-autocomplete-type="NOTE"';
+						break;
+					case 'OBJE':
+						echo ' data-autocomplete-type="OBJE"';
+						break;
+					case 'PAGE':
+						echo ' data-autocomplete-type="PAGE" data-autocomplete-extra="#' . $source_element_id . '"';
+						break;
+					case 'PLAC':
+						echo ' data-autocomplete-type="PLAC"';
+						break;
+					case 'REPO':
+						echo ' data-autocomplete-type="REPO"';
+						break;
+					case 'SOUR':
+						$source_element_id = $element_id;
+						echo ' data-autocomplete-type="SOUR"';
+						break;
+					case 'SURN':
+					case '_MARNM_SURN':
+						echo ' data-autocomplete-type="SURN"';
+						break;
+					case 'TIME':
+						echo ' pattern="([0-1][0-9]|2[0-3]):[0-5][0-9](:[0-5][0-9])?" dir="ltr" placeholder="' . /* I18N: Examples of valid time formats (hours:minutes:seconds) */
+							I18N::translate('hh:mm or hh:mm:ss') . '"';
+						break;
 				}
 				echo '>';
 			}
@@ -810,41 +810,41 @@ 
 
 		// popup links
 		switch ($fact) {
-		case 'DATE':
-			echo self::printCalendarPopup($element_id);
-			break;
-		case 'FAMC':
-		case 'FAMS':
-			echo FunctionsPrint::printFindFamilyLink($element_id);
-			break;
-		case 'ALIA':
-		case 'ASSO':
-		case '_ASSO':
-			echo FunctionsPrint::printFindIndividualLink($element_id, $element_id . '_description');
-			break;
-		case 'FILE':
-			FunctionsPrint::printFindMediaLink($element_id, '0file');
-			break;
-		case 'SOUR':
-			echo FunctionsPrint::printFindSourceLink($element_id, $element_id . '_description'), ' ', self::printAddNewSourceLink($element_id);
-			//-- checkboxes to apply '1 SOUR' to BIRT/MARR/DEAT as '2 SOUR'
-			if ($level === 1) {
-				echo '<br>';
-				switch ($WT_TREE->getPreference('PREFER_LEVEL2_SOURCES')) {
-				case '2': // records
-				$level1_checked = 'checked';
-				$level2_checked = '';
+			case 'DATE':
+				echo self::printCalendarPopup($element_id);
+				break;
+			case 'FAMC':
+			case 'FAMS':
+				echo FunctionsPrint::printFindFamilyLink($element_id);
 				break;
-				case '1': // facts
-				$level1_checked = '';
-				$level2_checked = 'checked';
+			case 'ALIA':
+			case 'ASSO':
+			case '_ASSO':
+				echo FunctionsPrint::printFindIndividualLink($element_id, $element_id . '_description');
 				break;
-				case '0': // none
-				default:
-				$level1_checked = '';
-				$level2_checked = '';
+			case 'FILE':
+				FunctionsPrint::printFindMediaLink($element_id, '0file');
 				break;
-				}
+			case 'SOUR':
+				echo FunctionsPrint::printFindSourceLink($element_id, $element_id . '_description'), ' ', self::printAddNewSourceLink($element_id);
+				//-- checkboxes to apply '1 SOUR' to BIRT/MARR/DEAT as '2 SOUR'
+				if ($level === 1) {
+					echo '<br>';
+					switch ($WT_TREE->getPreference('PREFER_LEVEL2_SOURCES')) {
+						case '2': // records
+						$level1_checked = 'checked';
+						$level2_checked = '';
+						break;
+						case '1': // facts
+						$level1_checked = '';
+						$level2_checked = 'checked';
+						break;
+						case '0': // none
+						default:
+						$level1_checked = '';
+						$level2_checked = '';
+						break;
+					}
 					if (strpos($bdm, 'B') !== false) {
 						echo ' <label><input type="checkbox" name="SOUR_INDI" ', $level1_checked, ' value="1">', I18N::translate('Individual'), '</label>';
 						if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
@@ -874,26 +874,26 @@ 
 					}
 				}
 				break;
-		case 'REPO':
-			echo FunctionsPrint::printFindRepositoryLink($element_id), ' ', self::printAddNewRepositoryLink($element_id);
-			break;
-		case 'NOTE':
-			// Shared Notes Icons ========================================
-			if ($islink) {
-				// Print regular Shared Note icons ---------------------------
-				echo ' ', FunctionsPrint::printFindNoteLink($element_id, $element_id . '_description'), ' ', self::printAddNewNoteLink($element_id);
-				if ($value) {
-					echo ' ', self::printEditNoteLink($value);
+			case 'REPO':
+				echo FunctionsPrint::printFindRepositoryLink($element_id), ' ', self::printAddNewRepositoryLink($element_id);
+				break;
+			case 'NOTE':
+				// Shared Notes Icons ========================================
+				if ($islink) {
+					// Print regular Shared Note icons ---------------------------
+					echo ' ', FunctionsPrint::printFindNoteLink($element_id, $element_id . '_description'), ' ', self::printAddNewNoteLink($element_id);
+					if ($value) {
+						echo ' ', self::printEditNoteLink($value);
+					}
 				}
-			}
-			break;
-		case 'OBJE':
-			echo FunctionsPrint::printFindMediaLink($element_id, '1media');
-			if (!$value) {
-				echo ' ', self::printAddNewMediaLink($element_id);
-				$value = 'new';
-			}
-			break;
+				break;
+			case 'OBJE':
+				echo FunctionsPrint::printFindMediaLink($element_id, '1media');
+				if (!$value) {
+					echo ' ', self::printAddNewMediaLink($element_id);
+					$value = 'new';
+				}
+				break;
 		}
 
 		echo '<div id="' . $element_id . '_description">';
@@ -913,38 +913,38 @@ 
 
 		if ($value && $value !== 'new' && $islink) {
 			switch ($fact) {
-			case 'ALIA':
-			case 'ASSO':
-			case '_ASSO':
-				$tmp = Individual::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'SOUR':
-				$tmp = Source::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'NOTE':
-				$tmp = Note::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'OBJE':
-				$tmp = Media::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'REPO':
-				$tmp = Repository::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
+				case 'ALIA':
+				case 'ASSO':
+				case '_ASSO':
+					$tmp = Individual::getInstance($value, $WT_TREE);
+					if ($tmp) {
+						echo ' ', $tmp->getFullName();
+					}
+					break;
+				case 'SOUR':
+					$tmp = Source::getInstance($value, $WT_TREE);
+					if ($tmp) {
+						echo ' ', $tmp->getFullName();
+					}
+					break;
+				case 'NOTE':
+					$tmp = Note::getInstance($value, $WT_TREE);
+					if ($tmp) {
+						echo ' ', $tmp->getFullName();
+					}
+					break;
+				case 'OBJE':
+					$tmp = Media::getInstance($value, $WT_TREE);
+					if ($tmp) {
+						echo ' ', $tmp->getFullName();
+					}
+					break;
+				case 'REPO':
+					$tmp = Repository::getInstance($value, $WT_TREE);
+					if ($tmp) {
+						echo ' ', $tmp->getFullName();
+					}
+					break;
 			}
 		}
 
@@ -969,29 +969,29 @@ 
 
 		// Show more likely census details at the top of the list.
 		switch (WT_LOCALE) {
-		case 'cs':
-			$census_places = array(new CensusOfCzechRepublic);
-			break;
-		case 'en-AU':
-		case 'en-GB':
-			$census_places = array(new CensusOfEngland, new CensusOfWales, new CensusOfScotland);
-			break;
-		case 'en-US':
-			$census_places = array(new CensusOfUnitedStates);
-			break;
-		case 'fr':
-		case 'fr-CA':
-			$census_places = array(new CensusOfFrance);
-			break;
-		case 'da':
-			$census_places = array(new CensusOfDenmark);
-			break;
-		case 'de':
-			$census_places = array(new CensusOfDeutschland);
-			break;
-		default:
-			$census_places = array();
-			break;
+			case 'cs':
+				$census_places = array(new CensusOfCzechRepublic);
+				break;
+			case 'en-AU':
+			case 'en-GB':
+				$census_places = array(new CensusOfEngland, new CensusOfWales, new CensusOfScotland);
+				break;
+			case 'en-US':
+				$census_places = array(new CensusOfUnitedStates);
+				break;
+			case 'fr':
+			case 'fr-CA':
+				$census_places = array(new CensusOfFrance);
+				break;
+			case 'da':
+				$census_places = array(new CensusOfDenmark);
+				break;
+			case 'de':
+				$census_places = array(new CensusOfDeutschland);
+				break;
+			default:
+				$census_places = array();
+				break;
 		}
 		foreach (Census::allCensusPlaces() as $census_place) {
 			if (!in_array($census_place, $census_places)) {
@@ -1053,97 +1053,97 @@ 
 		global $WT_TREE;
 
 		switch ($tag) {
-		case 'SOUR':
-			echo '<a href="#" onclick="return expand_layer(\'newsource\');"><i id="newsource_img" class="icon-plus"></i> ', I18N::translate('Add a source citation'), '</a>';
-			echo '<br>';
-			echo '<div id="newsource" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 SOUR
-			self::addSimpleTag($level . ' SOUR @');
-			// 3 PAGE
-			self::addSimpleTag(($level + 1) . ' PAGE');
-			// 3 DATA
-			self::addSimpleTag(($level + 1) . ' DATA');
-			// 4 TEXT
-			self::addSimpleTag(($level + 2) . ' TEXT');
-			if ($WT_TREE->getPreference('FULL_SOURCES')) {
-				// 4 DATE
-				self::addSimpleTag(($level + 2) . ' DATE', '', GedcomTag::getLabel('DATA:DATE'));
-				// 3 QUAY
-				self::addSimpleTag(($level + 1) . ' QUAY');
-			}
-			// 3 OBJE
-			self::addSimpleTag(($level + 1) . ' OBJE');
-			// 3 SHARED_NOTE
-			self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
-			echo '</table></div>';
-			break;
-
-		case 'ASSO':
-		case 'ASSO2':
-			//-- Add a new ASSOciate
-			if ($tag === 'ASSO') {
-				echo "<a href=\"#\" onclick=\"return expand_layer('newasso');\"><i id=\"newasso_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
+			case 'SOUR':
+				echo '<a href="#" onclick="return expand_layer(\'newsource\');"><i id="newsource_img" class="icon-plus"></i> ', I18N::translate('Add a source citation'), '</a>';
 				echo '<br>';
-				echo '<div id="newasso" style="display: none;">';
-			} else {
-				echo "<a href=\"#\" onclick=\"return expand_layer('newasso2');\"><i id=\"newasso2_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
+				echo '<div id="newsource" style="display: none;">';
+				echo '<table class="facts_table">';
+				// 2 SOUR
+				self::addSimpleTag($level . ' SOUR @');
+				// 3 PAGE
+				self::addSimpleTag(($level + 1) . ' PAGE');
+				// 3 DATA
+				self::addSimpleTag(($level + 1) . ' DATA');
+				// 4 TEXT
+				self::addSimpleTag(($level + 2) . ' TEXT');
+				if ($WT_TREE->getPreference('FULL_SOURCES')) {
+					// 4 DATE
+					self::addSimpleTag(($level + 2) . ' DATE', '', GedcomTag::getLabel('DATA:DATE'));
+					// 3 QUAY
+					self::addSimpleTag(($level + 1) . ' QUAY');
+				}
+				// 3 OBJE
+				self::addSimpleTag(($level + 1) . ' OBJE');
+				// 3 SHARED_NOTE
+				self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
+				echo '</table></div>';
+				break;
+
+			case 'ASSO':
+			case 'ASSO2':
+				//-- Add a new ASSOciate
+				if ($tag === 'ASSO') {
+					echo "<a href=\"#\" onclick=\"return expand_layer('newasso');\"><i id=\"newasso_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
+					echo '<br>';
+					echo '<div id="newasso" style="display: none;">';
+				} else {
+					echo "<a href=\"#\" onclick=\"return expand_layer('newasso2');\"><i id=\"newasso2_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
+					echo '<br>';
+					echo '<div id="newasso2" style="display: none;">';
+				}
+				echo '<table class="facts_table">';
+				// 2 ASSO
+				self::addSimpleTag($level . ' _ASSO @');
+				// 3 RELA
+				self::addSimpleTag(($level + 1) . ' RELA');
+				// 3 NOTE
+				self::addSimpleTag(($level + 1) . ' NOTE');
+				// 3 SHARED_NOTE
+				self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
+				echo '</table></div>';
+				break;
+
+			case 'NOTE':
+				//-- Retrieve existing note or add new note to fact
+				echo "<a href=\"#\" onclick=\"return expand_layer('newnote');\"><i id=\"newnote_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a note'), '</a>';
 				echo '<br>';
-				echo '<div id="newasso2" style="display: none;">';
-			}
-			echo '<table class="facts_table">';
-			// 2 ASSO
-			self::addSimpleTag($level . ' _ASSO @');
-			// 3 RELA
-			self::addSimpleTag(($level + 1) . ' RELA');
-			// 3 NOTE
-			self::addSimpleTag(($level + 1) . ' NOTE');
-			// 3 SHARED_NOTE
-			self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
-			echo '</table></div>';
-			break;
-
-		case 'NOTE':
-			//-- Retrieve existing note or add new note to fact
-			echo "<a href=\"#\" onclick=\"return expand_layer('newnote');\"><i id=\"newnote_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a note'), '</a>';
-			echo '<br>';
-			echo '<div id="newnote" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 NOTE
-			self::addSimpleTag($level . ' NOTE');
-			echo '</table></div>';
-			break;
-
-		case 'SHARED_NOTE':
-			echo "<a href=\"#\" onclick=\"return expand_layer('newshared_note');\"><i id=\"newshared_note_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a shared note'), '</a>';
-			echo '<br>';
-			echo '<div id="newshared_note" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 SHARED NOTE
-			self::addSimpleTag($level . ' SHARED_NOTE', $parent_tag);
-			echo '</table></div>';
-			break;
-
-		case 'OBJE':
-			if ($WT_TREE->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($WT_TREE)) {
-				echo "<a href=\"#\" onclick=\"return expand_layer('newobje');\"><i id=\"newobje_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a media object'), '</a>';
+				echo '<div id="newnote" style="display: none;">';
+				echo '<table class="facts_table">';
+				// 2 NOTE
+				self::addSimpleTag($level . ' NOTE');
+				echo '</table></div>';
+				break;
+
+			case 'SHARED_NOTE':
+				echo "<a href=\"#\" onclick=\"return expand_layer('newshared_note');\"><i id=\"newshared_note_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a shared note'), '</a>';
 				echo '<br>';
-				echo '<div id="newobje" style="display: none;">';
+				echo '<div id="newshared_note" style="display: none;">';
 				echo '<table class="facts_table">';
-				self::addSimpleTag($level . ' OBJE');
+				// 2 SHARED NOTE
+				self::addSimpleTag($level . ' SHARED_NOTE', $parent_tag);
 				echo '</table></div>';
-			}
-			break;
-
-		case 'RESN':
-			echo "<a href=\"#\" onclick=\"return expand_layer('newresn');\"><i id=\"newresn_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a restriction'), '</a>';
-			echo '<br>';
-			echo '<div id="newresn" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 RESN
-			self::addSimpleTag($level . ' RESN');
-			echo '</table></div>';
-			break;
+				break;
+
+			case 'OBJE':
+				if ($WT_TREE->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($WT_TREE)) {
+					echo "<a href=\"#\" onclick=\"return expand_layer('newobje');\"><i id=\"newobje_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a media object'), '</a>';
+					echo '<br>';
+					echo '<div id="newobje" style="display: none;">';
+					echo '<table class="facts_table">';
+					self::addSimpleTag($level . ' OBJE');
+					echo '</table></div>';
+				}
+				break;
+
+			case 'RESN':
+				echo "<a href=\"#\" onclick=\"return expand_layer('newresn');\"><i id=\"newresn_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a restriction'), '</a>';
+				echo '<br>';
+				echo '<div id="newresn" style="display: none;">';
+				echo '<table class="facts_table">';
+				// 2 RESN
+				self::addSimpleTag($level . ' RESN');
+				echo '</table></div>';
+				break;
 		}
 	}
 
@@ -1219,12 +1219,12 @@ 
 	 */
 	public static function addNewSex() {
 		switch (Filter::post('SEX', '[MF]', 'U')) {
-		case 'M':
-			return "\n1 SEX M";
-		case 'F':
-			return "\n1 SEX F";
-		default:
-			return "\n1 SEX U";
+			case 'M':
+				return "\n1 SEX M";
+			case 'F':
+				return "\n1 SEX F";
+			default:
+				return "\n1 SEX U";
 		}
 	}
 
@@ -1750,43 +1750,43 @@ 
 				}
 				// Add level 3/4 tags as appropriate
 				switch ($key) {
-				case 'PLAC':
-					if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
-						foreach ($match[1] as $tag) {
-							self::addSimpleTag('3 ' . $tag, '', GedcomTag::getLabel($level1tag . ':PLAC:' . $tag));
+					case 'PLAC':
+						if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
+							foreach ($match[1] as $tag) {
+								self::addSimpleTag('3 ' . $tag, '', GedcomTag::getLabel($level1tag . ':PLAC:' . $tag));
+							}
 						}
-					}
-					self::addSimpleTag('3 MAP');
-					self::addSimpleTag('4 LATI');
-					self::addSimpleTag('4 LONG');
-					break;
-				case 'FILE':
-					self::addSimpleTag('3 FORM');
-					break;
-				case 'EVEN':
-					self::addSimpleTag('3 DATE');
-					self::addSimpleTag('3 PLAC');
-					break;
-				case 'STAT':
-					if (GedcomCodeTemp::isTagLDS($level1tag)) {
-						self::addSimpleTag('3 DATE', '', GedcomTag::getLabel('STAT:DATE'));
-					}
-					break;
-				case 'DATE':
-					// TIME is NOT a valid 5.5.1 tag
-					if (in_array($level1tag, Config::dateAndTime())) {
-						self::addSimpleTag('3 TIME');
-					}
-					break;
-				case 'HUSB':
-				case 'WIFE':
-					self::addSimpleTag('3 AGE');
-					break;
-				case 'FAMC':
-					if ($level1tag === 'ADOP') {
-						self::addSimpleTag('3 ADOP BOTH');
-					}
-					break;
+						self::addSimpleTag('3 MAP');
+						self::addSimpleTag('4 LATI');
+						self::addSimpleTag('4 LONG');
+						break;
+					case 'FILE':
+						self::addSimpleTag('3 FORM');
+						break;
+					case 'EVEN':
+						self::addSimpleTag('3 DATE');
+						self::addSimpleTag('3 PLAC');
+						break;
+					case 'STAT':
+						if (GedcomCodeTemp::isTagLDS($level1tag)) {
+							self::addSimpleTag('3 DATE', '', GedcomTag::getLabel('STAT:DATE'));
+						}
+						break;
+					case 'DATE':
+						// TIME is NOT a valid 5.5.1 tag
+						if (in_array($level1tag, Config::dateAndTime())) {
+							self::addSimpleTag('3 TIME');
+						}
+						break;
+					case 'HUSB':
+					case 'WIFE':
+						self::addSimpleTag('3 AGE');
+						break;
+					case 'FAMC':
+						if ($level1tag === 'ADOP') {
+							self::addSimpleTag('3 ADOP BOTH');
+						}
+						break;
 				}
 			} elseif ($key === 'DATE' && $add_date) {
 				self::addSimpleTag('2 DATE', $level1tag, GedcomTag::getLabel($level1tag . ':DATE'));

app/Functions/FunctionsPrint.php

Switch Indentation +60 added lines, -60 removed lines

@@ -51,20 +51,20 @@ 
 	public static function printPedigreePerson(Individual $person = null, $show_full = 1) {
 
 		switch ($show_full) {
-		case 0:
-			if ($person) {
-				echo Theme::theme()->individualBoxSmall($person);
-			} else {
-				echo Theme::theme()->individualBoxSmallEmpty();
-			}
-			break;
-		case 1:
-			if ($person) {
-				echo Theme::theme()->individualBox($person);
-			} else {
-				echo Theme::theme()->individualBoxEmpty();
-			}
-			break;
+			case 0:
+				if ($person) {
+					echo Theme::theme()->individualBoxSmall($person);
+				} else {
+					echo Theme::theme()->individualBoxSmallEmpty();
+				}
+				break;
+			case 1:
+				if ($person) {
+					echo Theme::theme()->individualBox($person);
+				} else {
+					echo Theme::theme()->individualBoxEmpty();
+				}
+				break;
 		}
 	}
 
@@ -260,25 +260,25 @@ 
 					$age      = Date::getAge($parent->getBirthDate(), $birth_date, 2);
 					$deatdate = $parent->getDeathDate();
 					switch ($parent->getSex()) {
-					case 'F':
-						// Highlight mothers who die in childbirth or shortly afterwards
-						if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay() + 90) {
-							$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
-						} else {
-							$html .= ' <span title="' . I18N::translate('Mother’s age') . '">' . $sex . $age . '</span>';
-						}
-						break;
-					case 'M':
-						// Highlight fathers who die before the birth
-						if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay()) {
-							$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
-						} else {
-							$html .= ' <span title="' . I18N::translate('Father’s age') . '">' . $sex . $age . '</span>';
-						}
-						break;
-					default:
-						$html .= ' <span title="' . I18N::translate('Parent’s age') . '">' . $sex . $age . '</span>';
-						break;
+						case 'F':
+							// Highlight mothers who die in childbirth or shortly afterwards
+							if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay() + 90) {
+								$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
+							} else {
+								$html .= ' <span title="' . I18N::translate('Mother’s age') . '">' . $sex . $age . '</span>';
+							}
+							break;
+						case 'M':
+							// Highlight fathers who die before the birth
+							if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay()) {
+								$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
+							} else {
+								$html .= ' <span title="' . I18N::translate('Father’s age') . '">' . $sex . $age . '</span>';
+							}
+							break;
+						default:
+							$html .= ' <span title="' . I18N::translate('Parent’s age') . '">' . $sex . $age . '</span>';
+							break;
 					}
 				}
 			}
@@ -573,33 +573,33 @@ 
 
 		// -- Add from pick list
 		switch ($type) {
-		case "INDI":
-			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-			break;
-		case "FAM":
-			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-			break;
-		case "SOUR":
-			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-			break;
-		case "NOTE":
-			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-			break;
-		case "REPO":
-			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-			break;
-		default:
-			return;
+			case "INDI":
+				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+				break;
+			case "FAM":
+				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+				break;
+			case "SOUR":
+				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+				break;
+			case "NOTE":
+				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+				break;
+			case "REPO":
+				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+				break;
+			default:
+				return;
 		}
 		$addfacts            = array_merge(self::checkFactUnique($uniquefacts, $usedfacts, $type), $addfacts);
 		$quickfacts          = array_intersect($quickfacts, $addfacts);

app/Functions/FunctionsDb.php

Switch Indentation +100 added lines, -100 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)";
+					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 <= 1 AND d_mon = 3";
+							$where .= " AND d_day = :day AND d_mon = 2";
+							$args['day'] = $anniv->d;
 						}
-					} 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)";
+						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 <= 1 AND d_mon = 4";
+							$where .= " AND d_day = :day AND d_mon = 3";
+							$args['day'] = $anniv->d;
 						}
-					} 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";
+						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 <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
+							$where .= " AND d_day = :day AND d_mon=4";
+							$args['day'] = $anniv->d;
 						}
-					} 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;
+						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)