Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes 1192 #1293

Merged
merged 5 commits into from
Nov 9, 2016
Merged

Fixes 1192 #1293

merged 5 commits into from
Nov 9, 2016

Conversation

bradgearon
Copy link

@bradgearon bradgearon commented Nov 7, 2016 •
edited by DawoudIO
Loading

closes #1192

@bradgearon
using momentjs for age calculation
67abdf7
@bradgearon
return date object in getBirthDate
ddc0bad 
added format age suffix for just the suffix
added show age for using momentjs to display age
affects ChurchCRM#1192
@bradgearon
changed data-birthdate to data-birth-date
0c218bb 
using momentjs to calc age on Sunday School pages
removed PrintAge
resolves ChurchCRM#1192
@DawoudIO DawoudIO added this to the 2.3.2 milestone Nov 9, 2016
DawoudIO
DawoudIO reviewed Nov 9, 2016
View reviewed changes
src/ChurchCRM/model/ChurchCRM/Person.php
}
return "";

return date_create();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why default to now?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm using the return value as a date and now is the default

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do you use now as default

src/FamilyView.php
@@ -312,7 +312,7 @@ class="fa fa-cart-plus"></i> <?= gettext("Add All Family Members to Cart") ?></a
<span class='label <?= $labelColor ?>'> <?= $famRole ?></span>
</td>
<td>
<?= $person->getBirthDate() ?>
<?= $person->getBirthDate()->format('Y-m-d') ?>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be using data-birth-date

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to ensure we don't display the year

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be birthday or age?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the date format is incorrect, I'll fix this

src/Include/Functions.php
@@ -858,6 +845,54 @@ function FormatAge($Month, $Day, $Year, $Flags)
return (gettext("Unknown"));
}

function BirthDate($year, $month, $day, $hideAge) {
if (!is_null($day) && $day != "" &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not used empty()

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just copy pasted from /ChurchCRM/CRM/tree/master/src/ChurchCRM/model/ChurchCRM/Person.php#L54

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah... We learn more about php everyday

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah... We learn more about php everyday

src/PersonView.php
@@ -406,7 +418,7 @@
<?= $familyMember->getFamilyRoleName() ?>
</td>
<td>
<?= $familyMember->getBirthDate() ?>
<?= FormatBirthDate($familyMember->getBirthYear(), $familyMember->getBirthMonth(), $familyMember->getBirthDay(), "-", $familyMember->getFlags()); ?>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be using data-birth-date but it is working

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, this one displays the birthdate instead of age

src/Include/Functions.php
//
function FormatAgeSuffix($birthDate, $Flags)
{
if (($Flags & 1)) //||!$_SESSION['bSeePrivacyData']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand the check...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

me either... I guess its a bitwise AND operation
from MSDN (C++) "The bitwise AND operator (&) compares each bit of the first operand to the corresponding bit of the second operand. If both bits are 1, the corresponding result bit is set to 1"
I guess its the same as checking if $Flags is set to 1 in this case... same as $Flags == 1
I'll fix this

src/Include/Functions.php
//
// Formats an age suffix: age in years, or in months if less than one year old
//
function FormatAgeSuffix($birthDate, $Flags)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where is this getting called, and why can't we use JS

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well for the age suffix (mo., yrs. old) the unit of time and word old has to be translated; I research CLDR.js and its pretty cool, but it does only yrs ago and mos ago. we could use that to get the unit of time, but it doesn't work for the word old - so we're relying on the php implemented translations for that

src/PersonView.php
<i class="fa-li fa fa-calendar"></i><?= gettext("Birthdate:") ?>
<span><?= $dBirthDate ?></span>
<?php if (!$person->hideAge()) { ?>
(<span data-birth-date="<?= $person->getBirthDate()->format("Y-m-d") ?>"></span> <?=FormatAgeSuffix($person->getBirthDate(), $per_Flags) ?>)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is where the momentjs can help also

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm using it there, that is what the data-birth-date attribute is set for

@DawoudIO DawoudIO merged commit efbac6a into ChurchCRM:master Nov 9, 2016
DawoudIO pushed a commit that referenced this pull request Nov 10, 2016
@crossan007 @DawoudIO
2.4.0 update from2.3.2 (#1308)
71cb4c9 
* prepare for 2.3.0 (#1271)

* reusing gettext family

* fix #1273 and upgrade to 2.3.1

* better code

* prep 2.3.1.

* fix #1276

* rev to 2.3.2 (#1278)

* fix 1285

* standardize on utf8mb4 (#1294)

* un-localize the conditional statement (#1296)

* added notes tab to person view (#1299)

resolves #1266

* Header HTML #1262 (#1288)

Header HTML #1262

* Adding Anniversaries to the Calendar (#1298)

* Add files via upload

Added Wedding dates to Calendar

* Add files via upload

Added helper functions to get the Wedding Day, Wedding Month, and ViewURI

* Add files via upload

Created functionality to show Wedding Dates (Anniversary) on the calendar

* added missing gettext for lables

* fixed wedding date comment

* add null check

* Will list people who are members or Regular Attender

* Fixes 1192 (#1293)

* using momentjs for age calculation

* return date object in getBirthDate
added format age suffix for just the suffix
added show age for using momentjs to display age
affects #1192

* changed data-birthdate to data-birth-date
using momentjs to calc age on Sunday School pages
removed PrintAge
resolves #1192

* resolving issues in code review

* update messages.po

* add French localization

* move to 2.3.3
DawoudIO pushed a commit that referenced this pull request Nov 12, 2016
@crossan007 @DawoudIO
2.3.3 import2.4.0 develop as 2.3.3 (#1330)
13193cb 
* Merge bug fixes from master to develop (#1247)

* Fix typo in header (#1152)

* Update Branching Strategy.

* fix 1180 (#1185)

* Update messages.po (POEditor.com)

* added docker size

* Added docker clone counter

* update badges

* Starting 2.4.0

* unignore everything  - just a placeholder.

* More two locations (#1267)

I find more two location and add gettext no it

* Colon clear #2 (#1250)

* Fix typo in header (#1152)

* Update Branching Strategy.

* fix 1180 (#1185)

* Update messages.po (POEditor.com)

* added docker size

* Added docker clone counter

* update badges

* Colon Clear #2

More some colons out of  gettext

* Update Dashboard.php

* Update SundaySchoolClassView.php

* Locations by saulo#4 (#1255)

* Fix SQL auto-install.  Cleanup Setup Page in case of absent signatures.json file

* remove dead comments

* Locantions by saulo #4

more two gettext added

* more one gettext

* Location and title separation

Location and title separation

* Update PersonEditor.php

* Update SystemService.php

* revert from develop

* Update from 2.3.1 master (#1279)

* prepare for 2.3.0 (#1271)

* reusing gettext family

* fix #1273 and upgrade to 2.3.1

* better code

* prep 2.3.1.

* fix #1276

* rev to 2.3.2 (#1278)

* 2.4.0 update from2.3.2 (#1308)

* prepare for 2.3.0 (#1271)

* reusing gettext family

* fix #1273 and upgrade to 2.3.1

* better code

* prep 2.3.1.

* fix #1276

* rev to 2.3.2 (#1278)

* fix 1285

* standardize on utf8mb4 (#1294)

* un-localize the conditional statement (#1296)

* added notes tab to person view (#1299)

resolves #1266

* Header HTML #1262 (#1288)

Header HTML #1262

* Adding Anniversaries to the Calendar (#1298)

* Add files via upload

Added Wedding dates to Calendar

* Add files via upload

Added helper functions to get the Wedding Day, Wedding Month, and ViewURI

* Add files via upload

Created functionality to show Wedding Dates (Anniversary) on the calendar

* added missing gettext for lables

* fixed wedding date comment

* add null check

* Will list people who are members or Regular Attender

* Fixes 1192 (#1293)

* using momentjs for age calculation

* return date object in getBirthDate
added format age suffix for just the suffix
added show age for using momentjs to display age
affects #1192

* changed data-birthdate to data-birth-date
using momentjs to calc age on Sunday School pages
removed PrintAge
resolves #1192

* resolving issues in code review

* update messages.po

* add French localization

* move to 2.3.3

* Localization cleanup for colon and case  (#1272)

* rebase on develop

* gettext Date: -> Date

* Family Name:

* address fields

* state

* Home Phone

* phones

* email

* more cleanup

* more clean up of get text

* more cleanup

* gender

* more cleanup

* fixed mailto:

* cleanup of gettext

* fixed mailto:

* gettext cleanup

* gettext cleanup

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Poeditor cleanup (#1317)

* not files that are in poeditor

* fixed spacing

* more colon stuff

* more locale cleanup

* more cleanup

* address cleanup

* merge 2.4.0 develop into 2.3.3 master AS 2.3.3 for release of new features
DawoudIO added a commit that referenced this pull request Nov 14, 2016
@DawoudIO
Pre 2.3.4 to develop (#1356)
c16547f 
* move logic for verifying version table schema onto the version ORM object (#1322)

* 2.3.3 import2.4.0 develop as 2.3.3 (#1330)

* Merge bug fixes from master to develop (#1247)

* Fix typo in header (#1152)

* Update Branching Strategy.

* fix 1180 (#1185)

* Update messages.po (POEditor.com)

* added docker size

* Added docker clone counter

* update badges

* Starting 2.4.0

* unignore everything  - just a placeholder.

* More two locations (#1267)

I find more two location and add gettext no it

* Colon clear #2 (#1250)

* Fix typo in header (#1152)

* Update Branching Strategy.

* fix 1180 (#1185)

* Update messages.po (POEditor.com)

* added docker size

* Added docker clone counter

* update badges

* Colon Clear #2

More some colons out of  gettext

* Update Dashboard.php

* Update SundaySchoolClassView.php

* Locations by saulo#4 (#1255)

* Fix SQL auto-install.  Cleanup Setup Page in case of absent signatures.json file

* remove dead comments

* Locantions by saulo #4

more two gettext added

* more one gettext

* Location and title separation

Location and title separation

* Update PersonEditor.php

* Update SystemService.php

* revert from develop

* Update from 2.3.1 master (#1279)

* prepare for 2.3.0 (#1271)

* reusing gettext family

* fix #1273 and upgrade to 2.3.1

* better code

* prep 2.3.1.

* fix #1276

* rev to 2.3.2 (#1278)

* 2.4.0 update from2.3.2 (#1308)

* prepare for 2.3.0 (#1271)

* reusing gettext family

* fix #1273 and upgrade to 2.3.1

* better code

* prep 2.3.1.

* fix #1276

* rev to 2.3.2 (#1278)

* fix 1285

* standardize on utf8mb4 (#1294)

* un-localize the conditional statement (#1296)

* added notes tab to person view (#1299)

resolves #1266

* Header HTML #1262 (#1288)

Header HTML #1262

* Adding Anniversaries to the Calendar (#1298)

* Add files via upload

Added Wedding dates to Calendar

* Add files via upload

Added helper functions to get the Wedding Day, Wedding Month, and ViewURI

* Add files via upload

Created functionality to show Wedding Dates (Anniversary) on the calendar

* added missing gettext for lables

* fixed wedding date comment

* add null check

* Will list people who are members or Regular Attender

* Fixes 1192 (#1293)

* using momentjs for age calculation

* return date object in getBirthDate
added format age suffix for just the suffix
added show age for using momentjs to display age
affects #1192

* changed data-birthdate to data-birth-date
using momentjs to calc age on Sunday School pages
removed PrintAge
resolves #1192

* resolving issues in code review

* update messages.po

* add French localization

* move to 2.3.3

* Localization cleanup for colon and case  (#1272)

* rebase on develop

* gettext Date: -> Date

* Family Name:

* address fields

* state

* Home Phone

* phones

* email

* more cleanup

* more clean up of get text

* more cleanup

* gender

* more cleanup

* fixed mailto:

* cleanup of gettext

* fixed mailto:

* gettext cleanup

* gettext cleanup

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Poeditor cleanup (#1317)

* not files that are in poeditor

* fixed spacing

* more colon stuff

* more locale cleanup

* more cleanup

* address cleanup

* merge 2.4.0 develop into 2.3.3 master AS 2.3.3 for release of new features

* 2.3.3-update-locale

* start 2.3.4

* #1332 fixed

* use the db table as the string source for messages.po (#1340)

* fixes #1286 #1342

* Grunt for All Skin & New Localization Files (#1335)

* now using grunt for build system

* using new generated locale files for full calendar

* grunt concat now part of the NPM install

* adding bootstrap-datepicker  to loacle files

* download datatables Internationalisation plug-in files

* Internationalisation plug-ins file downloads

* using correct life cycle for NPM

* fixed missing Footer.js

* re-name files to match locale

* added grunt-contrib-rename

* added locale for JS files

* added support for datatable lanagles

* moved all skin actions to Grunt

* adminlte-copy cleanup

excluded files during copy of adminlte that we build outside

* added package

* fix npm version && add demosite script

* move signature file creation to grunt

* typo!

* make JS and PHP treat forward slashes the same.  fix gruntfile

* updated changelog pre-2.3.4

* 2.3.4 fixes (#1337)

* underp class scope and connection references

* cleanup QA environment

* move prevsiousversion to vagrant-qa

* extract DB strings as part of NPM locale-update

* use the db table as the string source for messages.po

* move to static class for arrayutils

* remove header

* whitespace

* fix line endings

* gitignores

* fixes #1348 #1347 #1345 #1344 (#1350)
DawoudIO added a commit that referenced this pull request Nov 14, 2016
@DawoudIO
System Settings Counties (#1339)
6c674de 
* move logic for verifying version table schema onto the version ORM object (#1322)

* 2.3.3 import2.4.0 develop as 2.3.3 (#1330)

* Merge bug fixes from master to develop (#1247)

* Fix typo in header (#1152)

* Update Branching Strategy.

* fix 1180 (#1185)

* Update messages.po (POEditor.com)

* added docker size

* Added docker clone counter

* update badges

* Starting 2.4.0

* unignore everything  - just a placeholder.

* More two locations (#1267)

I find more two location and add gettext no it

* Colon clear #2 (#1250)

* Fix typo in header (#1152)

* Update Branching Strategy.

* fix 1180 (#1185)

* Update messages.po (POEditor.com)

* added docker size

* Added docker clone counter

* update badges

* Colon Clear #2

More some colons out of  gettext

* Update Dashboard.php

* Update SundaySchoolClassView.php

* Locations by saulo#4 (#1255)

* Fix SQL auto-install.  Cleanup Setup Page in case of absent signatures.json file

* remove dead comments

* Locantions by saulo #4

more two gettext added

* more one gettext

* Location and title separation

Location and title separation

* Update PersonEditor.php

* Update SystemService.php

* revert from develop

* Update from 2.3.1 master (#1279)

* prepare for 2.3.0 (#1271)

* reusing gettext family

* fix #1273 and upgrade to 2.3.1

* better code

* prep 2.3.1.

* fix #1276

* rev to 2.3.2 (#1278)

* 2.4.0 update from2.3.2 (#1308)

* prepare for 2.3.0 (#1271)

* reusing gettext family

* fix #1273 and upgrade to 2.3.1

* better code

* prep 2.3.1.

* fix #1276

* rev to 2.3.2 (#1278)

* fix 1285

* standardize on utf8mb4 (#1294)

* un-localize the conditional statement (#1296)

* added notes tab to person view (#1299)

resolves #1266

* Header HTML #1262 (#1288)

Header HTML #1262

* Adding Anniversaries to the Calendar (#1298)

* Add files via upload

Added Wedding dates to Calendar

* Add files via upload

Added helper functions to get the Wedding Day, Wedding Month, and ViewURI

* Add files via upload

Created functionality to show Wedding Dates (Anniversary) on the calendar

* added missing gettext for lables

* fixed wedding date comment

* add null check

* Will list people who are members or Regular Attender

* Fixes 1192 (#1293)

* using momentjs for age calculation

* return date object in getBirthDate
added format age suffix for just the suffix
added show age for using momentjs to display age
affects #1192

* changed data-birthdate to data-birth-date
using momentjs to calc age on Sunday School pages
removed PrintAge
resolves #1192

* resolving issues in code review

* update messages.po

* add French localization

* move to 2.3.3

* Localization cleanup for colon and case  (#1272)

* rebase on develop

* gettext Date: -> Date

* Family Name:

* address fields

* state

* Home Phone

* phones

* email

* more cleanup

* more clean up of get text

* more cleanup

* gender

* more cleanup

* fixed mailto:

* cleanup of gettext

* fixed mailto:

* gettext cleanup

* gettext cleanup

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Update messages.mo (POEditor.com)

* Update messages.po (POEditor.com)

* Poeditor cleanup (#1317)

* not files that are in poeditor

* fixed spacing

* more colon stuff

* more locale cleanup

* more cleanup

* address cleanup

* merge 2.4.0 develop into 2.3.3 master AS 2.3.3 for release of new features

* 2.3.3-update-locale

* start 2.3.4

* #1332 fixed

* new static class for Countires

* added new Church Address Country

* added new Church Address Country

* country changes

- new church Country filed
- new field type = country

* starting 2.3.4

* new country type

* revert

* updated to correct sChurchCountry
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DawoudIO DawoudIO DawoudIO left review comments

Assignees

@bradgearon bradgearon

Labels
enhancement
Projects
None yet
Milestone
2.3.2
Development

Successfully merging this pull request may close these issues.

use momentjs to calc Age
2 participants
@bradgearon @DawoudIO