@@ -85,8 +85,7 @@ |
||
85 | 85 | // Create the underlying PDO object |
86 | 86 | self::$pdo = new PDO( |
87 | 87 | (substr($DBHOST, 0, 1) === '/' ? |
88 | - "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : |
|
89 | - "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
88 | + "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
90 | 89 | ), |
91 | 90 | $DBUSER, $DBPASS, |
92 | 91 | array( |
@@ -16,8 +16,8 @@ |
||
16 | 16 | namespace Fisharebest\Webtrees; |
17 | 17 | |
18 | 18 | use Exception; |
19 | -use Swift_Mailer; |
|
20 | 19 | use Swift_MailTransport; |
20 | +use Swift_Mailer; |
|
21 | 21 | use Swift_Message; |
22 | 22 | use Swift_NullTransport; |
23 | 23 | use Swift_SmtpTransport; |
@@ -1717,7 +1717,7 @@ |
||
1717 | 1717 | if ($endjd === $startjd) { |
1718 | 1718 | $html .= I18N::translate('No events exist for tomorrow.'); |
1719 | 1719 | } else { |
1720 | - $html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
1720 | + $html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
1721 | 1721 | } |
1722 | 1722 | } else { |
1723 | 1723 | if ($endjd === $startjd) { |
@@ -1490,7 +1490,7 @@ |
||
1490 | 1490 | '1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'), |
1491 | 1491 | ], $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX') |
1492 | 1492 | ), |
1493 | - Bootstrap4::select('SHOW_PEDIGREE_PLACES', FunctionsEdit::optionsIntegers(range(1,9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES')) |
|
1493 | + Bootstrap4::select('SHOW_PEDIGREE_PLACES', FunctionsEdit::optionsIntegers(range(1, 9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES')) |
|
1494 | 1494 | ); ?> |
1495 | 1495 | <p class="small text-muted"> |
1496 | 1496 | <?php echo /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.'); ?> |