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

Grunt for All Skin & New Localization Files #1335

Merged
merged 20 commits into from
Nov 14, 2016
Merged

Grunt for All Skin & New Localization Files #1335

merged 20 commits into from
Nov 14, 2016

Conversation

DawoudIO
Copy link
Contributor

@DawoudIO DawoudIO commented Nov 12, 2016 •
edited
Loading

@DawoudIO DawoudIO added this to the 2.3.4 milestone Nov 12, 2016
crossan007
crossan007 reviewed Nov 12, 2016
View reviewed changes
src/Include/Footer.php
@@ -53,7 +53,10 @@
<script src="<?= $sRootPath ?>/skin/js/DataTables.js"></script>
<script src="<?= $sRootPath ?>/skin/js/Tooltips.js"></script>
<script src="<?= $sRootPath ?>/skin/js/Events.js"></script>
<script src="<?= $sRootPath ?>/skin/js/Footer.js"></script>
<script src="<?= $sRootPath ?>/skin/js/Events.js"></script>
Copy link
Contributor

Choose a reason for hiding this comment

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

including events twice?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good catch...

@crossan007
Copy link
Contributor

so - what's the general idea here: "take all of the plugin-specific localization scripts, and make one super javascript file containing all localization for all plugins?"

@DawoudIO
Copy link
Contributor Author

Yep, build it so that we can merge all localization plugins so that the system just loads a single file and not include all localization when not needed... this way we also have a standard naming etc...

@DawoudIO
Copy link
Contributor Author

do not merge as i yet to use the datatable files

@DawoudIO DawoudIO changed the title Localization files per locale Skin Files Cleanup Nov 13, 2016
@DawoudIO DawoudIO changed the title Skin Files Cleanup Skin Localiaztion File Cleanup Nov 13, 2016
@DawoudIO
Copy link
Contributor Author

This is ready

@DawoudIO DawoudIO changed the title Skin Localiaztion File Cleanup Gulp for All Skin Files Nov 13, 2016
@DawoudIO DawoudIO changed the title Gulp for All Skin Files Grunt for All Skin Files & New Localization Files Nov 13, 2016
@DawoudIO DawoudIO changed the title Grunt for All Skin Files & New Localization Files Grunt for All Skin & New Localization Files Nov 13, 2016
@DawoudIO
adminlte-copy cleanup
774007c 
excluded files during copy of adminlte that we build outside
@DawoudIO
added package
70cf4bc
crossan007
crossan007 reviewed Nov 13, 2016
View reviewed changes
package.json
"install": "grunt curl-dir && grunt copy",
"postinstall": "grunt concat && grunt rename",
"locale-gen": "/vagrant/scripts/update-locale.sh",
"package": "php generateSignatures.php src && grunt compress"
Copy link
Contributor

Choose a reason for hiding this comment

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

Where's demosite? :-)

@crossan007
Copy link
Contributor

I'm testing this now...

@crossan007
Copy link
Contributor

crossan007 commented Nov 13, 2016 •
edited
Loading

@DawoudIO releases built with this will fail validation checks.

this new build process generates the signatures definition file based on a full src/ directory, but then excludes many files from the finalized zip file.

I'm looking into a resolution for now.

DawoudIO
DawoudIO commented Nov 14, 2016
View reviewed changes
Gruntfile.js
@@ -251,5 +251,4 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-contrib-rename');
grunt.loadNpmTasks('grunt-curl');
grunt.loadNpmTasks('node-sha1');
Copy link
Contributor Author

Choose a reason for hiding this comment

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

why did you remove this?

@DawoudIO DawoudIO merged commit 4929849 into master Nov 14, 2016
@DawoudIO DawoudIO deleted the localization-files branch November 14, 2016 06:36
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 DawoudIO mentioned this pull request Nov 14, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crossan007 crossan007 crossan007 left review comments

Assignees
No one assigned
Labels
build development Localization
Projects
None yet
Milestone
2.3.4
Development

Successfully merging this pull request may close these issues.

Update DataTables to latest and include localization files Untranslated terms in 2.30-RC1:
2 participants
@DawoudIO @crossan007