[Date] Add some new ways to get shorter weekday and month names, for …

…formatting
Whiteknight · Jul 1, 2012 · 7a79016 · 7a79016
1 parent e0d1fb8
commit 7a79016
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/date/Date.winxed b/src/date/Date.winxed
@@ -416,9 +416,12 @@ class Rosella.Date
     }
 
     // Get the week-day (string name)
-    function week_day_name()
+    function week_day_name(int chars = -1)
     {
-        return Rosella.Date.all_week_days()[int(self.week_day())];
+        string name = Rosella.Date.all_week_days()[int(self.week_day())];
+        if (chars == -1)
+            return name;
+        return substr(name, 0, chars);
     }
 
     /* Month
@@ -453,9 +456,12 @@ class Rosella.Date
     }
 
     // Get the name of the month
-    function month_name()
+    function month_name(int chars = -1)
     {
-        return Rosella.Date.all_months()[int(self.month() - 1)];
+        string name = Rosella.Date.all_months()[int(self.month() - 1)];
+        if (chars == -1)
+            return name;
+        return substr(name, 0, chars);
     }
 
     /* Year

diff --git a/src/date/DateFormatter.winxed b/src/date/DateFormatter.winxed
@@ -12,7 +12,7 @@ class Rosella.Date.DateFormatter : Rosella.StringFormatter
     {
         if (contains_substr(f, "{yyyy}")) f = f.replace("{yyyy}", format_string("%04d", obj.year()));
         if (contains_substr(f, "{MMMM}")) f = f.replace("{MMMM}", obj.month_name());
-        if (contains_substr(f, "{MMM}"))  f = f.replace("{MMM}", substr(obj.month_name(), 0, 3));
+        if (contains_substr(f, "{MMM}"))  f = f.replace("{MMM}", obj.month_name(3));
         if (contains_substr(f, "{MM}"))   f = f.replace("{MM}", format_string("%02d", obj.month()));
         if (contains_substr(f, "{dd}"))   f = f.replace("{dd}", format_string("%02d", obj.day()));
         if (contains_substr(f, "{AA}")) {
@@ -36,6 +36,7 @@ class Rosella.Date.DateFormatter : Rosella.StringFormatter
         }
         if (contains_substr(f, "{ww}"))   f = f.replace("{ww}", format_string("%02d", obj.week_day()));
         if (contains_substr(f, "{WW}"))   f = f.replace("{WW}", obj.week_day_name());
+        if (contains_substr(f, "{WWW}"))  f = f.replace("{WWW}",obj.week_day_name(3));
         if (contains_substr(f, "{hh}"))   f = f.replace("{hh}", format_string("%02d", obj.hours()));
         if (contains_substr(f, "{mm}"))   f = f.replace("{mm}", format_string("%02d", obj.minutes()));
         if (contains_substr(f, "{ss}"))   f = f.replace("{ss}", format_string("%02d", obj.seconds()));