sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/tests/system/datetime.js

@@ -25,12 +25,12 @@ function timeShouldBeEqualToHash(t, h, message) {
   if (h === undefined) h = options;
   if (h.timezone === undefined) h.timezone = SC.DateTime.timezone;
   if (message === undefined) message = "%@ of time should be equal to hash";
-  
+
   if (t === null) {
     ok(false, 'Time should not be null');
     return;
   }
-    
+
   equals(t.get('year'), h.year , message.fmt('year'));
   equals(t.get('month'), h.month, message.fmt('month'));
   equals(t.get('day'), h.day, message.fmt('day'));
@@ -60,7 +60,7 @@ test('_toMilliseconds()', function() {
   // Check the default behavior
   equals(dt._toMilliseconds(null, ms, timezone), ms, "Should equal start milliseconds when no options hash provided");
   equals(dt._toMilliseconds({}, ms, timezone), ms, "Should equal start milliseconds when empty options hash provided");
-  
+
   // Test a completely defined date/time hash with no specified start milliseconds.
   equals(dt._toMilliseconds(options, null, options.timezone), ms, "Milliseconds should express the parsed options hash");
 
@@ -99,7 +99,7 @@ test('create with local time milliseconds', function() {
     millisecond: d.getMilliseconds(),
     timezone: d.getTimezoneOffset()
   };
-  
+
   dt = SC.DateTime.create(d.getTime()); // init a DateTime using that date's milliseconds
   timeShouldBeEqualToHash(dt, hash);
 
@@ -162,7 +162,7 @@ test('Adjust with hashes expressed in various time zones', function() {
     timeShouldBeEqualToHash(dt.adjust({ minute:       1 }), { year: options.year, month: options.month, day: options.day, hour: options.hour, minute: 1, second: 0, millisecond: 0, timezone: timezone});
     timeShouldBeEqualToHash(dt.adjust({ second:      12 }), { year: options.year, month: options.month, day: options.day, hour: options.hour, minute: options.minute, second: 12, millisecond: 0, timezone: timezone});
     timeShouldBeEqualToHash(dt.adjust({ millisecond: 18 }), { year: options.year, month: options.month, day: options.day, hour: options.hour, minute: options.minute, second: options.second, millisecond: 18, timezone: timezone});
-    
+
     // Test taking each to time zone 0.  Manually calculate what the hour should be
     // then test that a call to get() returns that value.
     newHour = Math.floor((options.hour + 48 + (timezone / 60)) % 24); // small hack -- add 48 hours to ensure positive results when adding negative time zone offsets (doesn't affect the calculation since we mod by 24)
@@ -172,11 +172,11 @@ test('Adjust with hashes expressed in various time zones', function() {
 
 test('advance', function() {
   var o = options;
-  
+
   timeShouldBeEqualToHash(
     dt.advance({ year: 1, month: 1, day: 1, hour: 1, minute: 1, second: 1, millisecond: 1 }),
     { year: o.year + 1, month: o.month + 1, day: o.day + 1, hour: o.hour + 1, minute: o.minute + 1, second: o.second + 1, millisecond: o.millisecond + 1, timezone: o.timezone });
-  
+
   timeShouldBeEqualToHash(dt.advance({year:         1}), { year: o.year + 1, month: o.month, day: o.day, hour: o.hour, minute: o.minute, second: o.second, millisecond: o.millisecond, timezone: o.timezone });
   timeShouldBeEqualToHash(dt.advance({month:        1}), { year: o.year, month: o.month + 1, day: o.day, hour: o.hour, minute: o.minute, second: o.second, millisecond: o.millisecond, timezone: o.timezone });
   timeShouldBeEqualToHash(dt.advance({day:          1}), { year: o.year, month: o.month, day: o.day + 1, hour: o.hour, minute: o.minute, second: o.second, millisecond: o.millisecond, timezone: o.timezone });
@@ -184,7 +184,7 @@ test('advance', function() {
   timeShouldBeEqualToHash(dt.advance({minute:       1}), { year: o.year, month: o.month, day: o.day, hour: o.hour, minute: o.minute + 1, second: o.second, millisecond: o.millisecond, timezone: o.timezone });
   timeShouldBeEqualToHash(dt.advance({second:       1}), { year: o.year, month: o.month, day: o.day, hour: o.hour, minute: o.minute, second: o.second + 1, millisecond: o.millisecond, timezone: o.timezone });
   timeShouldBeEqualToHash(dt.advance({millisecond:  1}), { year: o.year, month: o.month, day: o.day, hour: o.hour, minute: o.minute, second: o.second, millisecond: o.millisecond + 1, timezone: o.timezone });
-  
+
   // Convert time from CEST to UTC, then UTC to UTC+05:30 (Mumbai)
   var h = { year: 1985, month: 5, day: 8, hour: 1, minute: 0, second: 22, millisecond: 925, timezone: -120 };
   var t = SC.DateTime.create(h);
@@ -199,7 +199,7 @@ test('advance', function() {
 
 test('compare', function() {
   var exception = null;
-  
+
   equals(SC.DateTime.isComparable, YES, "SC.DateTime is comparable");
   equals(SC.compare(dt, dt), 0, "A DateTime instance is equal to itself via compare()");
   equals(dt.isEqual(dt), YES, "A DateTime instance is equal to itself via isEqual()");
@@ -214,7 +214,7 @@ test('compare', function() {
     SC.DateTime.create({year: 1985, month: 5, day: 7, hour: 23, minute: 0, second: 22, millisecond: 925, timezone:    0}),
     SC.DateTime.create({year: 1985, month: 5, day: 8, hour:  1, minute: 0, second: 22, millisecond: 925, timezone: -120})),
     0, "The expressions of the same date in two different time zones are considered equal");
-  
+
   try {
     equals(SC.DateTime.compareDate(
       SC.DateTime.create({year: 1985, month: 5, day: 7, hour: 23, minute: 0, second: 22, millisecond: 925, timezone:    0}),
@@ -229,9 +229,9 @@ test('compare', function() {
 
 test('Format', function() {
   equals(
-    dt.toFormattedString('%a %A %b %B %d %D %h %H %I %j %m %M %p %S %w %y %Y %%a'),
-    'Sat Saturday Jun June 08 8 4 04 04 159 06 00 AM 22 6 85 1985 %a');
-  
+    dt.toFormattedString('%a %A %b %B %d %D %h %H %I %j %m %M %p %S %w %y %Y %%a %E'),
+    'Sat Saturday Jun June 08 8 4 04 04 159 06 00 AM 22 6 85 1985 %a ');
+
   equals(dt.toFormattedString('%Z'), formatTimezone(dt.get('timezone')));
   equals(dt.adjust({ timezone:    0 }).toFormattedString('%Y-%m-%d %H:%M:%S %Z'), '1985-06-08 05:00:22 +00:00');
   equals(dt.adjust({ timezone: -120 }).toFormattedString('%Y-%m-%d %H:%M:%S %Z'), '1985-06-08 07:00:22 +02:00');
@@ -246,11 +246,11 @@ test('fancy getters', function() {
   equals(SC.DateTime.create({ year: 1900, month: 1, day: 1 }).get('isLeapYear'), NO);
   equals(SC.DateTime.create({ year: 2000, month: 1, day: 1 }).get('isLeapYear'), YES);
   equals(SC.DateTime.create({ year: 2004, month: 1, day: 1 }).get('isLeapYear'), YES);
-  
+
   equals(dt.get('daysInMonth'), 30); // june
   equals(SC.DateTime.create({ year: 2000, month: 2, day: 1 }).get('daysInMonth'), 29);
   equals(SC.DateTime.create({ year: 2001, month: 2, day: 1 }).get('daysInMonth'), 28);
-  
+
   equals(dt.get('dayOfYear'), 159);
   equals(SC.DateTime.create({ year: 2000, month: 12, day: 31 }).get('dayOfYear'), 366);
   equals(SC.DateTime.create({ year: 2001, month: 12, day: 31 }).get('dayOfYear'), 365);
@@ -266,19 +266,19 @@ test('fancy getters', function() {
   equals(dt.get('lastMonday'), dt.advance({ day: -5 }), 'dt.advance(day: -5)');
   equals(dt.get('nextFriday'), dt.advance({ day: 6 }), 'dt.advance(day: 6)');
   equals(dt.get('lastWednesday'), dt.advance({ day: -3 }), 'dt.advance(day: -3)');
-  
+
   equals(
     SC.DateTime.create({ year: 2010, month: 9, day: 29, hour: 0, minute: 30, timezone: -120 }).adjust({ day: 1 }).get('lastMonday').toISO8601(),
     "2010-08-30T00:30:00+02:00");
 });
- 
+
 test('parse', function() {
   timeShouldBeEqualToHash(
     SC.DateTime.parse('08/05/1985 01:00:22 %a', '%d/%m/%Y %H:%M:%S %%a'),
     { year: 1985, month: 5, day: 8, hour: 1, minute: 0, second: 22, millisecond: 0 });
   timeShouldBeEqualToHash(
     SC.DateTime.parse('08/05/1985 01:00:22 PM', '%d/%m/%Y %H:%M:%S %p'),
-    { year: 1985, month: 5, day: 8, hour: 13, minute: 0, second: 22, millisecond: 0 }); 
+    { year: 1985, month: 5, day: 8, hour: 13, minute: 0, second: 22, millisecond: 0 });
   timeShouldBeEqualToHash(
     SC.DateTime.parse('Wed 08 May 1985 01:00:22 AM', '%a %d %b %Y %H:%M:%S %p'),
     { year: 1985, month: 5, day: 8, hour: 1, minute: 0, second: 22, millisecond: 0 });
@@ -302,7 +302,7 @@ test('parse', function() {
     'Should be able to have single digit for month, day, hour, minute, second');
   timeShouldBeEqualToHash(
     SC.DateTime.parse('70-01-01 00:00:00', '%y-%m-%d %H:%M:%S'),
-    { year: 2070, month: 1, day: 1, hour: 0, minute: 0, second: 0, millisecond: 0 }); 
+    { year: 2070, month: 1, day: 1, hour: 0, minute: 0, second: 0, millisecond: 0 });
   timeShouldBeEqualToHash(
     SC.DateTime.parse('71-01-01 00:00:00', '%y-%m-%d %H:%M:%S'),
     { year: 1971, month: 1, day: 1, hour: 0, minute: 0, second: 0, millisecond: 0 });
@@ -352,7 +352,7 @@ test('binding', function() {
 });
 
 test('cache', function() {
-  
+
   SC.DateTime.create(options);
   var cache_length_1 = SC.keys(SC.DateTime._dt_cache).length;
   SC.DateTime.create(options);
@@ -360,7 +360,7 @@ test('cache', function() {
   equals(
     cache_length_1, cache_length_2,
     "Creating twice the same datetime should not modify the cache's length");
-  
+
   var dates = [];
   for (var i = 0; i < 3*SC.DateTime._DT_CACHE_MAX_LENGTH; i++) {
     dates[i] = SC.DateTime.create(i);
@@ -373,16 +373,16 @@ test('cache', function() {
 
 test('timezones', function() {
   var o = options;
-  
+
   options.timezone = 0;
   timeShouldBeEqualToHash(SC.DateTime.create(options), options);
-  
+
   options.timezone = -120;
   timeShouldBeEqualToHash(SC.DateTime.create(options), options);
 
   options.timezone = 330;
   timeShouldBeEqualToHash(SC.DateTime.create(options), options);
-  
+
   options.timezone = 0; // note that test dates will now be created at timezone 0
   dt = SC.DateTime.create(options);
 
@@ -397,8 +397,44 @@ test('timezones', function() {
 
 test('extend', function() {
   var dateTimeExt = SC.DateTime.extend();
-  
+
   // Should parse and produce a date object that is an instance of 'dateTimeExt'
   var parsedDateTimeExt = dateTimeExt.parse('2011-10-15T21:30:00Z');
   ok(SC.instanceOf(parsedDateTimeExt, dateTimeExt), 'Correctly produced an instance of the extended type.');
 });
+
+/**
+ * This test trims out milliseconds, because time marches on during the unit
+ * test.
+ */
+test('elapsed', function() {
+  var dateTimeTest = SC.DateTime.create();
+  equals(Math.round(dateTimeTest.get('elapsed') / 1000), 0);
+
+  // Modify the current time by 20 seconds;
+  dateTimeTest = SC.DateTime.create().advance({
+    second: -20
+  });
+  equals(Math.round(dateTimeTest.get('elapsed') / 1000), 20);
+
+  // Modify the current time by -120 seconds;
+  dateTimeTest = SC.DateTime.create().advance({
+    second: 120
+  });
+  equals(Math.round(dateTimeTest.get('elapsed') / 1000), -120);
+
+});
+
+test('difference', function() {
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-12-08', '%Y-%m-%d'), SC.DateTime.parse('2010-12-18', '%Y-%m-%d'), 'W'), 1);
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-01-01', '%Y-%m-%d'), SC.DateTime.parse('2010-02-01', '%Y-%m-%d'), 'W'), 4);
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-02-01', '%Y-%m-%d'), SC.DateTime.parse('2010-01-01', '%Y-%m-%d'), 'W'), -4);
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-12-08', '%Y-%m-%d'), SC.DateTime.parse('2010-12-09', '%Y-%m-%d'), 'd'), 1);
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-12-18', '%Y-%m-%d'), SC.DateTime.parse('2010-12-09', '%Y-%m-%d'), 'd'), -9);
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-12-09 02:00:00', '%Y-%m-%d %H:%M:%S'), SC.DateTime.parse('2010-12-09 01:00:00', '%Y-%m-%d %H:%M:%S'), 'H'), -1);
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-12-09 01:00:00', '%Y-%m-%d %H:%M:%S'), SC.DateTime.parse('2010-12-09 01:10:00', '%Y-%m-%d %H:%M:%S'), 'H'), 0);
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-12-09 01:00:00', '%Y-%m-%d %H:%M:%S'), SC.DateTime.parse('2010-12-09 01:50:00', '%Y-%m-%d %H:%M:%S'), 'H'), 1);
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-12-09 01:01:00', '%Y-%m-%d %H:%M:%S'), SC.DateTime.parse('2010-12-09 01:10:10', '%Y-%m-%d %H:%M:%S'), 'M'), 9);
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-12-09 01:00:00', '%Y-%m-%d %H:%M:%S'), SC.DateTime.parse('2010-12-09 01:00:20', '%Y-%m-%d %H:%M:%S'), 'S'), 20);
+  equals(SC.DateTime.difference(SC.DateTime.parse('2010-12-09 01:10:00', '%Y-%m-%d %H:%M:%S'), SC.DateTime.parse('2010-12-09 01:00:00', '%Y-%m-%d %H:%M:%S'), 'S'), -600);
+});

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/resources/strings.js

@@ -1,15 +1,45 @@
 // ==========================================================================
-// Project:   SproutCore - JavaScript Application Framework
+// Project: SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2011 Apple Inc. All rights reserved.
-// License:   Licensed under MIT license (see license.js)
+// Portions ©2008-2011 Apple Inc. All rights reserved.
+// License: Licensed under MIT license (see license.js)
 // ==========================================================================
 
 SC.stringsFor('English', {
-  '_SC.DateTime.dayNames': 'Sunday Monday Tuesday Wednesday Thursday Friday Saturday',
-  '_SC.DateTime.abbreviatedDayNames': 'Sun Mon Tue Wed Thu Fri Sat',
-  '_SC.DateTime.monthNames': 'January February March April May June July August September October November December',
-  '_SC.DateTime.abbreviatedMonthNames': 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec',
-  '_SC.DateTime.AMPMNames':'AM PM'
-}) ;
+  '_SC.DateTime.dayNames' : 'Sunday Monday Tuesday Wednesday Thursday Friday Saturday',
+  '_SC.DateTime.abbreviatedDayNames' : 'Sun Mon Tue Wed Thu Fri Sat',
+  '_SC.DateTime.monthNames' : 'January February March April May June July August September October November December',
+  '_SC.DateTime.abbreviatedMonthNames' : 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec',
+  '_SC.DateTime.AMPMNames' : 'AM PM',
 
+  '_SC.DateTime.now' : 'Right now',
+  '_SC.DateTime.secondIn' : 'In a moment',
+  '_SC.DateTime.secondsIn' : 'In %e seconds',
+  '_SC.DateTime.minuteIn' : 'In a minute',
+  '_SC.DateTime.minutesIn' : 'In %e minutes',
+  '_SC.DateTime.hourIn' : 'An hour from now',
+  '_SC.DateTime.hoursIn' : 'In about %e hours',
+  '_SC.DateTime.dayIn' : 'Tomorrow at %i:%M %p',
+  '_SC.DateTime.daysIn' : '%A at %i:%M %p',
+  '_SC.DateTime.weekIn' : 'Next week',
+  '_SC.DateTime.weeksIn' : 'In %e weeks',
+  '_SC.DateTime.monthIn' : 'Next month',
+  '_SC.DateTime.monthsIn' : 'In %e months',
+  '_SC.DateTime.yearIn' : 'Next year',
+  '_SC.DateTime.yearsIn' : 'In %e years',
+
+  '_SC.DateTime.secondAgo' : 'A moment ago',
+  '_SC.DateTime.secondsAgo' : '%e seconds ago',
+  '_SC.DateTime.minuteAgo' : 'A minute ago',
+  '_SC.DateTime.minutesAgo' : '%e minutes ago',
+  '_SC.DateTime.hourAgo' : 'An hour ago',
+  '_SC.DateTime.hoursAgo' : 'About %e hours ago',
+  '_SC.DateTime.dayAgo' : 'Yesterday at %i:%M %p',
+  '_SC.DateTime.daysAgo' : '%A at %i:%M %p',
+  '_SC.DateTime.weekAgo' : 'About a week ago',
+  '_SC.DateTime.weeksAgo' : '%e weeks ago',
+  '_SC.DateTime.monthAgo' : 'About a month ago',
+  '_SC.DateTime.monthsAgo' : '%e months ago',
+  '_SC.DateTime.yearAgo' : 'Last year',
+  '_SC.DateTime.yearsAgo' : '%e years ago'
+});

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/system/datetime.js

@@ -22,7 +22,51 @@ SC.DateTime.mixin(
     SC.DateTime.monthNames = SC.String.w(SC.String.loc('_SC.DateTime.monthNames'));
     SC.DateTime.abbreviatedMonthNames = SC.String.w(SC.String.loc('_SC.DateTime.abbreviatedMonthNames'));
     SC.DateTime.AMPMNames = SC.String.w(SC.String.loc('_SC.DateTime.AMPMNames'));
-  }
+  },
+  
+  /**
+    @private
+    
+    Elapsed string formatting override, as it depends on localization.
+    
+    @see SC.DateTime#toFormattedString
+   */
+  __getElapsedStringFormat: function(start, timezone) {
+    
+    var elapsed = Math.floor((+new Date() - this._date.getTime() - (timezone * 60000)) / 1000);
+    var future = !!(elapsed < 0) ? "In" : "Ago";
+    var interval = 0;
+    var intervalType = "now";
+    
+    if(Math.abs(elapsed) > 31536000) { // 60 * 60 * 24 * 365 - years
+      interval = Math.floor(Math.abs(elapsed / 31536000));
+      intervalType = 'year';
+    } else if(Math.abs(elapsed) > 2678400) { // 60 * 60 * 24 * 31 - months
+      interval = Math.floor(Math.abs(elapsed / 2678400));
+      intervalType = 'month';
+    } else if(Math.abs(elapsed) > 604800) { // 60 * 60 * 24 * 7 - weeks
+      interval = Math.floor(Math.abs(elapsed / 604800));
+      intervalType = 'week';
+    } else if(Math.abs(elapsed) > 86400) { // 60 * 60 * 24 - day
+      interval = Math.floor(Math.abs(elapsed / 86400));
+      intervalType = 'day';
+    } else if(Math.abs(elapsed) > 3600) { // 60 * 60 - hour
+      interval = Math.floor(Math.abs(elapsed / 3600));
+      intervalType = 'hour';
+    } else if(Math.abs(elapsed) > 60) { // 60 - minute
+      interval = Math.floor(Math.abs(elapsed / 60));
+      intervalType = 'minute';
+    } else if(Math.abs(elapsed) > 0) { // second
+      interval = Math.abs(elapsed);
+      intervalType = 'second';
+    }
+    
+    var formatString = '_SC.DateTime.now';
+    if(intervalType !== 'now') {
+      formatString = "_SC.DateTime.%@%@%@".fmt(intervalType, interval > 1 ? "s" : "", future);
+    }
+    return formatString.loc().replace('%e', interval);
+  },
 
 });
 

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/tests/system/datetime.js

@@ -0,0 +1,88 @@
+// ==========================================================================
+// Project:   DateTime Unit Test
+// Copyright: ©2010 Martin Ottenwaelter
+// ==========================================================================
+
+/*globals module test ok equals same stop start */
+
+module('Time');
+
+var dt, options, ms, timezone, startTime, timezones;
+
+module("SC.DateTime", {
+  setup: function() {
+  },
+  teardown: function() {
+  }
+});
+
+/**
+ * This test runs expired time format tests, based on the localization strings
+ * found in strings.js
+ */
+test('FormatElapsed', function() {
+  var dateTimeTest = SC.DateTime.create();
+  equals(dateTimeTest.toFormattedString("%E"), "Right now");
+  
+  dateTimeTest = dateTimeTest.advance({ second: 1 });  // +1 second;
+  equals(dateTimeTest.toFormattedString("%E"), "In a moment");
+  dateTimeTest = dateTimeTest.advance({ second: 19 });  // +19 seconds;
+  equals(dateTimeTest.toFormattedString("%E"), "In 20 seconds");
+  dateTimeTest =  dateTimeTest.advance({ minute: 1 });  // +1 minute;
+  equals(dateTimeTest.toFormattedString("%E"), "In a minute");
+  dateTimeTest = dateTimeTest.advance({ minute: 4 });  // +5 minutes;
+  equals(dateTimeTest.toFormattedString("%E"), "In 5 minutes");
+  dateTimeTest = dateTimeTest.advance({ hour: 1 });  // +60 minutes;
+  equals(dateTimeTest.toFormattedString("%E"), "An hour from now");
+  dateTimeTest = dateTimeTest.advance({ hour: 2 });  // +2 hours;
+  equals(dateTimeTest.toFormattedString("%E"), "In about 3 hours");
+  dateTimeTest = dateTimeTest.advance({ day: 1 });  // +1 day;
+  equals(dateTimeTest.toFormattedString("%E"), dateTimeTest.toFormattedString("_SC.DateTime.dayIn".loc()));
+  dateTimeTest = dateTimeTest.advance({ day: 2 });  // +2 days;
+  equals(dateTimeTest.toFormattedString("%E"), dateTimeTest.toFormattedString("_SC.DateTime.daysIn".loc()));
+  dateTimeTest = dateTimeTest.advance({ day: 5 });  // +1 week;
+  equals(dateTimeTest.toFormattedString("%E"), "Next week");
+  dateTimeTest = dateTimeTest.advance({ day: 7 });  // +2 week;
+  equals(dateTimeTest.toFormattedString("%E"), "In 2 weeks");
+  console.warn(dateTimeTest.toString());
+  dateTimeTest = dateTimeTest.advance({ month: 1 });  // +1 month;
+  console.warn(dateTimeTest.toString());
+  equals(dateTimeTest.toFormattedString("%E"), "Next month");
+  dateTimeTest = dateTimeTest.advance({ month: 2 });  // +3 month;
+  console.warn(dateTimeTest.toString());
+  equals(dateTimeTest.toFormattedString("%E"), "In 3 months");
+  dateTimeTest = dateTimeTest.advance({ year: 1 });  // +1 year;
+  equals(dateTimeTest.toFormattedString("%E"), "Next year");
+  dateTimeTest = dateTimeTest.advance({ year: 2 });  // +3 year;
+  equals(dateTimeTest.toFormattedString("%E"), "In 3 years");
+
+  var dateTimeTest = SC.DateTime.create();
+  dateTimeTest = dateTimeTest.advance({ second: -1 });  // -1 second;
+  equals(dateTimeTest.toFormattedString("%E"), "A moment ago");
+  dateTimeTest = dateTimeTest.advance({ second: -19 });  // -19 seconds;
+  equals(dateTimeTest.toFormattedString("%E"), "20 seconds ago");
+  dateTimeTest = dateTimeTest.advance({ minute: -1 });  // -1 minute;
+  equals(dateTimeTest.toFormattedString("%E"), "A minute ago");
+  dateTimeTest = dateTimeTest.advance({ minute: -4 });  // -5 minutes;
+  equals(dateTimeTest.toFormattedString("%E"), "5 minutes ago");
+  dateTimeTest = dateTimeTest.advance({ hour: -1 });  // -60 minutes;
+  equals(dateTimeTest.toFormattedString("%E"), "An hour ago");
+  dateTimeTest = dateTimeTest.advance({ hour: -2 });  // -2 hours;
+  equals(dateTimeTest.toFormattedString("%E"), "About 3 hours ago");
+  dateTimeTest = dateTimeTest.advance({ day: -1 });  // -1 day;
+  equals(dateTimeTest.toFormattedString("%E"), dateTimeTest.toFormattedString("_SC.DateTime.dayAgo".loc()));
+  dateTimeTest = dateTimeTest.advance({ day: -2 });  // -2 days;
+  equals(dateTimeTest.toFormattedString("%E"), dateTimeTest.toFormattedString("_SC.DateTime.daysAgo".loc()));
+  dateTimeTest = dateTimeTest.advance({ day: -5 });  // -1 week;
+  equals(dateTimeTest.toFormattedString("%E"), "About a week ago");
+  dateTimeTest = dateTimeTest.advance({ day: -7 });  // -2 week;
+  equals(dateTimeTest.toFormattedString("%E"), "2 weeks ago");
+  dateTimeTest = dateTimeTest.advance({ month: -1 });  // -1 month;
+  equals(dateTimeTest.toFormattedString("%E"), "About a month ago");
+  dateTimeTest = dateTimeTest.advance({ month: -2 });  // -3 month;
+  equals(dateTimeTest.toFormattedString("%E"), "3 months ago");
+  dateTimeTest = dateTimeTest.advance({ year: -1 });  // -1 year;
+  equals(dateTimeTest.toFormattedString("%E"), "Last year");
+  dateTimeTest = dateTimeTest.advance({ year: -2 });  // -3 year;
+  equals(dateTimeTest.toFormattedString("%E"), "3 years ago");
+});

data/lib/frameworks/sproutcore/frameworks/{experimental/frameworks/designer → designer}/controllers/controllers.js

@@ -10,7 +10,7 @@
 // ==========================================================================
 /*globals SC */
 
-/** @class
+/**
 
   in suppressMain mode all controllers files register with this array controller
 
@@ -18,6 +18,6 @@
 */
 SC.controllersController = SC.ArrayController.create(
 /** @scope SC.controllersController.prototype */ {
-  
-  
+
+
 }) ;

data/lib/frameworks/sproutcore/frameworks/{experimental/frameworks/designer → designer}/controllers/design.js

@@ -9,7 +9,7 @@
 // ==========================================================================
 /*globals SC */
 
-/** @class
+/**
 
   (Document Your Controller Here)
 
@@ -20,7 +20,7 @@ SC.designController = SC.ObjectController.create(
 
   contentBinding: 'SC.designsController.selection',
   contentBindingDefault: SC.Binding.single(),
-  
+
   viewSelected: function(){
     var c = this.get('content'), pane, designer, pageController;
     if(c){