From: Alexander Karelas <alex.karelas@gmail.com>
Date: Thu, 24 Apr 2014 13:08:48 +0000 (+0000)
Subject: Fixed greek "previous Saturday" string - was gender female, now is gender neutral
X-Git-Tag: 2.7.0~25^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1e7fdf396c5b416684e5d42e4d8f08a6dfddf86;p=thirdparty%2Fmoment.git

Fixed greek "previous Saturday" string - was gender female, now is gender neutral
---

diff --git a/lang/el.js b/lang/el.js
index 9dfea239d..e2a38cdb5 100644
--- a/lang/el.js
+++ b/lang/el.js
@@ -44,13 +44,24 @@
             nextDay : '[Αύριο {}] LT',
             nextWeek : 'dddd [{}] LT',
             lastDay : '[Χθες {}] LT',
-            lastWeek : '[την προηγούμενη] dddd [{}] LT',
+            lastWeek : function() {
+                switch (this.day()) {
+                    case 6:
+                        return '[το προηγούμενο] dddd [{}] LT';
+                    default:
+                        return '[την προηγούμενη] dddd [{}] LT';
+                }
+            },
             sameElse : 'L'
         },
         calendar : function (key, mom) {
             var output = this._calendarEl[key],
                 hours = mom && mom.hours();
 
+            if (typeof output === 'function') {
+                output = output.apply(mom);
+            }
+
             return output.replace("{}", (hours % 12 === 1 ? "στη" : "στις"));
         },
         relativeTime : {
diff --git a/min/langs.js b/min/langs.js
index c0b3c6b43..e70f91d88 100644
--- a/min/langs.js
+++ b/min/langs.js
@@ -983,13 +983,24 @@
             nextDay : '[Αύριο {}] LT',
             nextWeek : 'dddd [{}] LT',
             lastDay : '[Χθες {}] LT',
-            lastWeek : '[την προηγούμενη] dddd [{}] LT',
+            lastWeek : function() {
+                switch (this.day()) {
+                    case 6:
+                        return '[το προηγούμενο] dddd [{}] LT';
+                    default:
+                        return '[την προηγούμενη] dddd [{}] LT';
+                }
+            },
             sameElse : 'L'
         },
         calendar : function (key, mom) {
             var output = this._calendarEl[key],
                 hours = mom && mom.hours();
 
+            if (typeof output === 'function') {
+                output = output.apply(mom);
+            }
+
             return output.replace("{}", (hours % 12 === 1 ? "στη" : "στις"));
         },
         relativeTime : {
diff --git a/min/moment-with-langs.js b/min/moment-with-langs.js
index 72687db99..553554200 100644
--- a/min/moment-with-langs.js
+++ b/min/moment-with-langs.js
@@ -3349,13 +3349,24 @@
             nextDay : '[Αύριο {}] LT',
             nextWeek : 'dddd [{}] LT',
             lastDay : '[Χθες {}] LT',
-            lastWeek : '[την προηγούμενη] dddd [{}] LT',
+            lastWeek : function() {
+                switch (this.day()) {
+                    case 6:
+                        return '[το προηγούμενο] dddd [{}] LT';
+                    default:
+                        return '[την προηγούμενη] dddd [{}] LT';
+                }
+            },
             sameElse : 'L'
         },
         calendar : function (key, mom) {
             var output = this._calendarEl[key],
                 hours = mom && mom.hours();
 
+            if (typeof output === 'function') {
+                output = output.apply(mom);
+            }
+
             return output.replace("{}", (hours % 12 === 1 ? "στη" : "στις"));
         },
         relativeTime : {
diff --git a/test/lang/el.js b/test/lang/el.js
index 88c94428f..8bfad0931 100644
--- a/test/lang/el.js
+++ b/test/lang/el.js
@@ -244,16 +244,19 @@ exports["lang:el"] = {
     },
 
     "calendar last week" : function (test) {
-        test.expect(15);
+        test.expect(20);
 
         var i, m;
         for (i = 2; i < 7; i++) {
             m = moment().subtract({ d: i });
-            test.equal(m.calendar(),       m.format('[την προηγούμενη] dddd [' + (m.hours() % 12 === 1 ? 'στη' : 'στις') + '] LT'),  "Today - " + i + " days current time");
+            var dayString = m.day() == 6 ? '[το προηγούμενο Σάββατο]' : '[την προηγούμενη] dddd';
+            test.equal(m.calendar(),       m.format(dayString + ' [' + (m.hours() % 12 === 1 ? 'στη' : 'στις') + '] LT'),  "Today - " + i + " days current time");
+            m.hours(1).minutes(30).seconds(0).milliseconds(0);
+            test.equal(m.calendar(),       m.format(dayString + ' [στη] LT'),  "Today - " + i + " days beginning of day");
             m.hours(0).minutes(0).seconds(0).milliseconds(0);
-            test.equal(m.calendar(),       m.format('[την προηγούμενη] dddd [στις] LT'),  "Today - " + i + " days beginning of day");
+            test.equal(m.calendar(),       m.format(dayString + ' [στις] LT'),  "Today - " + i + " days beginning of day");
             m.hours(23).minutes(59).seconds(59).milliseconds(999);
-            test.equal(m.calendar(),       m.format('[την προηγούμενη] dddd [στις] LT'),  "Today - " + i + " days end of day");
+            test.equal(m.calendar(),       m.format(dayString + ' [στις] LT'),  "Today - " + i + " days end of day");
         }
         test.done();
     },