Merge branch 'master' of https://github.com/ChurchCRM/CRM

locale/JSONKeys/de_DE.json

@@ -1187,6 +1187,7 @@
     "Church Zip": "PLZ der Gemeinde",
     "Church Phone": "Telefonnummer der Gemeinde",
     "Home area code of the church": "Ortsvorwahl der Gemeinde",
+    "Last Backup Timestamp": "Zeit des letzten Backups",
     "Enable Integrity Check": "Integritätsprüfung aktivieren",
     "Interval in Hours for Integrity Check": "Intervall für Integritätsprüfungen in Stunden",
     "Last Integrity Check Timestamp": "Letzte Integritätsprüfung",
@@ -1218,14 +1219,19 @@
     "Regular Attender": "Regelmäßiger Besucher",
     "Guest": "Gast",
     "Minimum Age": "Mindestalter",
+    "Maximum Age": "Maximales Alter",
     "Beginning Date": "Beginn",
+    "Ending Date": "Enddatum",
     "Search": "Suche",
     "Field": "Feld",
     "Registered students": "Registrierte Schüler",
     "Months": "Monate",
+    "First Fiscal Year": "Erstes Fiskaljahr",
+    "Second Fiscal Year": "Zweites Fiskaljahr",
     "Custom field": "Selbsterstelltes Feld",
     "Field value": "Feldwert",
     "Select the desired family role.": "Wählen Sie die gewünschte Familienrolle",
+    "but not this year": "aber nicht dieses Jahr",
     "Fiscal Year.": "Geschäftsjahr.",
     "Member, Regular Attender, etc.": "Mitglied, regelmäßiger Gast, etc.",
     "First volunteer opportunity choice": "Erste Freiwilligenarbeitwahl",
@@ -1269,6 +1275,7 @@
     "Percent": "Prozent",
     "Total": "Gesamt",
     "Pledge status": "Status der Zuwendung",
+    "Suggestion": "Vorschlag",
     "WhyNotInterested": "WehalbUninteressiert",
     "Comments": "Kommentare",
     "Weekly on": "Wöchentlich am",
@@ -1293,6 +1300,8 @@
     "Group Types": "Gruppenarten",
     "Group Types Editor": "Gruppenarten Editieren",
     "Security Group": "Sicherheitsgruppe",
+    "Security Groups": "Sicherheitsgruppen",
+    "Security Groups Editor": "Sicherheitsgruppen-Editor",
     "Custom List Option": "Option: \"Benutzerdefinierte Liste\"",
     "Custom List Options": "Optionen: \"Benutzerdefinierte Liste\"",
     "Custom List Options Editor": "Editor für benutzerdefinierte Listenoptionen",
@@ -1405,6 +1414,9 @@
     "Greenland (Kalaallit Nunaat)": "Grönland (Kalaallit Nunaat)",
     "Grenada": "Grenada",
     "Guadeloupe": "Guadeloupe",
+    "Iceland (Ísland)": "Island",
+    "India (भारत)": "Indien",
+    "Ireland": "Irland",
     "Isle of Man": "Isle of Man",
     "Israel (‫ישראל‬‎)": "Israel",
     "Italy (Italia)": "Italien",
@@ -1424,6 +1436,8 @@
     "Liberia": "Liberia",
     "Libya (‫ليبيا‬‎)": "Libyen",
     "Liechtenstein": "Liechtenstein",
+    "Luxembourg": "Luxemburg",
+    "Maldives": "Malediven",
     "Montenegro (Crna Gora)": "Montenegro",
     "Montserrat": "Montserrat",
     "Morocco (‫المغرب‬‎)": "Marokko",
@@ -2105,5 +2119,16 @@
     "Disallowed Passwords": "Unzulässige Kennwörter",
     "Enable 2FA": "2FA aktivieren",
     "Require 2FA": "Erfordert 2FA",
-    "2FA Application Name": "2FA Anwendungsname Name"
+    "2FA Application Name": "2FA Anwendungsname Name",
+    "Permissions": "Berechtigungen",
+    "Paid": "Bezahlt",
+    "Start Date": "Startdatum",
+    "End Date": "Enddatum",
+    "Pinned Calendars": "Angepinnte Kalender",
+    "Store these in a secure location": "An sicherem Ort speichern",
+    "Loading": "Lädt",
+    "Today's Birthdays": "Heutige Geburtstage",
+    "Verify": "Verifizieren",
+    "Blue": "Blau",
+    "Black": "Schwarz"
 }

locale/JSONKeys/es_ES.json

@@ -2363,10 +2363,13 @@
     "View Family Page": "Ver Página de Familia",
     "View Person Page": "Ver Página de Persona",
     "Verify": "Verificar",
+    "Family has no emails to use": "La familia no tiene emails para usar",
     "Blue": "Azul",
     "Black": "Negro",
     "Purple": "Púrpura",
     "Green": "Verde",
     "Red": "Rojo",
-    "Yellow": "Amarillo"
+    "Yellow": "Amarillo",
+    "Toggle Sidebar": "Cambiar barra lateral",
+    "Toggle the left sidebar's state (open or collapse)": "Cambiar el estado de la barra lateral izquierda (abrir o cerrar)"
 }

locale/JSONKeys/id_ID.json

@@ -2310,5 +2310,78 @@
     "Permissions": "Izin",
     "Manage Notes": "Kelola Catatan",
     "Skins": "Tampilan",
-    "Failed generate a new API Key": "Gagal membuat Kunci API baru"
+    "Failed generate a new API Key": "Gagal membuat Kunci API baru",
+    "Pledge Summary By Family": "Ringkasan Janji Iman per Keluarga",
+    "Pledge": "Janji Iman",
+    "Paid": "Terbayarkan",
+    "Owe": "Kekurangan",
+    "Start Date": "Tanggal Mulai",
+    "End Date": "Tanggal Selesai",
+    "Pinned Calendars": "Kalender Terpin",
+    "This field is required": "Bidang ini diperlukan",
+    "Text": "Teks",
+    "Event Description": "Deskripsi Acara",
+    "Enrolling your ChurchCRM user account in Two Factor Authention provides an additional layer of defense against bad actors trying to access your account.": "Mendaftarkan Autentikasi Dua Faktor pada akun ChurchCRM Anda akan menambah perlindungan dari pelaku kejahatan yang mencoba mengakses akun Anda",
+    "ChurchCRM Two factor supports any TOTP authenticator app, so you're free to choose between Microsoft Authenticator, Google Authenticator, Authy, LastPass, and others": "Autentikasi Dua Faktor ChurchCRM mendukung semua aplikasi autentikasi TOTP jadi Anda bebas memilih antara Microsoft Authenticator, Google Authenticator, Authy, LastPass atau lainnya",
+    "When you sign in to ChurchCRM, you'll still enter your username and password like normal": "Saat Anda masuk ke ChurchCRM, Anda akan tetap diminta memasukkan nama pengguna dan sandi seperti biasa",
+    "However, you'll also need to supply a one-time code from your authenticator device to complete your login": "Namun Anda juga akan diminta memasukkan kode sekali pakai dari perangkat autentikasi untuk bisa masuk",
+    "After successfully entering both your credentials, and the one-time code, you'll be logged in as normal": "Setelah berhasil memasukkan kredensial dan kode sekali pakai, Anda akan diizinkan masuk seperti biasa",
+    "To prevent being locked out of your ChurchCRM account, please ensure you're ready to complete two factor enrollment before clicking begin": "Untuk mencegah akun ChurchCRM Anda terkunci, mohon pastikan Anda siap menyelesaikan pendaftaran autentikasi dua faktor sebelum mengklik mulai",
+    "Beginning enrollment will invalidate any previously enrolled 2 factor devices and recovery codes.": "Memulai pendaftaran akan membatalkan perangkat autentikasi dua faktor yang sebelumnya didaftarkan dan kode pemulihan",
+    "When you click next, you'll be prompted to scan a QR code to enroll your authenticator app.": "Ketika mengklik berikutnya, Anda akan diminta untuk memindai kode QR untuk mendaftarkan aplikasi autentikator",
+    "To confirm enrollment, you'll need to enter the code generated by your authenticator app": "Untuk mengkonfirmasi pendaftaran, Anda akan diminta untuk memasukkan kode yang dihasilkan oleh aplikasi autentikator Anda",
+    "After confirming app enrollment, single-use recovery codes will be generated and displayed.": "Setelah mengkonfirmasi pendaftaran aplikasi, kode pemulihan sekali pakai akan dibuat dan ditampilkan",
+    "Recovery codes can be used instead of a code generated from your authenticator app.": "Kode pemulihan dapat menggantikan kode yang dihasilkan aplikasi autentikator",
+    "Store these in a secure location": "Simpan ini di lokasi yang aman",
+    "Begin Two Factor Authentication Enrollment": "Mulai Pendaftaran Autentikasi Dua Faktor",
+    "2 Factor Authentication Secret": "Kode Rahasia Autentikasi Dua Faktor",
+    "Regenerate 2 Factor Authentication Secret": "Buat Ulang Kode Rahasia Autentikasi Dua Faktor ",
+    "Remove 2 Factor Authentication Secret": "Hapus Kode Rahasia Autentikasi Dua Faktor",
+    "Enter TOTP code to confirm enrollment": "Masukkan kode TOTP untuk mengkonfirmasi pendaftaran",
+    "2 Factor Authentication Enrollment Success": "Pendaftaran Autentikasi Dua Faktor Berhasil",
+    "Please store these recovery codes in a safe location": "Mohon simpan kode pemulihan ini di tempat yang aman",
+    "If you ever lose access to your newly enrolled authenticator app, you'll need to use a recovery code to gain access to your account": "Jika Anda kehilangan akses ke aplikasi autentikator yang baru didaftarkan, Anda akan memerlukan kode pemulihan untuk mengakses akun Anda",
+    "Event Attendance": "Kehadiran Acara",
+    "Generate attendance -AND- non-attendance reports for events": "Buat laporan kehadiran DAN ketidakhadiran acara",
+    "of translation completed": "dari terjemahan terselesaikan",
+    "Help translate this project": "Bantu terjemahkan proyek ini",
+    "Credit Card People": "Pengguna Kartu Kredit",
+    "People who are configured to pay by credit card.": "Orang yang terkonfigurasi untuk membayar dengan kartu kredit",
+    "Afrikaans": "Afrika",
+    " has a type mismatch": "memiliki tipe yang tidak sesuai",
+    "Loading": "Memuat",
+    "Family Property Unassignment": "Pelepasan Properti Keluarga",
+    "Do you want to remove": "Apa Anda ingin menghapus",
+    "View Active People": "Lihat Orang Aktif",
+    "View Inactive People": "Lihat Orang Inaktif",
+    "Today's Birthdays": "Ulang Tahun Hari Ini",
+    "Today's Wedding Anniversaries": "Ulang Tahun Pernikahan Hari Ini",
+    "Api Key": "Api Key",
+    "Regen API Key": "Regen API Key",
+    "View Family Page": "Lihat Halaman Keluarga",
+    "View Person Page": "Lihat Halaman Individu",
+    "Verify": "Verifikasi",
+    "Family has no emails to use": "Keluarga tidak memiliki email",
+    "Blue": "Biru",
+    "Black": "Hitam",
+    "Purple": "Ungu",
+    "Green": "Hijau",
+    "Red": "Merah",
+    "Yellow": "Kuning",
+    "Blue Light": "Biru Terang",
+    "Black Light": "Hitam Terang",
+    "Purple Light": "Ungu Terang",
+    "Green Light": "Hijau Terang",
+    "Red Light": "Merah Terang",
+    "Yellow Light": "Kuning Terang",
+    "Boxed Layout": "Tampilan Kotak",
+    "Activate the boxed layout": "Aktifkan Tampilan Kotak",
+    "Toggle Sidebar": "Alihkan Sidebar",
+    "Toggle the left sidebar's state (open or collapse)": "Alihkan status sidebar kiri (terbuka atau tertutup)",
+    "Tables Settings": "Pengaturan Tabel",
+    "Page length": "Panjang halaman",
+    "Change the initial page length (number of rows per page)": "Ubah panjang halaman awal (jumlah baris per halaman)",
+    "User Interface": "Antarmuka Pengguna",
+    "Locale": "Locale",
+    "Override system locale": "Timpa locale sistem"
 }

package.json

@@ -60,7 +60,7 @@
         "font-awesome": "^4.7.0",
         "fullcalendar": "3.10.2",
         "i18n": "^0.13.2",
-        "i18next": "19.8.4",
+        "i18next": "19.8.7",
         "inputmask": "^5.0.5",
         "jquery": "^3.5.1",
         "jquery-photo-uploader": "^1.0.13",

src/CanvassEditor.php

@@ -193,7 +193,7 @@
 
 			<tr>
                 <td class="LabelColumn"><?= gettext('Date') ?>:</td>
-				<td class="TextColumn"><input type="text" name="Date" value="<?= $dDate ?>" maxlength="10" id="sel1" size="11"  class="form-control pull-right active date-picker" ?><font color="red"><?= $sDateError ?></font></td>
+				<td class="TextColumn"><input type="text" name="Date" value="<?= $dDate ?>" maxlength="10" id="sel1" size="11"  class="form-control pull-right active date-picker" ?><span style="color: red;"><?= $sDateError ?></span></td>
 			</tr>
 
 

src/CartToFamily.php

@@ -205,12 +205,12 @@
 
 	<tr>
 		<td class="LabelColumn"><?= gettext('Family Name') ?>:</td>
-		<td class="TextColumnWithBottomBorder"><input type="text" Name="FamilyName" value="<?= $sName ?>" maxlength="48"><font color="red"><?= $sNameError ?></font></td>
+		<td class="TextColumnWithBottomBorder"><input type="text" Name="FamilyName" value="<?= $sName ?>" maxlength="48"><span style="color: red;"><?= $sNameError ?></span></td>
 	</tr>
 
 	<tr>
         <td class="LabelColumn"><?= gettext('Wedding Date') ?>:</td>
-		<td class="TextColumnWithBottomBorder"><input type="text" Name="WeddingDate" value="<?= $dWeddingDate ?>" maxlength="10" id="sel1" size="15"  class="form-control pull-right active date-picker"><font color="red"><?php echo '<BR>'.$sWeddingDateError ?></font></td>
+		<td class="TextColumnWithBottomBorder"><input type="text" Name="WeddingDate" value="<?= $dWeddingDate ?>" maxlength="10" id="sel1" size="15"  class="form-control pull-right active date-picker"><span style="color: red;"><?php echo '<BR>'.$sWeddingDateError ?></span></td>
 	</tr>
 
 	<tr>

src/ChurchCRM/dto/SystemConfig.php

@@ -151,7 +151,7 @@ private static function buildConfigs()
         "sConfirmSigner" => new ConfigItem(1025, "sConfirmSigner", "text", "", gettext("Database information confirmation and correction report signer")),
         "sPledgeSummary1" => new ConfigItem(1026, "sPledgeSummary1", "text", "Summary of pledges and payments for the fiscal year", gettext("Verbage for the pledge summary report")),
         "sPledgeSummary2" => new ConfigItem(1027, "sPledgeSummary2", "text", " as of", gettext("Verbage for the pledge summary report")),
-        "sDirectoryDisclaimer1" => new ConfigItem(1028, "sDirectoryDisclaimer1", "text", "Every effort was made to insure the accuracy of this directory.  If there are any errors or omissions, please contact the church office.\n\nThis directory is for the use of the people of", gettext("Verbage for the directory report")),
+        "sDirectoryDisclaimer1" => new ConfigItem(1028, "sDirectoryDisclaimer1", "text", "Every effort was made to ensure the accuracy of this directory.  If there are any errors or omissions, please contact the church office.\n\nThis directory is for the use of the people of", gettext("Verbage for the directory report")),
         "sDirectoryDisclaimer2" => new ConfigItem(1029, "sDirectoryDisclaimer2", "text", ", and the information contained in it may not be used for business or commercial purposes.", gettext("Verbage for the directory report")),
         "bDirLetterHead" => new ConfigItem(1030, "bDirLetterHead", "text", "../Images/church_letterhead.jpg", gettext("Church Letterhead path and file")),
         "sZeroGivers" => new ConfigItem(1031, "sZeroGivers", "text", "This letter shows our record of your payments for", gettext("Verbage for top line of tax report. Dates will be appended to the end of this line.")),

src/ChurchCRM/model/ChurchCRM/User.php

@@ -310,8 +310,9 @@ public function getSetting($name) {
     }
 
     public function getStyle(){
+        $skin = is_null($this->getSetting(UserSetting::UI_STYLE)) ? "skin-red" : $this->getSetting(UserSetting::UI_STYLE);
         $cssClasses = [];
-        array_push($cssClasses, $this->getSetting(UserSetting::UI_STYLE));
+        array_push($cssClasses, $skin);
         array_push($cssClasses, $this->getSetting(UserSetting::UI_BOXED));
         array_push($cssClasses, $this->getSetting(UserSetting::UI_SIDEBAR));
         return implode(" ", $cssClasses);

src/FamilyEditor.php

@@ -653,7 +653,7 @@
 						<label><?= gettext('Family Name') ?>:</label>
 						<input type="text" Name="Name" id="FamilyName" value="<?= htmlentities(stripslashes($sName), ENT_NOQUOTES, 'UTF-8') ?>" maxlength="48"  class="form-control">
 						<?php if ($sNameError) {
-    ?><font color="red"><?= $sNameError ?></font><?php
+    ?><span style="color: red;"><?= $sNameError ?></span><?php
 } ?>
 					</div>
 				</div>
@@ -766,7 +766,7 @@
 						<div class="input-group-addon">
 							<i class="fa fa-envelope"></i>
 						</div>
-						<input type="text" Name="Email" class="form-control" value="<?= htmlentities(stripslashes($sEmail)) ?>" size="30" maxlength="100"><font color="red"><?php echo '<BR>'.$sEmailError ?></font>
+						<input type="text" Name="Email" class="form-control" value="<?= htmlentities(stripslashes($sEmail)) ?>" size="30" maxlength="100"><span style="color: red;"><?php echo '<BR>'.$sEmailError ?></span>
 					</div>
 				</div>
 				<?php if (!SystemConfig::getValue('bHideFamilyNewsletter')) { /* Newsletter can be hidden - General Settings */ ?>
@@ -960,9 +960,9 @@
 		<tr>
 			<td class="TextColumn">
 				<input name="FirstName<?= $iCount ?>" type="text" value="<?= $aFirstNames[$iCount] ?>" size="10">
-				<div><font color="red"><?php if (array_key_exists($iCount, $aFirstNameError)) {
+				<div><span style="color: red;"><?php if (array_key_exists($iCount, $aFirstNameError)) {
                 echo $aFirstNameError[$iCount];
-            } ?></font></div>
+            } ?></span></div>
 			</td>
 			<td class="TextColumn">
 				<input name="MiddleName<?= $iCount ?>" type="text" value="<?= $aMiddleNames[$iCount] ?>" size="10">
@@ -1066,9 +1066,9 @@
 			<?php	if (!array_key_exists($iCount, $aperFlags) || !$aperFlags[$iCount]) {
                     $UpdateBirthYear = 1; ?>
 				<input name="BirthYear<?= $iCount ?>" type="text" value="<?= $aBirthYears[$iCount] ?>" size="4" maxlength="4">
-				<div><font color="red"><?php if (array_key_exists($iCount, $aBirthDateError)) {
+				<div><span style="color: red;"><?php if (array_key_exists($iCount, $aBirthDateError)) {
                         echo $aBirthDateError[$iCount];
-                    } ?></font></div>
+                    } ?></span></div>
 			<?php
                 } else {
                     $UpdateBirthYear = 0;

src/FinancialReports.php

@@ -45,7 +45,7 @@
 
 // No Records Message if previous report returned no records.
 if (array_key_exists('ReturnMessage', $_GET) && $_GET['ReturnMessage'] == 'NoRows') {
-    echo '<h3><font color=red>'.gettext('No records were returned from the previous report.').'</font></h3>';
+    echo '<h3><span style="color: red;">'.gettext('No records were returned from the previous report.').'</span></h3>';
 }
 
 if ($sReportType == '') {

src/FundRaiserEditor.php

@@ -163,7 +163,7 @@
 		<table cellpadding="3">
 			<tr>
                 <td class="LabelColumn"><?= gettext('Date') ?>:</td>
-				<td class="TextColumn"><input type="text" name="Date" value="<?= $dDate ?>" maxlength="10" id="Date" size="11" class="date-picker"><font color="red"><?php echo $sDateError ?></font></td>
+				<td class="TextColumn"><input type="text" name="Date" value="<?= $dDate ?>" maxlength="10" id="Date" size="11" class="date-picker"><span style="color: red;"><?php echo $sDateError ?></span></td>
 			</tr>
 
 			<tr>

src/Include/ReportFunctions.php

@@ -8,9 +8,6 @@
   *
  ******************************************************************************/
 
-// Finds and loads the base JPGraph library and any components specified as arguments
-//
-
 // MakeSalutation: this utility is used to figure out how to address a family
 // for correspondence.
 function MakeSalutationUtility($famID)