Merge "Indicate the actual version of HHVM in use"

[lhc/web/wiklou.git] / resources / lib / moment / lang / ru.js

diff --git a/resources/lib/moment/lang/ru.js b/resources/lib/moment/lang/ru.js
index ac5400d..3ae8d23 100644 (file)
--- a/resources/lib/moment/lang/ru.js
+++ b/resources/lib/moment/lang/ru.js
@@ -1,5 +1,5 @@
-// moment.js language configuration
-// language : russian (ru)
+// moment.js locale configuration
+// locale : russian (ru)
 // author : Viktorminator : https://github.com/Viktorminator
 // Author : Menelion Elensúle : https://github.com/Oire
 
@@ -72,7 +72,7 @@
         return weekdays[nounCase][m.day()];
     }
 
-    return moment.lang('ru', {
+    return moment.defineLocale('ru', {
         months : monthsCaseReplace,
         monthsShort : monthsShortCaseReplace,
         weekdays : weekdaysCaseReplace,
@@ -125,7 +125,10 @@
             yy : relativeTimeWithPlural
         },
 
-        // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason
+        meridiemParse: /ночи|утра|дня|вечера/i,
+        isPM : function (input) {
+            return /^(дня|вечера)$/.test(input);
+        },
 
         meridiem : function (hour, minute, isLower) {
             if (hour < 4) {