Fix i18next.t function, translate GroupEditor.js, update locale files #2762
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned 
crossan007
changed the title
DawoudIO
approved these changes
Jul 9, 2017
DawoudIO
requested changes
Jul 9, 2017
src/skin/js/GroupEditor.js
Outdated
| @@ -200,11 +200,14 @@ $("document").ready(function() | |||
| }); | |||
|
|
|||
| dataT = $("#groupRoleTable").DataTable({ | |||
| "language": { | |||
| "url": window.CRM.root + "/skin/locale/datatables/" + window.CRM.locale + ".json" | |||
There was a problem hiding this comment.
This should use window.crm.datatable.languagr.url
There was a problem hiding this comment.
good call - actually we can use $.extend() to merge the dataTables global params with the instance specific ones.
see here: https://github.com/ChurchCRM/CRM/pull/2673/files#diff-a4294841130cefac1f8f8d7b8d59f11eR241
There was a problem hiding this comment.
Cool then we have a few to fix
crossan007
changed the title
DawoudIO
approved these changes
Jul 10, 2017
DawoudIO
pushed a commit
that referenced
this pull request
Jul 15, 2017
* kiosk cleanup * cleanups * fixes * tweaks * don't show new button yet since it's not connected. * tweak * Apply fixes from StyleCI * styleci * cleanup crmjsom for kiosks namespace * cleanup kiosk manager assignments * stopping for hte night * kiosk manager works now. * switching kiosk roles works now. * Merge pull request #2541 from Adnan0703/highlight-selected-datatable-row Highlight selected dataTable rows * 2.8.0 text * download 2.8.0 from poeditor pre 2.8.0 RC0 * fix SQL errors, and get sql version on bug report * underp system service * Apply fixes from StyleCI * Bug/kiosk loop (#2597) * tweaks * kiosk tweaks * Apply fixes from StyleCI * merging all 2.8.0 sql fixes #2590 * added php 7.1 and 5.6 part of #2348 * only deploy for php 7 * no 5.6 for now * Explicitly test on Linux * underp space * underp space * temp fix create family * Don't show error if the jqXHR was aborted. (#2610) * initial refactor * Better Filter Methods * line endings * Apply fixes from StyleCI * StyleCI manual patch apply * add tests * Standardize on display of FamilyString to disambiguate famililes (#2564) * sort of works, but it's ugly. don't merge yet. * should work, but doesnt. * fix depositslipeditor * fixing family search in pledges * fix search * cleanup * fixed bHideFriendDate not taken effect (#2614) * use SystemConfig::getValue * using getBooleanValue * 2.8.0 rc2 locale (#2619) * chmod +x on scripts * gen file before RC2 * pre-2.8.0 RC2 download * closes #2472 (#2620) * added missing use SystemConfig; * Apply fixes from StyleCI (#2633) * closes #2634 * fix group datatables * fix multi select issue * email debug * Apply fixes from StyleCI (#2646) * move docs to wiki (#2641) * password types were getting the value of the last setting (#2644) * fix openlp notifications and event loop performance * remove debug * Build/2.8.1 starting (#2658) * move docs to wiki * add missing 2.8.1 * fixed type setting (#2649) fixed type setting, will always set even if it is unknown... and fixed verifyFamily type name * checking for null (#2653) * Update composer.json (#2631) upgrading to the latest version which supports php 5.6 please do note that 4.x of the willdurand/geocoder lib does not support 5.6 * starting 2.8.2 * fixed db upgrades * Fixed RootPath . / * added admin user check * Apply fixes from StyleCI * uncomment family lat/long update * after 2.8.1 * updated locale file * updated from po-editor 2.8.0 * start 2.8.3 (#2676) * locale-cleanup parts of #2684 * Apply fixes from StyleCI (#2685) * month view only show current month events from #2625 * Apply fixes from StyleCI (#2689) * Fix Datatable settings created a common JS datatable settings for all standard datatables to use.. fixed dataTable to DataTable * Revert "Fix Datatable settings" This reverts commit 291bf93. * fixed the download * updated text * added en_US * Apply fixes from StyleCI (#2691) * hide other month * sOLPPassword, sNexmoAPISecret does not use Password config type (#2687) fixes #2674 * remvoed FamilyWorkPhoneTask * remvoed FamilyWorkPhoneTask (#2699) * added box-tools collapse & remove * Fix DataTable settings (#2693) * Fix Datatable settings created a common JS datatable settings for all standard datatables to use.. fixed dataTable to DataTable * Apply fixes from StyleCI (#2692) * fixed root issue * Update Header-function.php updated locale * Changes this  to this:  * moving datatable urls to windows.CRM values this way it is a single change * Apply fixes from StyleCI (#2698) * using locale not lang code * fixed JS error * Update CartView.php * Self Verify Changes v2 (#2702) * hide fields if empty * fixed group display * visit our site now going to new sChurchWebSite value * added Self Verification to timeline * now shows M next any age less than 1 year (#2704) * Update Footer.js * Starting 2.8.4 (#2713) * starting 2.8.4 * new message after 2.8.3 * 2.8.4 started... download from poeditor after .3 was released * Move docs links to wiki (#2688) * moving docs/help to wiki single spot for the URL to be stored and using Statis SystemURls * updated chat and docs urls * Update Functions.php (#2730) * Update InputUtils.php (#2737) Bug correction for many part : - person property - group property * Update Functions.php Update custom phone number for person * Update GeoPage.php Problem with strtolower with UTF8 charset * Update GeoPage.php Removed getext * Apply fixes from StyleCI (#2744) * remove old code * translate group editor * update translations * fix footer.js * mixxing PHP * Update Footer.php (#2731) * extract i18next.t strings from JS files * revert derp locale * revert derp locale * revert derp locale * fix duplicate keys with msgcat * add i18n to JS string literals * Fix Select2 Translation, Grunt Locale Concat task (#2746) * Update Footer.php * Apply fixes from StyleCI (#2745) * cleanup short locale * move shortLocale to CRM namespace var * include select2 in concatenated locale. Closes #2763 * moved fullcalendar to min ver * removed fullcalendar include it is now in the footer and ensure we are waiting for all JS to be ready * added missing datatable language * added missing sv select2 * Add i18next function calls to JS string literals (#2766) * translate group editor * update translations * fix footer.js * mixxing PHP * extract i18next.t strings from JS files * revert derp locale * revert derp locale * revert derp locale * fix duplicate keys with msgcat * add i18n to JS string literals * added missing datatable language * using window.CRM.plugin.dataTable (#2762) * added missing split from 2.7.0 * update versions (#2779) * updated Query to Look for People WIth Families and ignore Admin * ignore admin gender * ignore admin * split the name column into a image column this will move the Group Export: Name has extra "  " ito its own column * fixed no address member display (#2788) * fixed no address memeber display * Apply fixes from StyleCI (#2787) * added missing Criteria use * Update MemberView.js (#2802) * Update MemberView.js The js code could not work, the code is in PersonView.php is : <a class="btn btn-app bg-maroon" id="delete-person" data-person_name="<?= $person->getFullName()?>" data-person_id="<?= $iPersonID ?>"><i class="fa fa-trash-o"></i> <?= gettext("Delete this Record") ?></a> It's an id so the code should be : #delete-person and not : .delete-person * using Id for Delete Person buttons * fix sass version * Update GeoPage.php (#2827) Little update to be compatible with the translation of the unit Kilometers. * move JSONKeys. concatenat JSON strings to locale js. Re-order i18next / footer.js * update strings. * cleanup JS translations * update 2.8.5 tag from POEditor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #2760 with a fresh
npm run locale-downloadHelps with #2759 by encasing all string literals in GroupEditor.js with calls to the
i18next.t()function for translation.until Group editor terms are added to POEditor, but #2761 has to be done first.