Skip to content

Commit

Permalink
Merge branch 'maxerickson-usholidays'. Merged #70. Closes #69.
Browse files Browse the repository at this point in the history
* Thanks very much to maxerickson for the effort you put into this pull request 👍
  • Loading branch information
ypid committed Feb 15, 2015
2 parents a306580 + f950830 commit 2bf2aa7
Show file tree
Hide file tree
Showing 5 changed files with 2,230 additions and 46 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,11 @@ check-diff: check-diff-opening_hours.js
.PHONY: check-test
check-test: check-opening_hours.js

# .PHONY: check-opening_hours.js
# .PHONY: check-opening_hours.js check-opening_hours.min.js
## Does not work
# check-opening_hours.js:
# check-opening_hours.min.js:

check-%.js: %.js test.js
-$(NODE) test.js "./$<"

Expand Down
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -620,16 +620,17 @@ Autor | Contact | Note
Contributor | Contribution
------------- | -------------
[Sergey Leschina](https://github.com/putnik) | [demo][ohlib.evaluation-tooldemohtml] improvements
[don-vip](https://github.com/don-vip) | French localization and public holidays for France
[Charly Koza](https://github.com/Cactusbone) | fixed package.json
[Simon B.](https://github.com/sesam) | improved understandability of overlapping rules in README.md
[NonnEmilia](https://github.com/NonnEmilia) | Italian localization and fixes in the [demo page][ohlib.evaluation-tooldemohtml]
[João G. Packer](https://github.com/jgpacker) | Portuguese localization
[James Badger](https://github.com/openfirmware) | add Canadian national, provincial public holidays and fixed Russian localization
[Zgarbul Andrey](https://github.com/burrbull) | Ukrainian localization and public holidays for Ukraine
[Blaž Lorger](https://github.com/blorger) | public holidays for Slovenian
[dmromanov](https://github.com/dmromanov) | public holidays and tests for Russian, small fixes
[Sergey Leschina](https://github.com/putnik) | [demo][ohlib.evaluation-tooldemohtml] improvements.
[don-vip](https://github.com/don-vip) | French localization and public holidays for France.
[Charly Koza](https://github.com/Cactusbone) | Fixed package.json.
[Simon B.](https://github.com/sesam) | Improved understandability of overlapping rules in README.md.
[NonnEmilia](https://github.com/NonnEmilia) | Italian localization and fixes in the [demo page][ohlib.evaluation-tooldemohtml].
[João G. Packer](https://github.com/jgpacker) | Portuguese localization.
[James Badger](https://github.com/openfirmware) | Add Canadian national, provincial public holidays and fixed Russian localization.
[Zgarbul Andrey](https://github.com/burrbull) | Ukrainian localization and public holidays for Ukraine.
[Blaž Lorger](https://github.com/blorger) | Public holidays for Slovenian.
[dmromanov](https://github.com/dmromanov) | Public holidays and tests for Russian, small fixes.
[maxerickson](https://github.com/maxerickson) | Public holidays and tests for USA. He also wrote a Python script for testing the holiday JSON. See [us_holidays](https://github.com/maxerickson/us_holidays).
## Credits
Expand Down
Loading

0 comments on commit 2bf2aa7

Please sign in to comment.