Explorar o código

Revert "Update date format"

This reverts commit 8d258970436ae0097d6cac8426f78b8e805c77d3.
Danilo Bargen %!s(int64=7) %!d(string=hai) anos
pai
achega
74c1fcb220
Modificáronse 2 ficheiros con 8 adicións e 15 borrados
  1. 7 11
      src/app.ts
  2. 1 4
      src/directives/message_date.ts

+ 7 - 11
src/app.ts

@@ -136,13 +136,6 @@ angular.module('3ema', [
     }]);
 }])
 
-.constant('amTimeAgoConfig', {
-    // After this threshold, display absolute dates instead of relative ones.
-    fullDateThreshold: 21,
-    fullDateThresholdUnit: 'hour',
-    fullDateFormat: 'L, LT',
-})
-
 .run([
     '$translate',
     '$log',
@@ -150,20 +143,23 @@ angular.module('3ema', [
     'moment',
     ($translate: ng.translate.ITranslateService, $log: ng.ILogService, amMoment, moment) => {
         const lang = $translate.proposedLanguage() || $translate.use();
-
-        // https://momentjs.com/docs/#/customization/
+        $log.debug('Setting locale:', lang);
         moment.updateLocale('en', {
             longDateFormat : {
                 L: 'MMM Do YYYY',
             },
+            calendar: {
+                sameElse: 'L, LT',
+            },
         });
         moment.updateLocale('de', {
             longDateFormat : {
                 L: 'Do MMM YYYY',
             },
+            calendar: {
+                sameElse: 'L, LT',
+            },
         });
-
-        $log.debug('Setting locale:', lang);
         amMoment.changeLocale(lang);
     },
 ])

+ 1 - 4
src/directives/message_date.ts

@@ -23,10 +23,7 @@ export default [
                 message: '=eeeMessage',
             },
             template: `
-                <span
-                    am-time-ago="message.date | amFromUnix"
-                    title="{{ message.date | amFromUnix | amCalendar }}"
-                ></span>
+                <span>{{ message.date | amFromUnix | amCalendar }}</span>
             `,
         };
     },