Skip to content

Commit

Permalink
Added .gitattributes, Updated Readme
Browse files Browse the repository at this point in the history
  • Loading branch information
vsg24 committed Jul 6, 2016
1 parent 5b30e7b commit f59346b
Show file tree
Hide file tree
Showing 3 changed files with 109 additions and 49 deletions.
56 changes: 56 additions & 0 deletions .gitignore
@@ -0,0 +1,56 @@

# Created by https://www.gitignore.io/api/phpstorm

### PhpStorm ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/workspace.xml
.idea/tasks.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml

# Sensitive or high-churn files:
.idea/dataSources.ids
.idea/dataSources.xml
.idea/dataSources.local.xml
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml

# Gradle:
.idea/gradle.xml
.idea/libraries

# Mongo Explorer plugin:
.idea/mongoSettings.xml

## File-based project format:
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### PhpStorm Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr
94 changes: 49 additions & 45 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -7,7 +7,7 @@ Jalali, also known as Shamsi or Hijri Shamsi is the Iranian calendar system.

`jDateTimePlus` 1.0.0 is based on `jDateTime` 2.2.0

This package is a fork based on jDateTime by Sallar Kaboli. In this fork, I replaced Jalali to Gregorian and vice versa methods with new ones based on jdf 2.60. Also replaced the `mktime` method with a new one because the older version gave wrong results. I also fixed some of the phpdocs and introduced new methods. This package is best used with a higher abstraction such as `EasyDateTime`.
This package is a fork based on jDateTime by Sallar Kaboli. In this fork, I replaced Jalali to Gregorian and vice versa methods with new ones based on jdf 2.60. Also replaced the `mktime` method with a new one because the older version gave wrong results. I also fixed some of the phpdocs and introduced new methods. This package is best used with a higher abstraction such as <a href="https://github.com/VSG24/EasyDateTime">`EasyDateTime`</a>.

PHP's default `date` function does not support years higher than 2038, so the `DateTime` class was introduced in PHP5 to solve this problem and provide more sophisticated date methods. Iranian users have been using an old `jdate` function to convert Gregorian date to the Jalali equivalent, which is completely based on the old php `date` function so its pretty much out-dated.

Expand All @@ -23,14 +23,14 @@ You can install this package using [composer](https://getcomposer.org). Add this

```
"require": {
"sallar/jdatetime": "dev-master"
"vsg24/jdatetimeplus": "dev-master"
}
```

or if you prefer command line, change directory to project root and:

```
php composer.phar require "sallar/jdatetime":"dev-master"
php composer.phar require "vsg24/jdatetimeplus":"dev-master"
```

##Manual Installation
Expand All @@ -43,7 +43,7 @@ Get a copy of package source code. You can do this in two ways:
After getting a copy of source code, it is enough to include `jdatetime.class.php` where you need to use it.

```php
require_once 'path/to/source/jdatetime.class.php';
require_once 'path/to/source/jdatetimeplus.class.php';
```

#Examples
Expand Down

0 comments on commit f59346b

Please sign in to comment.