Completed
Pull Request — master (#2508)
by
unknown
05:37
created
app/Statistics/Google/ChartMarriageAge.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -102,9 +102,9 @@
 block discarded – undo
102 102
             ->groupBy(['century', 'sex']);
103 103
 
104 104
         return $male->unionAll($female)
105
-           ->orderBy('century')
106
-           ->get()
107
-           ->all();
105
+            ->orderBy('century')
106
+            ->get()
107
+            ->all();
108 108
     }
109 109
 
110 110
     /**
Please login to merge, or discard this patch.
app/Functions/FunctionsPrint.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -322,10 +322,10 @@
 block discarded – undo
322 322
         }
323 323
         // print gedcom ages
324 324
         foreach ([
325
-                     I18N::translate('Age')     => $fact_age,
326
-                     I18N::translate('Husband') => $husb_age,
327
-                     I18N::translate('Wife')    => $wife_age,
328
-                 ] as $label => $age) {
325
+                        I18N::translate('Age')     => $fact_age,
326
+                        I18N::translate('Husband') => $husb_age,
327
+                        I18N::translate('Wife')    => $wife_age,
328
+                    ] as $label => $age) {
329 329
             if ($age !== '') {
330 330
                 $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
331 331
             }
Please login to merge, or discard this patch.
resources/lang/en-US/messages.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1 1
 <?php return array (
2
-  '%H:%i:%s' => '%g:%i:%s %a',
3
-  '%j %F %Y' => '%F %j, %Y',
2
+    '%H:%i:%s' => '%g:%i:%s %a',
3
+    '%j %F %Y' => '%F %j, %Y',
4 4
 );
5 5
\ No newline at end of file
Please login to merge, or discard this patch.
app/Functions/Functions.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1574,9 +1574,9 @@  discard block
 block discarded – undo
1574 1574
                                 return I18N::translate('great ×%s aunt', I18N::number($up - 2));
1575 1575
                             }
1576 1576
                             return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 2));
1577
-			case 'zh-Hans':
1578
-			case 'zh-Hant':
1579
-			    if ($sex2 === 'M') {
1577
+            case 'zh-Hans':
1578
+            case 'zh-Hant':
1579
+                if ($sex2 === 'M') {
1580 1580
                                 return I18N::translate('great ×%s uncle', I18N::number($up));
1581 1581
                             }
1582 1582
                             if ($sex2 === 'F') {
@@ -1740,8 +1740,8 @@  discard block
 block discarded – undo
1740 1740
                                 return I18N::translateContext('(a man’s) sister’s great ×(%s-1) grandchild', 'great ×%s nephew/niece', I18N::number($down - 3));
1741 1741
                             }
1742 1742
                             return I18N::translateContext('(a woman’s) great ×%s nephew/niece', 'great ×%s nephew/niece', I18N::number($down - 3));
1743
-			case 'zh-Hans':
1744
-			case 'zh-Hant':
1743
+            case 'zh-Hans':
1744
+            case 'zh-Hant':
1745 1745
                             if ($sex2 === 'M') {
1746 1746
                                 if ($first === 'bro' && $sex1 === 'M') {
1747 1747
                                     return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 1));
@@ -1858,8 +1858,8 @@  discard block
 block discarded – undo
1858 1858
                             }
1859 1859
                             return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
1860 1860
                         case 'it': // Source: Michele Locati
1861
-			case 'zh-Hans':
1862
-			case 'zh-Hant':
1861
+            case 'zh-Hans':
1862
+            case 'zh-Hant':
1863 1863
                         case 'es': // Source: Wes Groleau
1864 1864
                             if ($sex2 === 'M') {
1865 1865
                                 return I18N::translate('great ×%s grandfather', I18N::number($up));
@@ -1868,7 +1868,7 @@  discard block
 block discarded – undo
1868 1868
                                 return I18N::translate('great ×%s grandmother', I18N::number($up));
1869 1869
                             }
1870 1870
                             return I18N::translate('great ×%s grandparent', I18N::number($up));
1871
-						case 'fr': // Source: Jacqueline Tetreault
1871
+                        case 'fr': // Source: Jacqueline Tetreault
1872 1872
                         case 'fr_CA':
1873 1873
                             if ($sex2 === 'M') {
1874 1874
                                 return I18N::translate('great ×%s grandfather', I18N::number($up - 1));
@@ -1974,8 +1974,8 @@  discard block
 block discarded – undo
1974 1974
                                 return I18N::translate('great ×%s granddaughter', I18N::number($up - 3));
1975 1975
                             }
1976 1976
                             return I18N::translate('great ×%s grandchild', I18N::number($up - 3));
1977
-			case 'zh-Hans':
1978
-			case 'zh-Hant':
1977
+            case 'zh-Hans':
1978
+            case 'zh-Hant':
1979 1979
                             if ($sex2 === 'M') {
1980 1980
                                 return I18N::translate('great ×%s grandson', I18N::number($up));
1981 1981
                             }
@@ -1983,7 +1983,7 @@  discard block
 block discarded – undo
1983 1983
                                 return I18N::translate('great ×%s granddaughter', I18N::number($up));
1984 1984
                             }
1985 1985
                             return I18N::translate('great ×%s grandchild', I18N::number($up));
1986
-			case 'it':
1986
+            case 'it':
1987 1987
                             // Source: Michele Locati
1988 1988
                         case 'es':
1989 1989
                             // Source: Wes Groleau (adding doesn’t change behavior, but needs to be better researched)
Please login to merge, or discard this patch.