Merge pull request #1227 from ssbc/feature/l10n-localize-dates

Feature: Localize timestamps and "time ago" with moment

Author: christianbundy

lib/depject/index.js

@@ -91,9 +91,6 @@ module.exports = {
       sheet: require('./invite/sheet.js')
     },
     keys: require('./keys.js'),
-    lib: {
-      timeAgo: require('./lib/timeAgo.js')
-    },
     message: {
       async: {
         name: require('./message/async/name.js'),

lib/depject/intl/sync/i18n.js

@@ -10,7 +10,6 @@ exports.gives = nest('intl.sync', [
   'localeNames',
   'i18n',
   'i18n_n',
-  'time',
   'startsWith'
 ])
 
@@ -33,8 +32,7 @@ exports.create = (api) => {
     startsWith,
     localeNames,
     i18n,
-    i18n_n: i18nN,
-    time
+    i18n_n: i18nN
   })
 
   function startsWith (text, startsWith) {
@@ -71,26 +69,6 @@ exports.create = (api) => {
     return i18nL.__n(value, ...opts)
   }
 
-  function time (date) {
-    return date
-      .replace(/from now/, i18n('from now'))
-      .replace(/ago/, i18n('ago'))
-      .replace(/years/, i18n('years'))
-      .replace(/months/, i18n('months'))
-      .replace(/weeks/, i18n('weeks'))
-      .replace(/days/, i18n('days'))
-      .replace(/hours/, i18n('hours'))
-      .replace(/minutes/, i18n('minutes'))
-      .replace(/seconds/, i18n('seconds'))
-      .replace(/year/, i18n('year'))
-      .replace(/month/, i18n('month'))
-      .replace(/week/, i18n('week'))
-      .replace(/day/, i18n('day'))
-      .replace(/hour/, i18n('hour'))
-      .replace(/minute/, i18n('minute'))
-      .replace(/second/, i18n('second'))
-  }
-
   // Init an subscribe to settings changes.
   function _init () {
     if (_locale) return

lib/depject/lib/timeAgo.js

@@ -3,8 +3,6 @@ const nest = require('depnest')
 const extend = require('xtend')
 const moment = require('moment-timezone')
 
-const localTimezone = moment.tz.guess()
-
 exports.needs = nest({
   'message.html.markdown': 'first',
   'message.html.layout': 'first',
@@ -178,7 +176,7 @@ exports.create = function (api) {
 
 function formatTime (time) {
   if (time && time.epoch) {
-    return moment(time.epoch).tz(localTimezone).format('LLLL zz')
+    return moment(time.epoch).format('LLLL zz')
   }
 }
 

lib/depject/message/html/render/gathering.js

@@ -1,9 +1,9 @@
 const h = require('mutant/h')
 const nest = require('depnest')
+const moment = require('moment-timezone')
 
 exports.gives = nest('message.html.timestamp')
 exports.needs = nest({
-  'lib.obs.timeAgo': 'first',
   'message.sync.timestamp': 'first',
   'message.sync.root': 'first'
 })
@@ -15,7 +15,7 @@ exports.create = function (api) {
     return h('a.Timestamp', {
       href: api.message.sync.root(msg) || msg.key,
       anchor: msg.key,
-      title: new Date(api.message.sync.timestamp(msg))
-    }, api.lib.obs.timeAgo(api.message.sync.timestamp(msg)))
+      title: moment(api.message.sync.timestamp(msg)).format('LLLL zz')
+    }, moment(api.message.sync.timestamp(msg)).fromNow())
   }
 }

lib/depject/message/html/timestamp.js

@@ -15,6 +15,10 @@ const watch = require('mutant/watch')
 const requireStyle = require('require-style')
 const ssbUri = require('ssb-uri')
 const pull = require('pull-stream')
+const moment = require('moment-timezone')
+
+const localTimezone = moment.tz.guess()
+moment.tz.setDefault(localTimezone)
 
 module.exports = function (config) {
   const sockets = combine(
@@ -50,6 +54,7 @@ module.exports = function (config) {
 
   const i18n = api.intl.sync.i18n
   const language = api.settings.obs.get('patchwork.lang', '')()
+  moment.locale(language)
   setupContextMenuAndSpellCheck(api.config.sync.load(), { navigate, getMessageText, language })
 
   const id = api.keys.sync.id()

lib/main-window.js

@@ -92,22 +92,6 @@
 	"Edit": "Bearbeiten",
 	"identified ": "bezeichnet ",
 	"self identifies as ": "bezeichnet sich selbst als ",
-	"from now": "von jetzt",
-	"ago": "her",
-	"years": "Jahre",
-	"months": "Monate",
-	"weeks": "Wochen",
-	"days": "Tage",
-	"hours": "Stunden",
-	"minutes": "Minuten",
-	"seconds": "Sekunden",
-	"year": "Jahr",
-	"month": "Monat",
-	"week": "Woche",
-	"day": "Tag",
-	"hour": "Stunde",
-	"minute": "Minute",
-	"second": "Sekunde",
 	"assigned a display image to ": "hat ein Bild zugewiesen ",
 	"Theme": "Theme",
 	"Language": "Sprache",

locales/de.json

@@ -66,22 +66,6 @@
 	"Self Assigned": "Self Assigned",
 	"Assigned By": "Εκχωρήθηκε από",
 	"followed ": "ακολουθείται από ",
-	"from now": "από τώρα",
-	"ago": "πριν",
-	"years": "χρόνια",
-	"months": "μήνες",
-	"weeks": "εβδομάδες",
-	"days": "ημέρες",
-	"hours": "ώρες",
-	"minutes": "λεπτά",
-	"seconds": "δευτερόλεπτα",
-	"year": "έτος",
-	"month": "μήνας",
-	"week": "εβδομάδα",
-	"day": "ημέρα",
-	"hour": "ώρα",
-	"minute": "λεπτό",
-	"second": "δευτερόλεπτο",
 	"Reply": "Απάντηση",
 	"View full thread": "Δείτε την πλήρη ανάρτηση",
 	"Unsubscribe": "Απεγγραφή",

locales/el.json

@@ -66,22 +66,6 @@
 	"Self Assigned": "Self Assigned",
 	"Assigned By": "Assigned By",
 	"followed ": "followed ",
-	"from now": "from now",
-	"ago": "ago",
-	"years": "years",
-	"months": "months",
-	"weeks": "weeks",
-	"days": "days",
-	"hours": "hours",
-	"minutes": "mins",
-	"seconds": "secs",
-	"year": "year",
-	"month": "month",
-	"week": "week",
-	"day": "day",
-	"hour": "hour",
-	"minute": "min",
-	"second": "sec",
 	"Reply": "Reply",
 	"View full thread": "View full thread",
 	"Unsubscribe": "Unsubscribe",

locales/en.json

@@ -118,22 +118,6 @@
 	"Close": "Fermi",
 	"New Message": "Nova mesaĝo",
 	"Language": "Lingvo",
-	"from now": "de nun",
-	"ago": "antaŭ",
-	"years": "jaroj",
-	"months": "monatoj",
-	"weeks": "semajnoj",
-	"days": "tagoj",
-	"hours": "horoj",
-	"minutes": "minutoj",
-	"seconds": "sekundoj",
-	"year": "jaro",
-	"month": "monato",
-	"week": "semajno",
-	"day": "tago",
-	"hour": "horo",
-	"minute": "minuto",
-	"second": "sekundo",
 	"unsubscribed from ": "malabonis de ",
 	"en": "en",
 	"es": "es",