Merge branch 'master' into hotfix/1.7.1

* master: Adding note about jsfiddle Adding contributing file as per https://github.com/blog/1184-contributing-guidelines Romanian (ro) translation with tests
anagrius · Sep 17, 2012 · 4e8903b · 4e8903b
2 parents ba1a71e + b21d427
commit 4e8903b
Show file tree

Hide file tree

Showing 4 changed files with 343 additions and 36 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,34 @@
+Submitting Issues
+=================
+
+If you are submitting a bug with moment, please create a [jsfiddle](http://jsfiddle.net/) demonstrating the issue.
+
+Contributing
+============
+
+To contribute, fork the library and install these npm packages.
+
+    npm install jshint uglify-js nodeunit
+
+You can add tests to the files in `/test/moment` or add a new test file if you are adding a new feature.
+
+To run the tests, do `make test` to run all tests, `make test-moment` to test the core library, and `make test-lang` to test all the languages.
+
+To check the filesize, you can use `make size`.
+
+To minify all the files, use `make moment` to minify moment, `make langs` to minify all the lang files, or just `make` to minfy everything.
+
+If your code passes the unit tests (including the ones you wrote), submit a pull request.
+
+Submitting pull requests
+========================
+
+Moment.js now uses [git-flow](https://github.com/nvie/gitflow). If you're not familiar with git-flow, please read up on it, you'll be glad you did.
+
+When submitting new features, please create a new feature branch using `git flow feature start <name>` and submit the pull request to the `develop` branch.
+
+Pull requests for enhancements for features should be submitted to the `develop` branch as well.
+
+When submitting a bugfix, please check if there is an existing bugfix branch. If the latest stable version is `1.5.0`, the bugfix branch would be `hotfix/1.5.1`. All pull requests for bug fixes should be on a `hotfix` branch, unless the bug fix depends on a new feature.
+
+The `master` branch should always have the latest stable version. When bugfix or minor releases are needed, the develop/hotfix branch will be merged into master and released.
diff --git a/lang/ro.js b/lang/ro.js
@@ -0,0 +1,55 @@
+// moment.js language configuration
+// language : romanian (ro)
+// author : Vlad Gurdiga : https://github.com/gurdiga
+// author : Valentin Agachi : https://github.com/avaly
+(function () {
+    var lang = {
+            months : "Ianuarie_Februarie_Martie_Aprilie_Mai_Iunie_Iulie_August_Septembrie_Octombrie_Noiembrie_Decembrie".split("_"),
+            monthsShort : "Ian_Feb_Mar_Apr_Mai_Iun_Iul_Aug_Sep_Oct_Noi_Dec".split("_"),
+            weekdays : "Duminică_Luni_Marţi_Miercuri_Joi_Vineri_Sâmbătă".split("_"),
+            weekdaysShort : "Dum_Lun_Mar_Mie_Joi_Vin_Sâm".split("_"),
+            weekdaysMin : "Du_Lu_Ma_Mi_Jo_Vi_Sâ".split("_"),
+            longDateFormat : {
+                LT : "H:mm",
+                L : "DD/MM/YYYY",
+                LL : "D MMMM YYYY",
+                LLL : "D MMMM YYYY H:mm",
+                LLLL : "dddd, D MMMM YYYY H:mm"
+            },
+            calendar : {
+                sameDay: "[azi la] LT",
+                nextDay: '[mâine la] LT',
+                nextWeek: 'dddd [la] LT',
+                lastDay: '[ieri la] LT',
+                lastWeek: '[fosta] dddd [la] LT',
+                sameElse: 'L'
+            },
+            relativeTime : {
+                future : "peste %s",
+                past : "%s în urmă",
+                s : "câteva secunde",
+                m : "un minut",
+                mm : "%d minute",
+                h : "o oră",
+                hh : "%d ore",
+                d : "o zi",
+                dd : "%d zile",
+                M : "o lună",
+                MM : "%d luni",
+                y : "un an",
+                yy : "%d ani"
+            },
+            ordinal : function (number) {
+                return '';
+            }
+        };
+
+    // Node
+    if (typeof module !== 'undefined') {
+        module.exports = lang;
+    }
+    // Browser
+    if (typeof window !== 'undefined' && this.moment && this.moment.lang) {
+        this.moment.lang('ro', lang);
+    }
+}());
diff --git a/readme.md b/readme.md
@@ -22,36 +22,6 @@ There are a few things being deprecated in the 1.6.0 release.
 3. The way to customize am/pm strings is being changed. This would only affect you if you created a custom language file. For more information, see [this issue](https://github.com/timrwood/moment/pull/222).
 
 
-Contributing
-============
-
-To contribute, fork the library and install these npm packages.
-
-    npm install jshint uglify-js nodeunit
-
-You can add tests to the files in `/test/moment` or add a new test file if you are adding a new feature.
-
-To run the tests, do `make test` to run all tests, `make test-moment` to test the core library, and `make test-lang` to test all the languages.
-
-To check the filesize, you can use `make size`.
-
-To minify all the files, use `make moment` to minify moment, `make langs` to minify all the lang files, or just `make` to minfy everything.
-
-If your code passes the unit tests (including the ones you wrote), submit a pull request.
-
-Submitting pull requests
-========================
-
-Moment.js now uses [git-flow](https://github.com/nvie/gitflow). If you're not familiar with git-flow, please read up on it, you'll be glad you did.
-
-When submitting new features, please create a new feature branch using `git flow feature start <name>` and submit the pull request to the `develop` branch.
-
-Pull requests for enhancements for features should be submitted to the `develop` branch as well.
-
-When submitting a bugfix, please check if there is an existing bugfix branch. If the latest stable version is `1.5.0`, the bugfix branch would be `hotfix/1.5.1`. All pull requests for bug fixes should be on a `hotfix` branch, unless the bug fix depends on a new feature.
-
-The `master` branch should always have the latest stable version. When bugfix or minor releases are needed, the develop/hotfix branch will be merged into master and released.
-
 Changelog
 =========
 
@@ -162,11 +132,11 @@ Added _date.lang() support.
 Added support for passing multiple formats to try to parse a date. _date("07-10-1986", ["MM-DD-YYYY", "YYYY-MM-DD"]);
 Made parse from string and single format 25% faster.
 
-### 0.5.2 
+### 0.5.2
 
 Buxfix for [issue 8](https://github.com/timrwood/underscore.date/pull/8) and [issue 9](https://github.com/timrwood/underscore.date/pull/9).
 
-### 0.5.1 
+### 0.5.1
 
 Buxfix for [issue 5](https://github.com/timrwood/underscore.date/pull/5).
 
@@ -177,11 +147,11 @@ Removed `_date.now()`, as it is a duplicate of `_date()` with no parameters.
 Removed `_date.isLeapYear(yearNuumber)`. Use `_date([yearNumber]).isLeapYear()` instead.
 Exposed customization options through the `_date.relativeTime`, `_date.weekdays`, `_date.weekdaysShort`, `_date.months`, `_date.monthsShort`, and `_date.ordinal` variables instead of the `_date.customize()` function.
 
-### 0.4.1 
+### 0.4.1
 
 Added date input formats for input strings.
 
-### 0.4.0 
+### 0.4.0
 
 Added underscore.date to npm. Removed dependancies on underscore.
 
@@ -191,7 +161,7 @@ Added `'z'` and `'zz'` to `_.date().format()`. Cleaned up some redundant code to
 
 ### 0.3.1
 
-Cleaned up the namespace. Moved all date manipulation and display functions to the _.date() object. 
+Cleaned up the namespace. Moved all date manipulation and display functions to the _.date() object.
 
 ### 0.3.0
 
@@ -225,4 +195,4 @@ copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.